merge with snvdevel

228 files changed, 109961 insertions, 24749 deletions

diff --git a/.gitignore b/.gitignore
index 3b8e874..bb71572 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,12 +4,15 @@ site/app/config/config.php
 site/app/tmp
 site/vendors/product-details
 data
+
 site/app/config/revisions.php
 *.mo
 site/app/webroot/css/style.min.css
 site/app/webroot/js/__utm.min.js
 site/app/webroot/js/jquery.addons.min.js
 *.*~
+*.*#
+
 .bash_profile
 .bashrc
 .gitconfig
diff --git a/bandwagon/chrome.manifest b/bandwagon/chrome.manifest
index 10e58b3..99d2cf5 100644
--- a/bandwagon/chrome.manifest
+++ b/bandwagon/chrome.manifest
@@ -1,7 +1,12 @@
-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/
+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://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
+style   chrome://global/content/customizeToolbar.xul   chrome://bandwagon/skin/browserOverlay.css
 
+override  chrome://bandwagon/skin/browserOverlay.css   chrome://bandwagon/skin/platform/linux/browserOverlay.css os=Linux
+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
diff --git a/bandwagon/components/bandwagon-service.js b/bandwagon/components/bandwagon-service.js
index 3a773fc..7ddb6b6 100644
--- a/bandwagon/components/bandwagon-service.js
+++ b/bandwagon/components/bandwagon-service.js
@@ -14,11 +14,11 @@
  * The Original Code is bandwagon.
  *
  * The Initial Developer of the Original Code is
- * David McNamara.
+ * Mozilla Corporation.
  * Portions created by the Initial Developer are Copyright (C) 2008
  * the Initial Developer. All Rights Reserved.
  *
- * Contributor(s):
+ * Contributor(s): David McNamara
  *
  * 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
@@ -48,6 +48,7 @@ const ExtensionsManager = Cc["@mozilla.org/extensions/manager;1"];
 const Storage = Cc["@mozilla.org/storage/service;1"];
 const DirectoryService = Cc["@mozilla.org/file/directory_service;1"];
 const ObserverService = Cc["@mozilla.org/observer-service;1"];
+const CookieManager = Cc["@mozilla.org/cookiemanager;1"];
 
 const nsIWindowMediator = Ci.nsIWindowMediator;
 const nsITimer = Ci.nsITimer;
@@ -56,6 +57,7 @@ const mozIStorageService = Ci.mozIStorageService;
 const nsIProperties = Ci.nsIProperties;
 const nsIFile = Ci.nsIFile;
 const nsIObserverService = Ci.nsIObserverService;
+const nsICookieManager = Ci.nsICookieManager;
 
 
 var Bandwagon;
@@ -68,16 +70,17 @@ function BandwagonService()
 
 BandwagonService.prototype = {
 
-    feeds: {},
+    collections: {},
 
     _initialized: false,
     _service: null,
-    _feedUpdateObservers: [],
-    _feedListChangeObservers: [],
+    _collectionUpdateObservers: [],
+    _collectionListChangeObservers: [],
     _storageConnection: null,
-    _feedFactory: null, 
-    _feedUpdateTimer: null,
+    _collectionFactory: null, 
+    _collectionUpdateTimer: null,
     _bwObserver: null,
+    _serviceDocument: null,
 
     init: function()
     {
@@ -103,9 +106,10 @@ BandwagonService.prototype = {
 
         this._service = new Bandwagon.RPC.Service();
         this._service.registerLogger(Bandwagon.Logger);
-        this._service.registerObserver(this._getFeedObserver);
+        this._service.registerObserver(this._getCollectionObserver);
+        this._service.registerObserver(this._getServiceDocumentObserver);
 
-        this.registerFeedUpdateObserver(this._feedUpdateObserver);
+        this.registerCollectionUpdateObserver(this._collectionUpdateObserver);
 
         // init sqlite storage (also creating tables in sqlite if needed). create factory objects.
 
@@ -119,15 +123,24 @@ BandwagonService.prototype = {
             this.firstrun();
         }
 
-        // storage initialized, tables created - open the feeds
+        // storage initialized, tables created - open the collections
 
-        var storageFeeds = this._feedFactory.openFeeds();
+        var storageCollections = this._collectionFactory.openCollections();
 
-        for (var id in storageFeeds)
+        for (var id in storageCollections)
         {
-            this.feeds[id] = storageFeeds[id];
-            this.feeds[id].setAllNotified();
-            Bandwagon.Logger.debug("opened feed from storage: " + id);
+            this.collections[id] = storageCollections[id];
+            this.collections[id].setAllNotified();
+            Bandwagon.Logger.debug("opened collection from storage: " + id);
+        }
+
+        this._serviceDocument = this._collectionFactory.openServiceDocument();
+        this._service._serviceDocument = this._serviceDocument;
+
+        if (!this._serviceDocument)
+        {
+            // no service document in storage, we never had it or we've lost it - go fetch it
+            this.updateCollectionsList();
         }
 
         // start the update timer
@@ -147,10 +160,10 @@ BandwagonService.prototype = {
             }
         };
 
-        this._feedUpdateTimer = Timer.createInstance(nsITimer);
-        this._feedUpdateTimer.init(
+        this._collectionUpdateTimer = Timer.createInstance(nsITimer);
+        this._collectionUpdateTimer.init(
             this._bwObserver,
-            (Bandwagon.Preferences.getPreference("debug")?30*1000:Bandwagon.FEED_UPDATE_TIMER_DELAY*1000),
+            (Bandwagon.Preferences.getPreference("debug")?30*1000:Bandwagon.COLLECTION_UPDATE_TIMER_DELAY*1000),
             nsITimer.TYPE_REPEATING_SLACK
             );
 
@@ -169,7 +182,7 @@ BandwagonService.prototype = {
 
     uninit: function()
     {
-        this._feedUpdateTimer = null;
+        this._collectionUpdateTimer = null;
         this.commitAll();
     },
 
@@ -205,14 +218,14 @@ BandwagonService.prototype = {
                 Bandwagon.Logger.debug("Will autopublish extension '" + willAutopublishExtensions[i].id + "'...");
 
                 // publish willAutopublishExtensions[i]
-                for (var id in bandwagonService.feeds)
+                for (var id in bandwagonService.collections)
                 {
-                    var feed = bandwagonService.feeds[id];
+                    var collection = bandwagonService.collections[id];
 
-                    if (!feed.autoPublish)
+                    if (!collection.autoPublish)
                         continue;
 
-                    Bandwagon.Logger.debug("...to feed '" + feed.url + "'");
+                    Bandwagon.Logger.debug("...to collection '" + collection.resourceURL + "'");
 
                     var extension =
                     {
@@ -220,7 +233,7 @@ BandwagonService.prototype = {
                         name: willAutopublishExtensions[i].name
                     }
 
-                    bandwagonService.publishToFeed(extension, feed, "", null);
+                    bandwagonService.publishToCollection(extension, collection, "", null);
                 }
 
                 // add to autopublish
@@ -231,13 +244,13 @@ BandwagonService.prototype = {
         }
     },
 
-    _getFeedObserver: function(event)
+    _getCollectionObserver: function(event)
     {
-        Bandwagon.Logger.info("in _getFeedObserver()");
+        Bandwagon.Logger.info("in _getCollectionObserver()");
 
-        if (event.getType() == Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_GET_FEED_COMPLETE)
+        if (event.getType() == Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_GET_COLLECTION_COMPLETE)
         {
-            var feed = event.feed;
+            var collection = event.collection;
 
             if (event.isError())
             {
@@ -246,84 +259,169 @@ BandwagonService.prototype = {
             }
             else
             {
-                if (feed != null && feed.url != null)
+                if (collection != null && collection.resourceURL != null)
                 {
-                    Bandwagon.Logger.info("Finished getting updates for feed '" + feed.url + "'");
-                    bandwagonService.feeds[feed.url] = feed;
+                    Bandwagon.Logger.info("Finished getting updates for collection '" + collection.resourceURL + "'");
+                    bandwagonService.collections[collection.resourceURL] = collection;
                 }
             }
 
             // we want to notify the observers even if there's been an error
 
-            bandwagonService._notifyFeedUpdateObservers(feed);
+            bandwagonService._notifyCollectionUpdateObservers(collection);
         }
     },
 
-    _notifyFeedUpdateObservers: function(feed)
+    _getServiceDocumentObserver: function(event)
     {
-        Bandwagon.Logger.debug("Notifying feed update observers");
+        Bandwagon.Logger.info("in _getServiceDocumentObserver()");
 
-        for (var i=0; i<bandwagonService._feedUpdateObservers.length; i++)
+        if (event.getType() == Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_GET_SERVICE_DOCUMENT_COMPLETE)
         {
-            if (bandwagonService._feedUpdateObservers[i])
+            if (event.isError())
             {
-                bandwagonService._feedUpdateObservers[i](feed);
+                Bandwagon.Logger.error("Could not update collections list: " + event.getError().toString());
+            }
+            else
+            {
+                bandwagonService._serviceDocument = event.serviceDocument;
+                bandwagonService._service._serviceDocument = bandwagonService._serviceDocument;
+
+                var collections = bandwagonService._serviceDocument.collections;
+
+                Bandwagon.Logger.debug("Updating collections list: saw " + collections.length + " collections");
+
+                for (var id in bandwagonService.collections)
+                {
+                    var isStaleCollection = true;
+
+                    for (var jd in collections)
+                    {
+                        if (bandwagonService.collections[id].equals(collections[jd]))
+                        {
+                            isStaleCollection = false;
+                            break;
+                        }
+                    }
+
+                    if (isStaleCollection)
+                    {
+                        Bandwagon.Logger.debug("Updating collections list: removing stale collection: " + bandwagonService.collections[id].toString());
+
+                        bandwagonService.deleteCollection(bandwagonService.collections[id]);
+                    }
+                }
+
+                for (var id in collections)
+                {
+                    var collection = collections[id];
+
+                    if (bandwagonService.collections[collection.resourceURL])
+                    {
+                        // we have already added this collection
+                    }
+                    else
+                    {
+                        // this is a new collection
+                        Bandwagon.Logger.debug("Updating collections list: adding new collection: " + collection.toString());
+
+                        bandwagonService.collections[collection.resourceURL] = collection;
+
+                        bandwagonService.forceCheckForUpdates(collection);
+                    }
+                }
+                
+                bandwagonService._notifyListChangeObservers();
+
+                if (Bandwagon.COMMIT_NOW)
+                    bandwagonService.commitAll();
             }
         }
     },
 
-    registerFeedUpdateObserver: function(observer)
+    _notifyCollectionUpdateObservers: function(collection)
     {
-        Bandwagon.Logger.debug("Registering feed update observer");
-        this._feedUpdateObservers.push(observer);
+        Bandwagon.Logger.debug("Notifying collection update observers");
+
+        for (var i=0; i<bandwagonService._collectionUpdateObservers.length; i++)
+        {
+            if (bandwagonService._collectionUpdateObservers[i])
+            {
+                bandwagonService._collectionUpdateObservers[i](collection);
+            }
+        }
     },
 
-    unregisterFeedUpdateObserver: function(observer)
+    registerCollectionUpdateObserver: function(observer)
     {
-        Bandwagon.Logger.debug("Unregistering feed update observer");
+        Bandwagon.Logger.debug("Registering collection update observer");
+        this._collectionUpdateObservers.push(observer);
+    },
 
-        for (var i=0; i<this._feedUpdateObservers.length; i++)
+    unregisterCollectionUpdateObserver: function(observer)
+    {
+        Bandwagon.Logger.debug("Unregistering collection update observer");
+
+        for (var i=0; i<this._collectionUpdateObservers.length; i++)
         {
-            if (this._feedUpdateObservers[i] == observer)
+            if (this._collectionUpdateObservers[i] == observer)
             {
-                delete this._feedUpdateObservers[i];
+                delete this._collectionUpdateObservers[i];
             }
         }
     },
 
     _notifyListChangeObservers: function()
     {
-        Bandwagon.Logger.debug("Notifying feed list change observers");
+        Bandwagon.Logger.debug("Notifying collection list change observers");
 
-        for (var i=0; i<bandwagonService._feedListChangeObservers.length; i++)
+        for (var i=0; i<bandwagonService._collectionListChangeObservers.length; i++)
         {
-            if (bandwagonService._feedListChangeObservers[i])
+            if (bandwagonService._collectionListChangeObservers[i])
             {
-                bandwagonService._feedListChangeObservers[i]();
+                bandwagonService._collectionListChangeObservers[i]();
             }
         }
     },
 
-    registerFeedListChangeObserver: function(observer)
+    registerCollectionListChangeObserver: function(observer)
     {
-        Bandwagon.Logger.debug("Registering feed list change observer");
-        this._feedListChangeObservers.push(observer);
+        Bandwagon.Logger.debug("Registering collection list change observer");
+        this._collectionListChangeObservers.push(observer);
     },
 
-    unregisterFeedListChangeObserver: function(observer)
+    unregisterCollectionListChangeObserver: function(observer)
     {
-        Bandwagon.Logger.debug("Unregistering feed list change observer");
+        Bandwagon.Logger.debug("Unregistering collection list change observer");
 
-        for (var i=0; i<this._feedListChangeObservers.length; i++)
+        for (var i=0; i<this._collectionListChangeObservers.length; i++)
         {
-            if (this._feedListChangeObservers[i] == observer)
+            if (this._collectionListChangeObservers[i] == observer)
             {
-                delete this._feedListChangeObservers[i];
+                delete this._collectionListChangeObservers[i];
             }
         }
     },
 
-    checkForUpdates: function(feed)
+    updateCollectionsList: function()
+    {
+        Bandwagon.Logger.debug("Updating collections list...");
+
+        this.updateServiceDocument();
+    },
+
+    updateServiceDocument: function()
+    {
+        if (!this.isAMOAuthenticated())
+        {
+            Bandwagon.Logger.debug("Not authenticated in AMO");
+            return;
+        }
+        
+        this._service.getServiceDocument();
+    },
+
+    checkForUpdates: function(collection)
     {
         var doCheck = false;
         var now = new Date();
@@ -334,15 +432,15 @@ BandwagonService.prototype = {
             // so a check must be due
             doCheck = true;
         }
-        else if (feed.updateInterval > 0)
+        else if (collection.updateInterval > 0)
         {
             var dateLastCheck = null;
             var dateNextCheck = null;
 
-            if (feed.dateLastCheck != null)
+            if (collection.dateLastCheck != null)
             {
-                dateLastCheck = feed.dateLastCheck;
-                dateNextCheck = new Date(dateLastCheck.getTime() + feed.updateInterval*1000);
+                dateLastCheck = collection.dateLastCheck;
+                dateNextCheck = new Date(dateLastCheck.getTime() + collection.updateInterval*1000);
             }
             else
             {
@@ -357,14 +455,14 @@ BandwagonService.prototype = {
         }
         else
         {
-            Bandwagon.Logger.warn(feed.url + ": no global update interval nor feed update interval -- won't update");
+            Bandwagon.Logger.warn(collection.resourceURL + ": no global update interval nor collection update interval -- won't update");
         }
 
         if (doCheck)
         {
-            this._service.getFeed(feed);
+            this._service.getCollection(collection);
 
-            feed.dateLastCheck = now;
+            collection.dateLastCheck = now;
         }
     },
 
@@ -388,65 +486,76 @@ BandwagonService.prototype = {
             }
         }
 
-        for (var id in this.feeds)
+        for (var id in this.collections)
         {
-            var feed = this.feeds[id];
+            var collection = this.collections[id];
 
-            this.checkForUpdates(feed);
+            this.checkForUpdates(collection);
 
         }
 
         Bandwagon.Preferences.setPreference("updateall.datelastcheck", now.getTime()/1000);
     },
 
-    forceCheckForUpdates: function(feed)
+    forceCheckForUpdates: function(collection)
     {
-        this._service.getFeed(feed);
-        feed.dateLastCheck = new Date();
+        this._service.getCollection(collection);
+        collection.dateLastCheck = new Date();
     },
 
     forceCheckAllForUpdates: function()
     {
-        for (var id in this.feeds)
+        for (var id in this.collections)
         {
-            var feed = this.feeds[id];
-            this.forceCheckForUpdates(feed);
+            var collection = this.collections[id];
+            this.forceCheckForUpdates(collection);
         }
     },
 
-    subscribe: function(feed)
+    forceCheckAllForUpdatesAndUpdateCollectionsList: function()
     {
-        feed.preview = false;
-        feed.setAllNotified();
+        this.forceCheckAllForUpdates();
+        this.updateCollectionsList();
+    },
+
+    /** OBSOLETE
+    subscribe: function(collection)
+    {
+        collection.preview = false;
+        collection.setAllNotified();
 
-        this._service.subscribeFeed(feed);
+        this._service.subscribeCollection(collection);
     },
+    */
 
-    unsubscribe: function(feed)
+    /** OBSOLETE
+    unsubscribe: function(collection)
     {
-        this._service.unsubscribeFeed(feed);
+        this._service.unsubscribeCollection(collection);
     },
+    */
 
     firstrun: function()
     {
-        Bandwagon.Logger.info("This is bandwagon's firstrun");
-
-        // set up and save default feeds
+        Bandwagon.Logger.info("This is bandwagon's firstrun. Welcome!");
 
-        this._addDefaultFeed(Bandwagon.DEFAULT_FEED1_URL, Bandwagon.DEFAULT_FEED1_NAME);
-        this._addDefaultFeed("http://www.33eels.com/clients/briks/bandwagon/testfeed.xml", "test feed");
+        // set up and save default collections
 
-        // check for cookie to see if we have to add a feed like that
-
-        var addFeedCookieValue = Bandwagon.Util.getCookie(Bandwagon.MAGIC_ADD_FEED_COOKIE_HOST, Bandwagon.MAGIC_ADD_FEED_COOKIE_NAME);
-
-        if (addFeedCookieValue)
+        // 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 feed' cookie. Adding the feed '" + addFeedCookieValue + "'.");
-            this.addPreviewFeed(addFeedCookieValue);
+            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
 
@@ -458,75 +567,117 @@ BandwagonService.prototype = {
         Bandwagon.Controller.BrowserOverlay.openFirstRunLandingPage();
     },
 
-    _addDefaultFeed: function(url, name)
+    _addDefaultCollection: function(url, name)
     {
-        var feed = this._feedFactory.newFeed();
-        feed.url = url;
-        feed.name = name;
-        feed.showNotifications = false;
+        var collection = this._collectionFactory.newCollection();
+        collection.resourceURL = url;
+        collection.name = name;
+        collection.showNotifications = false;
 
-        this.feeds[feed.url] = feed;
+        this.collections[collection.resourceURL] = collection;
 
         if (Bandwagon.COMMIT_NOW)
-            this.commit(feed);
+            this.commit(collection);
 
-        this.forceCheckForUpdates(feed);
-        this.subscribe(feed);
+        this.forceCheckForUpdates(collection);
+        this.subscribe(collection);
     },
 
-    addPreviewFeed: function(url)
+    /** OBSOLETE
+    addPreviewCollection: function(url)
     {
-        var feed = this._feedFactory.newFeed();
-        feed.url = url;
-        feed.preview = true;
-        this.feeds[feed.url] = feed;
+        var collection = this._collectionFactory.newCollection();
+        collection.resourceURL = url;
+        collection.preview = true;
+        this.collections[collection.resourceURL] = collection;
 
-        this.forceCheckForUpdates(feed);
+        this.forceCheckForUpdates(collection);
 
         bandwagonService._notifyListChangeObservers();
 
-        return feed;
+        return collection;
     },
+    */
 
     uninstall: function()
     {
         // TODO
     },
 
-    commit: function(feed)
+    commit: function(collection)
     {
-        if (!bandwagonService._feedFactory)
+        if (!bandwagonService._collectionFactory)
             return;
 
-        if (feed.preview)
+        /** OBSOLETE
+        if (collection.preview)
             return;
+        */
 
-        Bandwagon.Logger.debug("In commit() with feed: " + feed.url);
+        Bandwagon.Logger.debug("In commit() with collection: " + collection.resourceURL);
 
-        bandwagonService._feedFactory.commitFeed(feed);
+        bandwagonService._collectionFactory.commitCollection(collection);
     },
 
     commitAll: function()
     {
         Bandwagon.Logger.debug("In commitAll()");
 
-        for (var id in bandwagonService.feeds)
+        for (var id in bandwagonService.collections)
         {
-            var feed = bandwagonService.feeds[id];
+            var collection = bandwagonService.collections[id];
 
-            this.commit(feed);
+            this.commit(collection);
         }
+
+        if (bandwagonService._serviceDocument)
+            bandwagonService._collectionFactory.commitServiceDocument(bandwagonService._serviceDocument);
+    },
+
+    removeAddonFromCollection: function(guid, collection)
+    {
+        Bandwagon.Logger.debug("In removeAddonFromCollection()");
+
+        this._service.removeAddonFromCollection(guid, collection);
+    },
+
+    newCollection: function(collection, callback)
+    {
+        Bandwagon.Logger.debug("In newCollection()");
+
+        /*
+        var internalCallback = function(event)
+        {
+            if (!event.isError())
+            {
+                var collection = event.collection;
+
+                bandwagonService.collections[collection.resourceURL] = collection;
+                //bandwagonService._notifyCollectionUpdateObservers(collection);
+                bandwagonService._notifyListChangeObservers();
+            }
+
+            if (callback)
+            {
+                callback(event);
+            }
+        }
+
+        this._service.newCollection(collection, internalCallback);
+        */
+
+        this._service.newCollection(collection, callback);
     },
 
-    deleteFeed: function(feed)
+    deleteCollection: function(collection)
     {
-        this._feedFactory.deleteFeed(feed);
+        this._collectionFactory.deleteCollection(collection);
 
-        for (var id in bandwagonService.feeds)
+        for (var id in bandwagonService.collections)
         {
-            if (feed.equals(bandwagonService.feeds[id]))
+            if (collection.equals(bandwagonService.collections[id]))
             {
-                delete bandwagonService.feeds[id];
+                delete bandwagonService.collections[id];
 
                 bandwagonService._notifyListChangeObservers();
 
@@ -535,25 +686,25 @@ BandwagonService.prototype = {
         }
     },
 
-    getFeedItemsPerPage: function(feed)
+    getAddonsPerPage: function(collection)
     {
-        // returns the global feed items per page, if enabled. otherwise, this feed's feed items per page.
+        // returns the global collection items per page, if enabled. otherwise, this collection's collection items per page.
 
-        var feedItemsPerPage;
+        var addonsPerPage;
 
-        if (Bandwagon.Preferences.getPreference("feeditemsperpage.enabled"))
+        if (Bandwagon.Preferences.getPreference("addonsperpage.enabled"))
         {
-            feedItemsPerPage = Bandwagon.Preferences.getPreference("feeditemsperpage");
+            addonsPerPage = Bandwagon.Preferences.getPreference("addonsperpage");
         }
         else
         {
-            feedItemsPerPage = feed.feedItemsPerPage;
+            addonsPerPage = collection.addonsPerPage;
         }
 
-        if (feedItemsPerPage<1)
-            feedItemsPerPage = 1;
+        if (addonsPerPage<1)
+            addonsPerPage = 1;
 
-        return feedItemsPerPage;
+        return addonsPerPage;
     },
 
     getPreviouslySharedEmailAddresses: function()
@@ -563,6 +714,9 @@ BandwagonService.prototype = {
 
     addPreviouslySharedEmailAddress: function(emailAddress)
     {
+        emailAddress = emailAddress.replace(/^\s+/, "");
+        emailAddress = emailAddress.replace(/\s+$/, "");
+
         var previouslySharedEmailAddresses = this.getPreviouslySharedEmailAddresses();
 
         for (var i=0; i<previouslySharedEmailAddresses.length; i++)
@@ -578,9 +732,19 @@ BandwagonService.prototype = {
         Bandwagon.Preferences.setPreferenceList("publish.shared.emails", previouslySharedEmailAddresses);
     },
 
-    publishToFeed: function(extension, feed, personalNote, callback)
+    addPreviouslySharedEmailAddresses: function(commaSeparatedEmailAddresses)
     {
-        this._service.publishToFeed(extension, feed, personalNote, callback);
+        var bits = commaSeparatedEmailAddresses.split(",");
+
+        for (var i=0; i<bits.length; i++)
+        {
+            this.addPreviouslySharedEmailAddress(bits[i]);
+        }
+    },
+
+    publishToCollection: function(extension, collection, personalNote, callback)
+    {
+        this._service.publishToCollection(extension, collection, personalNote, callback);
     },
 
     shareToEmail: function(extension, emailAddress, personalNote, callback)
@@ -588,36 +752,56 @@ BandwagonService.prototype = {
         this._service.shareToEmail(extension, emailAddress, personalNote, callback);
     },
 
-    _feedUpdateObserver: function(feed)
+    isAMOAuthenticated: function()
     {
-        // called when a feed is updated
+        var cm = CookieManager.getService(nsICookieManager);
+
+        var iterator = cm.enumerator;
 
-        // if there are new items, notify the user if notifications are enabled for this user and it's not a preview of a feed
+        while (iterator.hasMoreElements())
+        {
+            var cookie = iterator.getNext();
 
-        Bandwagon.Logger.debug("in _feedUpdateObserver() with feed '" + feed + "', unnotified feed items = " + feed.getUnnotifiedFeedItems().length)
+            if (cookie instanceof Ci.nsICookie)
+            {
+                if (cookie.host == Bandwagon.AMO_AUTH_COOKIE_HOST && cookie.name == Bandwagon.AMO_AUTH_COOKIE_NAME)
+                    return true;
+            }
+        }
+
+        return false;
+    },
+
+    _collectionUpdateObserver: function(collection)
+    {
+        // called when a collection is updated
+
+        // if there are new items, notify the user if notifications are enabled for this user and it's not a preview of a collection
+
+        Bandwagon.Logger.debug("in _collectionUpdateObserver() with collection '" + collection + "', unnotified collection items = " + collection.getUnnotifiedAddons().length)
 
         var globalShowNotifications = Bandwagon.Preferences.getPreference("notifyall.enabled");
 
-        if (feed.getUnnotifiedFeedItems().length > 0 && (feed.showNotifications || globalShowNotifications) && !feed.preview)
+        if (collection.getUnnotifiedAddons().length > 0 && (collection.showNotifications || globalShowNotifications) && !collection.preview)
         {
             var browserWindow = WindowMediator.getService(nsIWindowMediator).getMostRecentWindow("navigator:browser");
 
             if (browserWindow)
             {
-                browserWindow.Bandwagon.Controller.BrowserOverlay.showNewFeedItemsAlert(feed);
+                browserWindow.Bandwagon.Controller.BrowserOverlay.showNewAddonsAlert(collection);
             }
             else
             {
                 Bandwagon.Logger.error("Can't find a browser window to notify the user");
             }
 
-            feed.setAllNotified();
+            collection.setAllNotified();
         }
 
-        // commit the feed
+        // commit the collection
 
         if (Bandwagon.COMMIT_NOW)
-            bandwagonService.commit(feed);
+            bandwagonService.commit(collection);
     },
 
     _initStorage: function()
@@ -644,7 +828,7 @@ BandwagonService.prototype = {
             return;
         }
 
-        this._feedFactory = new Bandwagon.Factory.FeedFactory(this._storageConnection);
+        this._collectionFactory = new Bandwagon.Factory.CollectionFactory(this._storageConnection);
 
         this._initStorageTables();
     },
@@ -659,7 +843,12 @@ BandwagonService.prototype = {
         try
         {
             this._storageConnection.executeSimpleSQL(
-                "CREATE TABLE IF NOT EXISTS feeds "
+                "CREATE TABLE IF NOT EXISTS serviceDocument "
+                + "(emailResourceURL TEXT NOT NULL, "
+                + "collectionListResourceURL TEXT NOT NULL)"
+                );
+            this._storageConnection.executeSimpleSQL(
+                "CREATE TABLE IF NOT EXISTS collections "
                 + "(id INTEGER PRIMARY KEY AUTOINCREMENT, "
                 + "url TEXT NOT NULL UNIQUE, "
                 + "name TEXT NOT NULL, "
@@ -670,12 +859,18 @@ BandwagonService.prototype = {
                 + "showNotifications INTEGER NOT NULL, "
                 + "autoPublish INTEGER NOT NULL, "
                 + "active INTEGER NOT NULL DEFAULT 1, "
-                + "feedItemsPerPage INTEGER NOT NULL)"
+                + "addonsPerPage INTEGER NOT NULL, "
+                + "creator TEXT, "
+                + "listed INTEGER NOT NULL DEFAULT 1, "
+                + "writable INTEGER NOT NULL DEFAULT 0, "
+                + "subscribed INTEGER NOT NULL DEFAULT 1, "
+                + "lastModified INTEGER, "
+                + "addonsResourceURL TEXT)"
                 );
             this._storageConnection.executeSimpleSQL(
-                "CREATE TABLE IF NOT EXISTS feedItems "
+                "CREATE TABLE IF NOT EXISTS collectionsAddons "
                 + "(id INTEGER PRIMARY KEY AUTOINCREMENT, "
-                + "feed INTEGER NOT NULL, "
+                + "collection INTEGER NOT NULL, "
                 + "addon INTEGER NOT NULL, "
                 + "read INTEGER NOT NULL DEFAULT 0)"
                 );
@@ -724,6 +919,11 @@ BandwagonService.prototype = {
                 + "comment TEXT NOT NULL, "
                 + "author TEXT NOT NULL)"
                 );
+            this._storageConnection.executeSimpleSQL(
+                "CREATE TABLE IF NOT EXISTS addonAuthors "
+                + "(addon INTEGER NOT NULL, "
+                + "author TEXT NOT NULL)"
+                );
         }
         catch (e)
         {
diff --git a/bandwagon/content/scripts/bandwagon.js b/bandwagon/content/scripts/bandwagon.js
index 55039b1..ff34feb 100644
--- a/bandwagon/content/scripts/bandwagon.js
+++ b/bandwagon/content/scripts/bandwagon.js
@@ -14,11 +14,11 @@
  * The Original Code is bandwagon.
  *
  * The Initial Developer of the Original Code is
- * David McNamara.
+ * Mozilla Corporation.
  * Portions created by the Initial Developer are Copyright (C) 2008
  * the Initial Developer. All Rights Reserved.
  *
- * Contributor(s):
+ * Contributor(s): David McNamara
  *
  * 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,15 +42,26 @@ Bandwagon.RPC = new function() {}
 
 Bandwagon.EMID = "sharing@addons.mozilla.org";
 Bandwagon.SQLITE_FILENAME = "bandwagon.sqlite";
-Bandwagon.FEED_UPDATE_TIMER_DELAY = 60 * 60; // interval between checking if feeds need updating (in seconds) (this will always be 30 seconds in debug mode)
-Bandwagon.DEFAULT_FEED_UPDATE_INTERVAL = 24 * 60 * 60; // default individual feed update interval (in seconds)
-Bandwagon.DEFAULT_FEED_ITEMS_PER_PAGE = 20;
-Bandwagon.DEFAULT_FEED1_URL = "https://services.addons.mozilla.org/en-US/firefox/api/1.1/list/featured/all/10/";
-Bandwagon.DEFAULT_FEED1_NAME = "Featured Add-ons";
+Bandwagon.COLLECTION_UPDATE_TIMER_DELAY = 60 * 60; // interval between checking if collection needs updating (in seconds) (this will always be 30 seconds in debug mode)
+Bandwagon.DEFAULT_COLLECTION_UPDATE_INTERVAL = 24 * 60 * 60; // default individual collection update interval (in seconds)
+Bandwagon.DEFAULT_ADDONS_PER_PAGE = 20;
+
+// REMEMBER: when changing AMO_HOST, the service document url in scripts/rpc/constants.js also has to be changed.
+
+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_NEW_COLLECTION_URL = "https://" + Bandwagon.AMO_HOST + "/en-US/firefox/collections/add";
 Bandwagon.FIRSTRUN_LANDING_PAGE = "http://www.google.com/search?hl=en&q=bandwagon+first+run+landing+page&btnG=Google+Search&aq=f&oq="; // TODO
-Bandwagon.FEEDSPANE_DO_SUBSCRIBE_URL = "http://www.google.com/search?hl=en&q=bandwagon+subscribe+page&btnG=Search"; // TODO 
-Bandwagon.MAGIC_ADD_FEED_COOKIE_HOST = "www.33eels.com"; // TODO
-Bandwagon.MAGIC_ADD_FEED_COOKIE_NAME = "bandwagon_addfeed";
+Bandwagon.AMO_AUTH_COOKIE_HOST = Bandwagon.AMO_HOST;
+Bandwagon.AMO_AUTH_COOKIE_NAME = "AMOv3";
+
+/* ** 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
new file mode 100644
index 0000000..a6b59ac
--- /dev/null
+++ b/bandwagon/content/scripts/factory/collectionFactory.js
@@ -0,0 +1,758 @@
+/* ***** 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 bandwagon.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): David McNamara
+ *
+ * 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 ***** */
+
+Bandwagon.Factory.CollectionFactory = function(connection)
+{
+    this.Bandwagon = Bandwagon;
+    this.connection = connection;
+}
+
+Bandwagon.Factory.CollectionFactory.prototype.openServiceDocument = function()
+{
+    if (!this.connection)
+        return null;
+        
+    var statement = this.connection.createStatement("SELECT * FROM serviceDocument LIMIT 1");
+
+    var serviceDocument = null;
+
+    try
+    {
+        statement.execute();
+
+        while (statement.executeStep())
+        {
+            serviceDocument = new this.Bandwagon.Model.ServiceDocument();
+            serviceDocument.emailResourceURL = statement.getUTF8String(0);
+            serviceDocument.collectionListResourceURL = statement.getUTF8String(1);
+        }
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    return serviceDocument;
+}
+
+Bandwagon.Factory.CollectionFactory.prototype.commitServiceDocument = function(serviceDocument)
+{
+    if (!this.connection)
+        return null;
+
+    var statement1 = this.connection.createStatement("DELETE FROM serviceDocument");
+
+    try
+    {
+        statement1.execute();
+    }
+    finally
+    {
+        statement1.reset();
+    }
+
+    var statement2 = this.connection.createStatement("INSERT INTO serviceDocument VALUES (?1, ?2)");
+
+    try
+    {
+        statement2.bindUTF8StringParameter(0, serviceDocument.emailResourceURL);
+        statement2.bindUTF8StringParameter(1, serviceDocument.collectionListResourceURL);
+        statement2.execute();
+    }
+    finally
+    {
+        statement2.reset();
+    }
+}
+
+Bandwagon.Factory.CollectionFactory.prototype.newCollection = function()
+{
+    return new this.Bandwagon.Model.Collection();
+}
+
+Bandwagon.Factory.CollectionFactory.prototype.openCollection = function(collection_id)
+{
+    if (!this.connection)
+        return null;
+
+    var collections = {};
+        
+    var statement = this.connection.createStatement("SELECT * FROM collections where id = ?1");
+
+    try
+    {
+        statement.bindInt32Parameter(0, collection_id);
+        statement.execute();
+
+        var collection = this._openCollectionFromRS(statement);
+
+        if (!collection)
+            return null;
+
+        collection.addons = this._openAddons(collection);
+
+        collections[collection.resourceURL] = collection;
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    return collection;
+}
+
+Bandwagon.Factory.CollectionFactory.prototype.openCollections = function()
+{
+    if (!this.connection)
+        return null;
+
+    var collections = {};
+        
+    var statement = this.connection.createStatement("SELECT * FROM collections");
+
+    try
+    {
+        while (statement.executeStep())
+        {
+            var collection = this._openCollectionFromRS(statement);
+
+            if (!collection)
+                continue;
+
+            collection.addons = this._openAddons(collection);
+
+            collections[collection.resourceURL] = collection;
+        }
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    return collections;
+}
+
+Bandwagon.Factory.CollectionFactory.prototype.commitCollection = function(collection)
+{
+    if (!this.connection)
+        return;
+
+    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)");
+
+    try
+    {
+        (collection.storageID==-1?statement.bindNullParameter(0):statement.bindInt32Parameter(0, collection.storageID));
+        statement.bindUTF8StringParameter(1, collection.resourceURL);
+        statement.bindUTF8StringParameter(2, collection.name);
+        statement.bindUTF8StringParameter(3, collection.description);
+        statement.bindInt32Parameter(4, collection.dateAdded.getTime()/1000);
+        (collection.dateLastCheck == null?statement.bindNullParameter(5):statement.bindInt32Parameter(5, collection.dateLastCheck.getTime()/1000));
+        statement.bindInt32Parameter(6, collection.updateInterval);
+        statement.bindInt32Parameter(7, (collection.showNotifications?1:0));
+        statement.bindInt32Parameter(8, (collection.autoPublish?1:0));
+        statement.bindInt32Parameter(9, (collection.active?1:0));
+        statement.bindInt32Parameter(10, collection.addonsPerPage);
+        statement.bindUTF8StringParameter(11, collection.creator);
+        statement.bindInt32Parameter(12, collection.listed);
+        statement.bindInt32Parameter(13, collection.writable);
+        statement.bindInt32Parameter(14, collection.subscribed);
+        (collection.lastModified == null?statement.bindNullParameter(15):statement.bindInt32Parameter(15, collection.lastModified.getTime()/1000));
+        statement.bindUTF8StringParameter(16, collection.addonsResourceURL);
+        
+        statement.execute();
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    if (collection.storageID == -1) 
+    {
+        collection.storageID = this.connection.lastInsertRowID;
+    }
+
+    for (var id in collection.addons)
+    {
+        this._commitAddon(collection, collection.addons[id]);
+    }
+
+    return true;
+}
+
+Bandwagon.Factory.CollectionFactory.prototype.commitCollections = function(collections)
+{
+    for (var id in collections)
+    {
+        this.commitCollection(collections[id]);
+    }
+}
+
+Bandwagon.Factory.CollectionFactory.prototype.deleteCollection = function(collection)
+{
+    if (!this.connection)
+        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();
+    }
+    finally
+    {
+        statement1.reset();
+        statement2.reset();
+    }
+
+    return (statement2.lastError>0?false:true);
+}
+
+// private methods
+
+Bandwagon.Factory.CollectionFactory.prototype._openCollectionFromRS = function(resultset)
+{
+        var collection = new this.Bandwagon.Model.Collection();
+        collection.storageID = resultset.getInt32(0);
+        collection.resourceURL = resultset.getUTF8String(1);
+        collection.name = resultset.getUTF8String(2);
+        collection.description = resultset.getUTF8String(3);
+        collection.dateAdded = new Date(resultset.getInt32(4)*1000);
+
+        if (!resultset.getIsNull(5))
+            collection.dateLastCheck = new Date(resultset.getInt32(5)*1000);
+
+        collection.updateInterval = resultset.getInt32(6);
+        collection.showNotifications = (resultset.getInt32(7)==1?true:false);
+        collection.autoPublish = (resultset.getInt32(8)==1?true:false);
+        collection.active = (resultset.getInt32(9)==1?true:false);
+        collection.addonsPerPage = resultset.getInt32(10);
+        collection.creator = resultset.getUTF8String(11);
+        collection.listed = resultset.getInt32(12);
+        collection.writable = resultset.getInt32(13);
+        collection.subscribed = resultset.getInt32(14);
+
+        if (!resultset.getIsNull(15))
+            collection.lastModified = new Date(resultset.getInt32(15)*1000);
+
+        collection.addonsResourceURL = resultset.getUTF8String(16);
+
+        return collection;
+}
+
+Bandwagon.Factory.CollectionFactory.prototype._openAddons = function(collection)
+{
+    var addons = {};
+
+    var statement = this.connection.createStatement("SELECT addons.*, collectionsAddons.id, collectionsAddons.read FROM addons LEFT JOIN collectionsAddons ON addons.id = collectionsAddons.addon WHERE collectionsAddons.collection = ?1 LIMIT ?2");
+
+    try
+    {
+        statement.bindInt32Parameter(0, collection.storageID);
+        statement.bindInt32Parameter(1, this.Bandwagon.DEFAULT_ADDONS_PER_PAGE);
+
+        while (statement.executeStep())
+        {
+            var addon = new this.Bandwagon.Model.Addon();
+            addon.Bandwagon = this.Bandwagon;
+
+            addon.storageID = statement.getInt32(0);
+            addon.guid = statement.getUTF8String(1);
+            addon.name = statement.getUTF8String(2);
+            addon.type = statement.getInt32(3);
+            addon.version = statement.getUTF8String(4);
+            addon.status = statement.getInt32(5);
+            addon.summary = statement.getUTF8String(6);
+            addon.description = statement.getUTF8String(7);
+            addon.icon = statement.getUTF8String(8);
+            addon.eula = statement.getUTF8String(9);
+            addon.thumbnail = statement.getUTF8String(10);
+            addon.learnmore = statement.getUTF8String(11);
+            addon.author = statement.getUTF8String(12);
+            addon.category = statement.getUTF8String(13);
+            addon.dateAdded = new Date(statement.getInt32(14)*1000);
+            addon.collectionsAddonsStorageID = statement.getInt32(15);
+            addon.read = (statement.getInt32(16)==1?true:false);
+
+            addon.compatibleApplications = this._openAddonCompatibleApplications(addon);
+            addon.compatibleOS = this._openAddonCompatibleOS(addon);
+            addon.installs = this._openAddonInstalls(addon);
+            addon.comments = this._openAddonComments(addon);
+            addon.authors = this._openAddonAuthors(addon);
+
+            addons[addon.guid] = addon;
+        }
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    return addons;
+}
+
+Bandwagon.Factory.CollectionFactory.prototype._openAddonCompatibleApplications = function(addon)
+{
+    var compatibleApplications = {};
+        
+    var statement = this.connection.createStatement("SELECT * FROM addonCompatibleApplications WHERE addon = ?1");
+
+    try
+    {
+        statement.bindInt32Parameter(0, addon.storageID);
+
+        while (statement.executeStep())
+        {
+            var application =
+            {
+                name: statement.getUTF8String(1).toString().toUpperCase(),
+                applicationId: statement.getInt32(2),
+                minVersion: statement.getUTF8String(3),
+                maxVersion: statement.getUTF8String(4),
+                guid: statement.getUTF8String(5)
+            };
+
+            compatibleApplications[application.name.toUpperCase()] = application;
+        }
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    return compatibleApplications;
+}
+
+Bandwagon.Factory.CollectionFactory.prototype._openAddonCompatibleOS = function(addon)
+{
+    var compatibleOS = {};
+        
+    var statement = this.connection.createStatement("SELECT * FROM addonCompatibleOS WHERE addon = ?1");
+
+    try
+    {
+        statement.bindInt32Parameter(0, addon.storageID);
+
+        while (statement.executeStep())
+        {
+            var os = statement.getUTF8String(1).toString().toUpperCase();
+
+            compatibleOS[os] = os;
+        }
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    return compatibleOS;
+}
+
+Bandwagon.Factory.CollectionFactory.prototype._openAddonInstalls = function(addon)
+{
+    var installs = {};
+        
+    var statement = this.connection.createStatement("SELECT * FROM addonInstalls WHERE addon = ?1");
+
+    try
+    {
+        statement.bindInt32Parameter(0, addon.storageID);
+
+        while (statement.executeStep())
+        {
+            var install =
+            {
+                url: statement.getUTF8String(1),
+                hash: statement.getUTF8String(2),
+                os: statement.getUTF8String(3).toString().toUpperCase()
+            };
+
+            installs[install.os] = install;
+        }
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    return installs;
+}
+
+Bandwagon.Factory.CollectionFactory.prototype._openAddonComments = function(addon)
+{
+    var comments = [];
+        
+    var statement = this.connection.createStatement("SELECT * FROM addonComments WHERE addon = ?1");
+
+    try
+    {
+        statement.bindInt32Parameter(0, addon.storageID);
+
+        while (statement.executeStep())
+        {
+            var comment =
+            {
+                comment: statement.getUTF8String(1),
+                author: statement.getUTF8String(2)
+            };
+
+            comments.push(comment);
+        }
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    return comments;
+}
+
+Bandwagon.Factory.CollectionFactory.prototype._openAddonAuthors = function(addon)
+{
+    var authors = [];
+        
+    var statement = this.connection.createStatement("SELECT * FROM addonAuthors WHERE addon = ?1");
+
+    try
+    {
+        statement.bindInt32Parameter(0, addon.storageID);
+
+        while (statement.executeStep())
+        {
+            authors.push(statement.getUTF8String(1));
+        }
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    return authors;
+}
+
+Bandwagon.Factory.CollectionFactory.prototype._commitAddon = function(collection, addon)
+{
+    if (!this.connection)
+        return;
+
+    // addons 
+    // if guid already exists - just update the addon
+    // if guid doesn't exist  - insert
+
+    var statement = this.connection.createStatement("SELECT id FROM addons where guid = ?1");
+    var addonStorageID = null;
+
+    try
+    {
+        statement.bindUTF8StringParameter(0, addon.guid);
+    
+        while (statement.executeStep())
+        {
+            addonStorageID = statement.getInt32(0);
+        }
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    var statement2 = this.connection.createStatement("REPLACE INTO addons VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15)");
+
+    try
+    {
+        if (addonStorageID != null)
+        {
+            // addon already exists (in another collection, or from previous commit of this collection)
+            statement2.bindInt32Parameter(0, addonStorageID);
+        }
+        else if (addon.storageID != -1)
+        {
+            // addon doesn't already exist, but exists from a previous commit of this collection (?)
+            statement2.bindInt32Parameter(0, addon.storageID);
+        }
+        else
+        {
+            // new addon
+            statement2.bindNullParameter(0)
+        }
+
+        statement2.bindUTF8StringParameter(1, addon.guid);
+        statement2.bindUTF8StringParameter(2, addon.name);
+        statement2.bindInt32Parameter(3, addon.type);
+        statement2.bindUTF8StringParameter(4, addon.version);
+        statement2.bindInt32Parameter(5, addon.status);
+        statement2.bindUTF8StringParameter(6, addon.summary);
+        statement2.bindUTF8StringParameter(7, addon.description);
+        statement2.bindUTF8StringParameter(8, addon.icon);
+        statement2.bindUTF8StringParameter(9, addon.eula);
+        statement2.bindUTF8StringParameter(10, addon.thumbnail);
+        statement2.bindUTF8StringParameter(11, addon.learnmore);
+        statement2.bindUTF8StringParameter(12, addon.author);
+        statement2.bindUTF8StringParameter(13, addon.category);
+        statement2.bindUTF8StringParameter(14, addon.dateAdded.getTime()/1000);
+        
+        statement2.execute();
+    }
+    finally
+    {
+        statement2.reset();
+    }
+
+    if (addon.storageID == -1 && addonStorageID == null) 
+    {
+        addonStorageID = this.connection.lastInsertRowID;
+    }
+
+    // add the other addon bits
+
+    for (var id in addon.compatibleApplications)
+    {
+        this._commitAddonCompatibleApplication(addonStorageID, addon.compatibleApplications[id]);
+    }
+
+    for (var id in addon.compatibleOS)
+    {
+        this._commitAddonCompatibleOS(addonStorageID, addon.compatibleOS[id]);
+    }
+
+    for (var id in addon.installs)
+    {
+        this._commitAddonInstall(addonStorageID, addon.installs[id]);
+    }
+
+    for (var i=0; i<addon.comments.length; i++)
+    {
+        this._commitAddonComment(addonStorageID, addon.comments[i]);
+    }
+
+    for (var id in addon.authors)
+    {
+        this._commitAddonAuthor(addonStorageID, addon.authors[id]);
+    }
+
+    // add the addon connector
+
+    var statement3 = this.connection.createStatement("REPLACE INTO collectionsAddons VALUES (?1, ?2, ?3, ?4)");
+
+    try
+    {
+        if (addon.collectionsAddonsStorageID == -1)
+        {
+            statement3.bindNullParameter(0);
+        }
+        else
+        {
+            statement3.bindInt32Parameter(0, addon.collectionsAddonsStorageID);
+        }
+
+        statement3.bindInt32Parameter(1, collection.storageID);
+        statement3.bindInt32Parameter(2, addonStorageID);
+        statement3.bindInt32Parameter(3, (addon.read?1:0));
+        
+        statement3.execute();
+    }
+    finally
+    {
+        statement3.reset();
+    }
+
+    if (addon.collectionsAddonsStorageID == -1)
+    {
+        addon.collectionsAddonsStorageID = this.connection.lastInsertRowID;
+    }
+
+    return true;
+}
+
+Bandwagon.Factory.CollectionFactory.prototype._commitAddonCompatibleApplication = function(addonStorageID, application)
+{
+    var statement = this.connection.createStatement("DELETE FROM addonCompatibleApplications WHERE addon = ?1");
+
+    try
+    {
+        statement.bindInt32Parameter(0, addonStorageID);
+        statement.execute();
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    var statement2 = this.connection.createStatement("INSERT INTO addonCompatibleApplications VALUES (?1, ?2, ?3, ?4, ?5, ?6)");
+
+    try
+    {
+        statement2.bindInt32Parameter(0, addonStorageID);
+        statement2.bindUTF8StringParameter(1, application.name);
+        statement2.bindInt32Parameter(2, application.applicationId);
+        statement2.bindUTF8StringParameter(3, application.minVersion);
+        statement2.bindUTF8StringParameter(4, application.maxVersion);
+        statement2.bindUTF8StringParameter(5, application.guid);
+        
+        statement2.execute();
+    }
+    finally
+    {
+        statement2.reset();
+    }
+}
+
+Bandwagon.Factory.CollectionFactory.prototype._commitAddonCompatibleOS = function(addonStorageID, os)
+{
+    var statement = this.connection.createStatement("DELETE FROM addonCompatibleOS WHERE addon = ?1");
+
+    try
+    {
+        statement.bindInt32Parameter(0, addonStorageID);
+        statement.execute();
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    var statement2 = this.connection.createStatement("INSERT INTO addonCompatibleOS VALUES (?1, ?2)");
+
+    try
+    {
+        statement2.bindInt32Parameter(0, addonStorageID);
+        statement2.bindUTF8StringParameter(1, os);
+        
+        statement2.execute();
+    }
+    finally
+    {
+        statement2.reset();
+    }
+}
+
+Bandwagon.Factory.CollectionFactory.prototype._commitAddonInstall = function(addonStorageID, install)
+{
+    var statement = this.connection.createStatement("DELETE FROM addonInstalls WHERE addon = ?1");
+
+    try
+    {
+        statement.bindInt32Parameter(0, addonStorageID);
+        statement.execute();
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    var statement2 = this.connection.createStatement("INSERT INTO addonInstalls VALUES (?1, ?2, ?3, ?4)");
+
+    try
+    {
+        statement2.bindInt32Parameter(0, addonStorageID);
+        statement2.bindUTF8StringParameter(1, install.url);
+        statement2.bindUTF8StringParameter(2, install.hash);
+        statement2.bindUTF8StringParameter(3, install.os);
+        
+        statement2.execute();
+    }
+    finally
+    {
+        statement2.reset();
+    }
+}
+
+Bandwagon.Factory.CollectionFactory.prototype._commitAddonComment = function(addonStorageID, comment)
+{
+    var statement = this.connection.createStatement("DELETE FROM addonComments WHERE addon = ?1");
+
+    try
+    {
+        statement.bindInt32Parameter(0, addonStorageID);
+        statement.execute();
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    var statement2 = this.connection.createStatement("INSERT INTO addonComments VALUES (?1, ?2, ?3)");
+
+    try
+    {
+        statement2.bindInt32Parameter(0, addonStorageID);
+        statement2.bindUTF8StringParameter(1, comment.comment);
+        statement2.bindUTF8StringParameter(2, comment.author);
+        
+        statement2.execute();
+    }
+    finally
+    {
+        statement2.reset();
+    }
+}
+
+Bandwagon.Factory.CollectionFactory.prototype._commitAddonAuthor = function(addonStorageID, author)
+{
+    var statement = this.connection.createStatement("DELETE FROM addonAuthors WHERE addon = ?1");
+
+    try
+    {
+        statement.bindInt32Parameter(0, addonStorageID);
+        statement.execute();
+    }
+    finally
+    {
+        statement.reset();
+    }
+
+    var statement2 = this.connection.createStatement("INSERT INTO addonAuthors VALUES (?1, ?2)");
+
+    try
+    {
+        statement2.bindInt32Parameter(0, addonStorageID);
+        statement2.bindUTF8StringParameter(1, author);
+        
+        statement2.execute();
+    }
+    finally
+    {
+        statement2.reset();
+    }
+}
+
+
diff --git a/bandwagon/content/scripts/factory/feedFactory.js b/bandwagon/content/scripts/factory/feedFactory.js
deleted file mode 100644
index b58823b..0000000
--- a/bandwagon/content/scripts/factory/feedFactory.js
+++ /dev/null
@@ -1,626 +0,0 @@
-/* ***** 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 bandwagon.
- *
- * The Initial Developer of the Original Code is
- * David McNamara.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-Bandwagon.Factory.FeedFactory = function(connection)
-{
-    this.Bandwagon = Bandwagon;
-    this.connection = connection;
-}
-
-Bandwagon.Factory.FeedFactory.prototype.newFeed = function()
-{
-    return new this.Bandwagon.Model.Feed();
-}
-
-Bandwagon.Factory.FeedFactory.prototype.openFeed = function(feed_id)
-{
-    if (!this.connection)
-        return null;
-
-    var feeds = {};
-        
-    var statement = this.connection.createStatement("SELECT * FROM feeds where id = ?1");
-
-    try
-    {
-        statement.bindInt32Parameter(0, feed_id);
-        statement.execute();
-
-        var feed = this._openFeedFromRS(statement);
-
-        if (!feed)
-            return null;
-
-        feed.feedItems = this._openFeedItems(feed);
-
-        feeds[feed.url] = feed;
-    }
-    finally
-    {
-        statement.reset();
-    }
-
-    return feed;
-}
-
-Bandwagon.Factory.FeedFactory.prototype.openFeeds = function()
-{
-    if (!this.connection)
-        return null;
-
-    var feeds = {};
-        
-    var statement = this.connection.createStatement("SELECT * FROM feeds");
-
-    try
-    {
-        while (statement.executeStep())
-        {
-            var feed = this._openFeedFromRS(statement);
-
-            if (!feed)
-                continue;
-
-            feed.feedItems = this._openFeedItems(feed);
-
-            feeds[feed.url] = feed;
-        }
-    }
-    finally
-    {
-        statement.reset();
-    }
-
-    return feeds;
-}
-
-Bandwagon.Factory.FeedFactory.prototype.commitFeed = function(feed)
-{
-    if (!this.connection)
-        return;
-
-    var statement = this.connection.createStatement("REPLACE INTO feeds VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11)");
-
-    try
-    {
-        (feed.id==-1?statement.bindNullParameter(0):statement.bindInt32Parameter(0, feed.id));
-        statement.bindUTF8StringParameter(1, feed.url);
-        statement.bindUTF8StringParameter(2, feed.name);
-        statement.bindUTF8StringParameter(3, feed.description);
-        statement.bindInt32Parameter(4, feed.dateAdded.getTime()/1000);
-        (feed.dateLastCheck == null?statement.bindNullParameter(5):statement.bindInt32Parameter(5, feed.dateLastCheck.getTime()/1000));
-        statement.bindInt32Parameter(6, feed.updateInterval);
-        statement.bindInt32Parameter(7, (feed.showNotifications?1:0));
-        statement.bindInt32Parameter(8, (feed.autoPublish?1:0));
-        statement.bindInt32Parameter(9, (feed.active?1:0));
-        statement.bindInt32Parameter(10, feed.feedItemsPerPage);
-        
-        statement.execute();
-    }
-    finally
-    {
-        statement.reset();
-    }
-
-    if (feed.id == -1) 
-    {
-        feed.id = this.connection.lastInsertRowID;
-    }
-
-    for (var id in feed.feedItems)
-    {
-        this._commitFeedItem(feed, feed.feedItems[id]);
-    }
-
-    return true;
-}
-
-Bandwagon.Factory.FeedFactory.prototype.commitFeeds = function(feeds)
-{
-    for (var id in feeds)
-    {
-        this.commitFeed(feeds[id]);
-    }
-}
-
-Bandwagon.Factory.FeedFactory.prototype.deleteFeed = function(feed)
-{
-    if (!this.connection)
-        return null;
-
-    var statement1 = this.connection.createStatement("DELETE FROM feeds where id = ?1");
-    var statement2 = this.connection.createStatement("DELETE FROM feedItems where feed = ?1");
-
-    try
-    {
-        // TODO transaction here?
-
-        statement1.bindInt32Parameter(0, feed.id);
-        statement1.execute();
-
-        statement2.bindInt32Parameter(0, feed.id);
-        statement2.execute();
-    }
-    finally
-    {
-        statement1.reset();
-        statement2.reset();
-    }
-
-    return (statement2.lastError>0?false:true);
-}
-
-// private methods
-
-Bandwagon.Factory.FeedFactory.prototype._openFeedFromRS = function(resultset)
-{
-        var feed = new this.Bandwagon.Model.Feed();
-        feed.id = resultset.getInt32(0);
-        feed.url = resultset.getUTF8String(1);
-        feed.name = resultset.getUTF8String(2);
-        feed.description = resultset.getUTF8String(3);
-        feed.dateAdded = new Date(resultset.getInt32(4)*1000);
-
-        if (!resultset.getIsNull(5))
-            feed.dateLastCheck = new Date(resultset.getInt32(5)*1000);
-
-        feed.updateInterval = resultset.getInt32(6);
-        feed.showNotifications = (resultset.getInt32(7)==1?true:false);
-        feed.autoPublish = (resultset.getInt32(8)==1?true:false);
-        feed.active = (resultset.getInt32(9)==1?true:false);
-        feed.feedItemsPerPage = resultset.getInt32(10);
-
-        return feed;
-}
-
-Bandwagon.Factory.FeedFactory.prototype._openFeedItems = function(feed)
-{
-    var feedItems = {};
-
-    var statement = this.connection.createStatement("SELECT addons.*, feedItems.id, feedItems.read FROM addons LEFT JOIN feedItems ON addons.id = feedItems.addon WHERE feedItems.feed = ?1 LIMIT ?2");
-
-    try
-    {
-        statement.bindInt32Parameter(0, feed.id);
-        statement.bindInt32Parameter(1, this.Bandwagon.DEFAULT_FEED_ITEMS_PER_PAGE);
-
-        while (statement.executeStep())
-        {
-            var feedItem = new this.Bandwagon.Model.FeedItem();
-            feedItem.Bandwagon = this.Bandwagon;
-
-            feedItem.id = statement.getInt32(0);
-            feedItem.guid = statement.getUTF8String(1);
-            feedItem.name = statement.getUTF8String(2);
-            feedItem.type = statement.getInt32(3);
-            feedItem.version = statement.getUTF8String(4);
-            feedItem.status = statement.getInt32(5);
-            feedItem.summary = statement.getUTF8String(6);
-            feedItem.description = statement.getUTF8String(7);
-            feedItem.icon = statement.getUTF8String(8);
-            feedItem.eula = statement.getUTF8String(9);
-            feedItem.thumbnail = statement.getUTF8String(10);
-            feedItem.learnmore = statement.getUTF8String(11);
-            feedItem.author = statement.getUTF8String(12);
-            feedItem.category = statement.getUTF8String(13);
-            feedItem.dateAdded = new Date(statement.getInt32(14)*1000);
-            feedItem.feedItemId = statement.getInt32(15);
-            feedItem.read = (statement.getInt32(16)==1?true:false);
-
-            feedItem.compatibleApplications = this._openFeedItemCompatibleApplications(feedItem);
-            feedItem.compatibleOS = this._openFeedItemCompatibleOS(feedItem);
-            feedItem.installs = this._openFeedItemInstalls(feedItem);
-            feedItem.comments = this._openFeedItemComments(feedItem);
-
-            feedItems[feedItem.guid] = feedItem;
-        }
-    }
-    finally
-    {
-        statement.reset();
-    }
-
-    return feedItems;
-}
-
-Bandwagon.Factory.FeedFactory.prototype._openFeedItemCompatibleApplications = function(feedItem)
-{
-    var compatibleApplications = {};
-        
-    var statement = this.connection.createStatement("SELECT * FROM addonCompatibleApplications WHERE addon = ?1");
-
-    try
-    {
-        statement.bindInt32Parameter(0, feedItem.id);
-
-        while (statement.executeStep())
-        {
-            var application =
-            {
-                name: statement.getUTF8String(1).toString().toUpperCase(),
-                applicationId: statement.getInt32(2),
-                minVersion: statement.getUTF8String(3),
-                maxVersion: statement.getUTF8String(4),
-                guid: statement.getUTF8String(5)
-            };
-
-            compatibleApplications[application.name.toUpperCase()] = application;
-        }
-    }
-    finally
-    {
-        statement.reset();
-    }
-
-    return compatibleApplications;
-}
-
-Bandwagon.Factory.FeedFactory.prototype._openFeedItemCompatibleOS = function(feedItem)
-{
-    var compatibleOS = {};
-        
-    var statement = this.connection.createStatement("SELECT * FROM addonCompatibleOS WHERE addon = ?1");
-
-    try
-    {
-        statement.bindInt32Parameter(0, feedItem.id);
-
-        while (statement.executeStep())
-        {
-            var os = statement.getUTF8String(1).toString().toUpperCase();
-
-            compatibleOS[os] = os;
-        }
-    }
-    finally
-    {
-        statement.reset();
-    }
-
-    return compatibleOS;
-}
-
-Bandwagon.Factory.FeedFactory.prototype._openFeedItemInstalls = function(feedItem)
-{
-    var installs = {};
-        
-    var statement = this.connection.createStatement("SELECT * FROM addonInstalls WHERE addon = ?1");
-
-    try
-    {
-        statement.bindInt32Parameter(0, feedItem.id);
-
-        while (statement.executeStep())
-        {
-            var install =
-            {
-                url: statement.getUTF8String(1),
-                hash: statement.getUTF8String(2),
-                os: statement.getUTF8String(3).toString().toUpperCase()
-            };
-
-            installs[install.os] = install;
-        }
-    }
-    finally
-    {
-        statement.reset();
-    }
-
-    return installs;
-}
-
-Bandwagon.Factory.FeedFactory.prototype._openFeedItemComments = function(feedItem)
-{
-    var comments = [];
-        
-    var statement = this.connection.createStatement("SELECT * FROM addonComments WHERE addon = ?1");
-
-    try
-    {
-        statement.bindInt32Parameter(0, feedItem.id);
-
-        while (statement.executeStep())
-        {
-            var comment =
-            {
-                comment: statement.getUTF8String(1),
-                author: statement.getUTF8String(2)
-            };
-
-            comments.push(comment);
-        }
-    }
-    finally
-    {
-        statement.reset();
-    }
-
-    return comments;
-}
-
-Bandwagon.Factory.FeedFactory.prototype._commitFeedItem = function(feed, feedItem)
-{
-    if (!this.connection)
-        return;
-
-    // addons 
-    // if guid already exists - just update the addon
-    // if guid doesn't exist  - insert
-
-    var statement = this.connection.createStatement("SELECT id FROM addons where guid = ?1");
-    var addonid = null;
-
-    try
-    {
-        statement.bindUTF8StringParameter(0, feedItem.guid);
-    
-        while (statement.executeStep())
-        {
-            addonid = statement.getInt32(0);
-        }
-    }
-    finally
-    {
-        statement.reset();
-    }
-
-    var statement2 = this.connection.createStatement("REPLACE INTO addons VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15)");
-
-    try
-    {
-        if (addonid != null)
-        {
-            // addon already exists (in another feed, or from previous commit of this feed)
-            statement2.bindInt32Parameter(0, addonid);
-        }
-        else if (feedItem.id != -1)
-        {
-            // addon doesn't already exist, but exists from a previous commit of this feed (?)
-            statement2.bindInt32Parameter(0, feedItem.id);
-        }
-        else
-        {
-            // new addon
-            statement2.bindNullParameter(0)
-        }
-
-        statement2.bindUTF8StringParameter(1, feedItem.guid);
-        statement2.bindUTF8StringParameter(2, feedItem.name);
-        statement2.bindInt32Parameter(3, feedItem.type);
-        statement2.bindUTF8StringParameter(4, feedItem.version);
-        statement2.bindInt32Parameter(5, feedItem.status);
-        statement2.bindUTF8StringParameter(6, feedItem.summary);
-        statement2.bindUTF8StringParameter(7, feedItem.description);
-        statement2.bindUTF8StringParameter(8, feedItem.icon);
-        statement2.bindUTF8StringParameter(9, feedItem.eula);
-        statement2.bindUTF8StringParameter(10, feedItem.thumbnail);
-        statement2.bindUTF8StringParameter(11, feedItem.learnmore);
-        statement2.bindUTF8StringParameter(12, feedItem.author);
-        statement2.bindUTF8StringParameter(13, feedItem.category);
-        statement2.bindUTF8StringParameter(14, feedItem.dateAdded.getTime()/1000);
-        
-        statement2.execute();
-    }
-    finally
-    {
-        statement2.reset();
-    }
-
-    if (feedItem.id == -1 && addonid == null) 
-    {
-        addonid = this.connection.lastInsertRowID;
-    }
-
-    // add the other addon bits
-
-    for (var id in feedItem.compatibleApplications)
-    {
-        this._commitAddonCompatibleApplication(addonid, feedItem.compatibleApplications[id]);
-    }
-
-    for (var id in feedItem.compatibleOS)
-    {
-        this._commitAddonCompatibleOS(addonid, feedItem.compatibleOS[id]);
-    }
-
-    for (var id in feedItem.installs)
-    {
-        this._commitAddonInstall(addonid, feedItem.installs[id]);
-    }
-
-    for (var i=0; i<feedItem.comments.length; i++)
-    {
-        this._commitAddonComment(addonid, feedItem.comments[i]);
-    }
-
-    // add the feedItem connector
-
-    var statement3 = this.connection.createStatement("REPLACE INTO feedItems VALUES (?1, ?2, ?3, ?4)");
-
-    try
-    {
-        if (feedItem.feedItemId == -1)
-        {
-            statement3.bindNullParameter(0);
-        }
-        else
-        {
-            statement3.bindInt32Parameter(0, feedItem.feedItemId);
-        }
-
-        statement3.bindInt32Parameter(1, feed.id);
-        statement3.bindInt32Parameter(2, addonid);
-        statement3.bindInt32Parameter(3, (feedItem.read?1:0));
-        
-        statement3.execute();
-    }
-    finally
-    {
-        statement3.reset();
-    }
-
-    if (feedItem.feedItemId == -1)
-    {
-        feedItem.feedItemId = this.connection.lastInsertRowID;
-    }
-
-    return true;
-}
-
-Bandwagon.Factory.FeedFactory.prototype._commitAddonCompatibleApplication = function(addonid, application)
-{
-    var statement = this.connection.createStatement("DELETE FROM addonCompatibleApplications WHERE addon = ?1");
-
-    try
-    {
-        statement.bindInt32Parameter(0, addonid);
-        statement.execute();
-    }
-    finally
-    {
-        statement.reset();
-    }
-
-    var statement2 = this.connection.createStatement("INSERT INTO addonCompatibleApplications VALUES (?1, ?2, ?3, ?4, ?5, ?6)");
-
-    try
-    {
-        statement2.bindInt32Parameter(0, addonid);
-        statement2.bindUTF8StringParameter(1, application.name);
-        statement2.bindInt32Parameter(2, application.applicationId);
-        statement2.bindUTF8StringParameter(3, application.minVersion);
-        statement2.bindUTF8StringParameter(4, application.maxVersion);
-        statement2.bindUTF8StringParameter(5, application.guid);
-        
-        statement2.execute();
-    }
-    finally
-    {
-        statement2.reset();
-    }
-}
-
-Bandwagon.Factory.FeedFactory.prototype._commitAddonCompatibleOS = function(addonid, os)
-{
-    var statement = this.connection.createStatement("DELETE FROM addonCompatibleOS WHERE addon = ?1");
-
-    try
-    {
-        statement.bindInt32Parameter(0, addonid);
-        statement.execute();
-    }
-    finally
-    {
-        statement.reset();
-    }
-
-    var statement2 = this.connection.createStatement("INSERT INTO addonCompatibleOS VALUES (?1, ?2)");
-
-    try
-    {
-        statement2.bindInt32Parameter(0, addonid);
-        statement2.bindUTF8StringParameter(1, os);
-        
-        statement2.execute();
-    }
-    finally
-    {
-        statement2.reset();
-    }
-}
-
-Bandwagon.Factory.FeedFactory.prototype._commitAddonInstall = function(addonid, install)
-{
-    var statement = this.connection.createStatement("DELETE FROM addonInstalls WHERE addon = ?1");
-
-    try
-    {
-        statement.bindInt32Parameter(0, addonid);
-        statement.execute();
-    }
-    finally
-    {
-        statement.reset();
-    }
-
-    var statement2 = this.connection.createStatement("INSERT INTO addonInstalls VALUES (?1, ?2, ?3, ?4)");
-
-    try
-    {
-        statement2.bindInt32Parameter(0, addonid);
-        statement2.bindUTF8StringParameter(1, install.url);
-        statement2.bindUTF8StringParameter(2, install.hash);
-        statement2.bindUTF8StringParameter(3, install.os);
-        
-        statement2.execute();
-    }
-    finally
-    {
-        statement2.reset();
-    }
-}
-
-Bandwagon.Factory.FeedFactory.prototype._commitAddonComment = function(addonid, comment)
-{
-    var statement = this.connection.createStatement("DELETE FROM addonComments WHERE addon = ?1");
-
-    try
-    {
-        statement.bindInt32Parameter(0, addonid);
-        statement.execute();
-    }
-    finally
-    {
-        statement.reset();
-    }
-
-    var statement2 = this.connection.createStatement("INSERT INTO addonComments VALUES (?1, ?2, ?3)");
-
-    try
-    {
-        statement2.bindInt32Parameter(0, addonid);
-        statement2.bindUTF8StringParameter(1, comment.comment);
-        statement2.bindUTF8StringParameter(2, comment.author);
-        
-        statement2.execute();
-    }
-    finally
-    {
-        statement2.reset();
-    }
-}
-
diff --git a/bandwagon/content/scripts/logger.js b/bandwagon/content/scripts/logger.js
index ce8d42c..b4393df 100644
--- a/bandwagon/content/scripts/logger.js
+++ b/bandwagon/content/scripts/logger.js
@@ -14,11 +14,11 @@
  * The Original Code is bandwagon.
  *
  * The Initial Developer of the Original Code is
- * David McNamara.
+ * Mozilla Corporation.
  * Portions created by the Initial Developer are Copyright (C) 2008
  * the Initial Developer. All Rights Reserved.
  *
- * Contributor(s):
+ * Contributor(s): David McNamara
  *
  * 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
diff --git a/bandwagon/content/scripts/model/feedItem.js b/bandwagon/content/scripts/model/addon.js
index b71a592..5ef72b9 100644
--- a/bandwagon/content/scripts/model/feedItem.js
+++ b/bandwagon/content/scripts/model/addon.js
@@ -14,11 +14,11 @@
  * The Original Code is bandwagon.
  *
  * The Initial Developer of the Original Code is
- * David McNamara.
+ * Mozilla Corporation.
  * Portions created by the Initial Developer are Copyright (C) 2008
  * the Initial Developer. All Rights Reserved.
  *
- * Contributor(s):
+ * Contributor(s): David McNamara
  *
  * 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
@@ -34,7 +34,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-Bandwagon.Model.FeedItem = function()
+Bandwagon.Model.Addon = function()
 {
     try
     {
@@ -45,8 +45,8 @@ Bandwagon.Model.FeedItem = function()
     this.TYPE_EXTENSION = 1;
     this.STATUS_PUBLIC = 4;
 
-    this.id = -1; // internal bandwagon addon id
-    this.feedItemId = -1; // internal bandwagon feeditem id
+    this.storageID = -1;
+    this.collectionsAddonsStorageID = -1;
 
     this.name = "";
     this.type = -1;
@@ -65,12 +65,12 @@ Bandwagon.Model.FeedItem = function()
     this.compatibleOS = {};
     this.installs = {};
 
-    this.author = "";
-    this.category = "";
+    this.authors = {};
+    this.categories = {};
     this.dateAdded = new Date();
     this.comments = [];
 
-    this.read = false; // has the user seen this add-on in the feeds pane
+    this.read = false; // has the user seen this add-on in the collections pane
     this.notified = false; // have we notified the user that we have a new addon
 
     // *** temp comment
@@ -78,13 +78,13 @@ Bandwagon.Model.FeedItem = function()
 
 }
 
-Bandwagon.Model.FeedItem.INSTALL_YES = 1;
-Bandwagon.Model.FeedItem.INSTALL_NO_ADDON_IS_FOR_OLDER_VERSION = 2;
-Bandwagon.Model.FeedItem.INSTALL_NO_UPGRADE_TO_USE_THIS_VERSION = 3;
-Bandwagon.Model.FeedItem.INSTALL_NO_MUST_DOWNLOAD_BETA = 4;
-Bandwagon.Model.FeedItem.INSTALL_NO_NOT_COMPATIBLE_OS = 5;
+Bandwagon.Model.Addon.INSTALL_YES = 1;
+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.FeedItem.prototype.canInstall = function(env)
+Bandwagon.Model.Addon.prototype.canInstall = function(env)
 {
      // check is the extension compatible with this os
 
@@ -92,7 +92,7 @@ Bandwagon.Model.FeedItem.prototype.canInstall = function(env)
     {
         var details =
         {
-            type: Bandwagon.Model.FeedItem.INSTALL_NO_NOT_COMPATIBLE_OS,
+            type: Bandwagon.Model.Addon.INSTALL_NO_NOT_COMPATIBLE_OS,
             requiredVersion: env.os
         };
 
@@ -109,7 +109,7 @@ Bandwagon.Model.FeedItem.prototype.canInstall = function(env)
 
         var details =
         {
-            type: Bandwagon.Model.FeedItem.INSTALL_NO_NOT_COMPATIBLE_OS,
+            type: Bandwagon.Model.Addon.INSTALL_NO_NOT_COMPATIBLE_OS,
             requiredVersion: env.appName
         };
 
@@ -130,7 +130,7 @@ Bandwagon.Model.FeedItem.prototype.canInstall = function(env)
         {
             details =
             {
-                type: Bandwagon.Model.FeedItem.INSTALL_NO_MUST_DOWNLOAD_BETA,
+                type: Bandwagon.Model.Addon.INSTALL_NO_MUST_DOWNLOAD_BETA,
                 requiredVersion: application.minVersion
             };
         }
@@ -138,7 +138,7 @@ Bandwagon.Model.FeedItem.prototype.canInstall = function(env)
         {
             details =
             {
-                type: Bandwagon.Model.FeedItem.INSTALL_NO_UPGRADE_TO_USE_THIS_VERSION,
+                type: Bandwagon.Model.Addon.INSTALL_NO_UPGRADE_TO_USE_THIS_VERSION,
                 requiredVersion: application.minVersion
             };
         }
@@ -152,7 +152,7 @@ Bandwagon.Model.FeedItem.prototype.canInstall = function(env)
 
         var details =
         {
-            type: Bandwagon.Model.FeedItem.INSTALL_NO_ADDON_IS_FOR_OLDER_VERSION,
+            type: Bandwagon.Model.Addon.INSTALL_NO_ADDON_IS_FOR_OLDER_VERSION,
             requiredVersion: application.maxVersion
         };
 
@@ -163,17 +163,17 @@ Bandwagon.Model.FeedItem.prototype.canInstall = function(env)
 
     var details = 
     {
-        type: Bandwagon.Model.FeedItem.INSTALL_YES,
+        type: Bandwagon.Model.Addon.INSTALL_YES,
         requiredVersion: ""
     };
     
     return details;
 }
 
-Bandwagon.Model.FeedItem.prototype.getInstaller = function(os)
+Bandwagon.Model.Addon.prototype.getInstaller = function(os)
 {
     var install;
-    var feedItem = this;
+    var addon = this;
 
     os = os.toUpperCase();
 
@@ -193,19 +193,19 @@ Bandwagon.Model.FeedItem.prototype.getInstaller = function(os)
     {
         URL: install.url,
         Hash: install.hash,
-        IconURL: feedItem.icon,
+        IconURL: addon.icon,
         toString: function () { return this.URL; }
     };
 
     return installer;
 }
 
-Bandwagon.Model.FeedItem.prototype.toString = function()
+Bandwagon.Model.Addon.prototype.toString = function()
 {
     return this.name + " (" + this.guid + ")";
 }
 
-Bandwagon.Model.FeedItem.prototype.equals = function(other)
+Bandwagon.Model.Addon.prototype.equals = function(other)
 {
     if (other == null)
         return false;
@@ -213,7 +213,7 @@ Bandwagon.Model.FeedItem.prototype.equals = function(other)
     return (this.guid == other.guid);
 }
 
-Bandwagon.Model.FeedItem.prototype.unserialize = function(xaddon)
+Bandwagon.Model.Addon.prototype.unserialize = function(xaddon)
 {
     this.name = xaddon.name.text().toString();
     this.type = xaddon.type.attribute("id").toString();
@@ -261,21 +261,28 @@ Bandwagon.Model.FeedItem.prototype.unserialize = function(xaddon)
         this.compatibleApplications[application.name.toUpperCase()] = application;
     }
 
-    /* TODO feed is missing info for the following:
-     * 
-     * - author
-     * - category
-     * - when added
-     * - comments
-     */
-
-    if (xaddon.dateadded && xaddon.dateadded.text().toString() != "")
+    for each (var xauthor in xaddon.authors.author)
     {
-        this.dateAdded = new Date(xaddon.dateadded.text().toString());
+        this.authors[xauthor.text().toString()] = xauthor.text().toString();
     }
-    else if (this.dateAdded == null)
+
+    for each (var xcategory in xaddon.categories.category)
     {
-        this.dateAdded = new Date();
+        this.categories[xcategory.text().toString()] = xcategory.text().toString();
     }
+
+    this.dateAdded = this.Bandwagon.Util.ISO8601toDate(xaddon.meta.added.text().toString());
+
+    this.comments = [];
+
+    var comment0Comment = xaddon.meta.comments.text().toString();
+    var comment0Author = xaddon.meta.addedby.text().toString();
+
+    if (!comment0Author.match(/\w/))
+        comment0Author = "Unknown";
+
+    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
new file mode 100644
index 0000000..a29df57
--- /dev/null
+++ b/bandwagon/content/scripts/model/collection.js
@@ -0,0 +1,211 @@
+/* ***** 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 bandwagon.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): David McNamara
+ *
+ * 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 ***** */
+
+Bandwagon.Model.Collection = function()
+{
+    this.Bandwagon = Bandwagon;
+
+    this.storageID = -1;
+    this.resourceURL = "";
+    this.addonsResourceURL = "";
+
+    this.name = "";
+    this.description = "";
+    this.creator = "";
+    this.listed = false;
+    this.writable = false;
+    this.subscribed = false;
+    this.lastModified = new Date();
+
+    this.password = null;
+    this.dateAdded = new Date();
+    this.dateLastCheck = null;
+    this.updateInterval = this.Bandwagon.DEFAULT_COLLECTION_UPDATE_INTERVAL; // in seconds
+    this.showNotifications = true;
+    this.autoPublish = false;
+    this.active = true;
+    this.addonsPerPage = this.Bandwagon.DEFAULT_ADDONS_PER_PAGE;
+
+    //this.preview = false;
+
+    this.status = this.STATUS_NEW;
+
+    this.addons = {};
+}
+
+Bandwagon.Model.Collection.prototype.STATUS_NEW = 0;
+Bandwagon.Model.Collection.prototype.STATUS_LOADING = 1;
+Bandwagon.Model.Collection.prototype.STATUS_LOADERROR = 2;
+Bandwagon.Model.Collection.prototype.STATUS_LOADED = 3;
+
+Bandwagon.Model.Collection.prototype.getUnreadAddons = function()
+{
+    var unreadAddons = [];
+
+    for (var id in this.addons)
+    {
+        if (!this.addons[id].read)
+        {
+            unreadAddons.push(this.addons[id]);
+        }
+    }
+
+    return unreadAddons;
+}
+
+Bandwagon.Model.Collection.prototype.setAllRead = function()
+{
+    for (var id in this.addons)
+    {
+        this.addons[id].read = true;
+    }
+}
+
+Bandwagon.Model.Collection.prototype.getUnnotifiedAddons = function()
+{
+    var unnotifiedAddons = [];
+
+    for (var id in this.addons)
+    {
+        if (!this.addons[id].notified)
+        {
+            unnotifiedAddons.push(this.addons[id]);
+        }
+    }
+
+    return unnotifiedAddons;
+}
+
+Bandwagon.Model.Collection.prototype.setAllNotified = function()
+{
+    for (var id in this.addons)
+    {
+        this.addons[id].notified = true;
+    }
+}
+
+Bandwagon.Model.Collection.prototype.getSortedAddons = function()
+{
+    var sortedAddons = [];
+
+    for (var id in this.addons)
+    {
+        sortedAddons.push(this.addons[id]);
+    }
+
+    sortedAddons.sort(function(a, b)
+    {
+        // sorting is unread, then dateadded
+
+        if (a.read == false && b.read == true ) return -1;
+        if (a.read == true && b.read == false ) return 1;
+
+        return (a.dateAdded.getTime() < b.dateAdded.getTime()?1:-1);
+    });
+
+    return sortedAddons;
+}
+
+Bandwagon.Model.Collection.prototype.hasAddon = function()
+{
+    for (var id in this.addons)
+    {
+        if (this.addons[id] && this.addons[id].guid)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+Bandwagon.Model.Collection.prototype.getNicknameFromName = function()
+{
+    return this.name.replace(/\W/g, "_");
+}
+
+Bandwagon.Model.Collection.prototype.toString = function()
+{
+    return this.name + " (" + this.resourceURL + ")";
+}
+
+Bandwagon.Model.Collection.prototype.equals = function(other)
+{
+    if (other == null)
+        return false;
+
+    return (this.resourceURL == other.resourceURL);
+}
+
+Bandwagon.Model.Collection.prototype.unserialize = function(xcollection)
+{
+    var xmlns = new Namespace('http://www.w3.org/XML/1998/namespace');
+    var baseURL = xcollection.@xmlns::base.toString();
+
+    //this.resourceURL = baseURL + "/" + xcollection.attribute("href").toString();
+
+    this.name = xcollection.attribute("name").toString();
+    this.description = xcollection.attribute("description").toString();
+    this.creator = xcollection.attribute("creator").toString();
+    this.listed = (xcollection.attribute("listed").toString()=="yes"?true:false);
+    this.writable = (xcollection.attribute("writable").toString()=="yes"?true:false);
+    this.subscribed = (xcollection.attribute("subscribed").toString()=="yes"?true:false);
+    this.lastModified = this.Bandwagon.Util.ISO8601toDate(xcollection.attribute("lastmodified").toString());
+
+    //this.addonsResourceURL = baseURL + "/" + xcollection.addons.attribute("href").toString();
+
+    for each (var xaddon in xcollection.addons.addon)
+    {
+        var addon = new this.Bandwagon.Model.Addon();
+        addon.Bandwagon = this.Bandwagon;
+
+        addon.unserialize(xaddon);
+
+        if (addon.guid && addon.guid != "" && addon.name && addon.name != "")
+        {
+            if (this.addons[addon.guid])
+            {
+                // "merge" with existing item
+                this.addons[addon.guid].unserialize(xaddon);
+            }
+            else
+            {
+                this.addons[addon.guid] = addon;
+            }
+        }
+    }
+}
+
diff --git a/bandwagon/content/scripts/model/feed.js b/bandwagon/content/scripts/model/feed.js
deleted file mode 100644
index 412ee4a..0000000
--- a/bandwagon/content/scripts/model/feed.js
+++ /dev/null
@@ -1,189 +0,0 @@
-/* ***** 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 bandwagon.
- *
- * The Initial Developer of the Original Code is
- * David McNamara.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-Bandwagon.Model.Feed = function()
-{
-    this.Bandwagon = Bandwagon;
-
-    this.id = -1; // internal bandwagon id
-
-    this.url = "";
-    this.name = "";
-    this.description = "";
-    this.password = null;
-    this.dateAdded = new Date();
-    this.dateLastCheck = null;
-    this.updateInterval = this.Bandwagon.DEFAULT_FEED_UPDATE_INTERVAL; // in seconds
-    this.showNotifications = true;
-    this.autoPublish = false;
-    this.active = true;
-    this.feedItemsPerPage = this.Bandwagon.DEFAULT_FEED_ITEMS_PER_PAGE;
-
-    this.preview = false;
-    this.editable = false;
-    this.status = this.STATUS_NEW;
-
-    this.feedItems = {};
-}
-
-Bandwagon.Model.Feed.prototype.STATUS_NEW = 0;
-Bandwagon.Model.Feed.prototype.STATUS_LOADING = 1;
-Bandwagon.Model.Feed.prototype.STATUS_LOADERROR = 2;
-Bandwagon.Model.Feed.prototype.STATUS_LOADED = 3;
-
-Bandwagon.Model.Feed.prototype.getUnreadFeedItems = function()
-{
-    var unreadFeedItems = [];
-
-    for (var id in this.feedItems)
-    {
-        if (!this.feedItems[id].read)
-        {
-            unreadFeedItems.push(this.feedItems[id]);
-        }
-    }
-
-    return unreadFeedItems;
-}
-
-Bandwagon.Model.Feed.prototype.setAllRead = function()
-{
-    for (var id in this.feedItems)
-    {
-        this.feedItems[id].read = true;
-    }
-}
-
-Bandwagon.Model.Feed.prototype.getUnnotifiedFeedItems = function()
-{
-    var unnotifiedFeedItems = [];
-
-    for (var id in this.feedItems)
-    {
-        if (!this.feedItems[id].notified)
-        {
-            unnotifiedFeedItems.push(this.feedItems[id]);
-        }
-    }
-
-    return unnotifiedFeedItems;
-}
-
-Bandwagon.Model.Feed.prototype.setAllNotified = function()
-{
-    for (var id in this.feedItems)
-    {
-        this.feedItems[id].notified = true;
-    }
-}
-
-Bandwagon.Model.Feed.prototype.getSortedFeedItems = function()
-{
-    var sortedFeedItems = [];
-
-    for (var id in this.feedItems)
-    {
-        sortedFeedItems.push(this.feedItems[id]);
-    }
-
-    sortedFeedItems.sort(function(a, b)
-    {
-        // sorting is unread, then dateadded
-
-        if (a.read == false && b.read == true ) return -1;
-        if (a.read == true && b.read == false ) return 1;
-
-        return (a.dateAdded.getTime() < b.dateAdded.getTime()?1:-1);
-    });
-
-    return sortedFeedItems;
-}
-
-Bandwagon.Model.Feed.prototype.hasFeedItem = function()
-{
-    for (var id in this.feedItems)
-    {
-        if (this.feedItems[id] && this.feedItems[id].guid)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-Bandwagon.Model.Feed.prototype.toString = function()
-{
-    return this.name + " (" + this.url + ")";
-}
-
-Bandwagon.Model.Feed.prototype.equals = function(other)
-{
-    if (other == null)
-        return false;
-
-    return (this.url == other.url);
-}
-
-Bandwagon.Model.Feed.prototype.unserialize = function(xaddons)
-{
-    for each (var xaddon in xaddons.addon)
-    {
-        var feedItem = new this.Bandwagon.Model.FeedItem();
-        feedItem.Bandwagon = this.Bandwagon;
-
-        feedItem.unserialize(xaddon);
-
-        if (feedItem.guid && feedItem.guid != "" && feedItem.name && feedItem.name != "")
-        {
-            if (this.feedItems[feedItem.guid])
-            {
-                // "merge" with existing item
-                this.feedItems[feedItem.guid].unserialize(xaddon);
-            }
-            else
-            {
-                this.feedItems[feedItem.guid] = feedItem;
-            }
-        }
-    }
-
-    /* TODO feed is missing info for the following:
-     * 
-     * - site url
-     */
-
-}
diff --git a/bandwagon/content/scripts/model/serviceDocument.js b/bandwagon/content/scripts/model/serviceDocument.js
new file mode 100644
index 0000000..70ae5b3
--- /dev/null
+++ b/bandwagon/content/scripts/model/serviceDocument.js
@@ -0,0 +1,78 @@
+/* ***** 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 bandwagon.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): David McNamara
+ *
+ * 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 ***** */
+
+Bandwagon.Model.ServiceDocument = function()
+{
+    this.Bandwagon = Bandwagon;
+
+    this.emailResourceURL = "";
+    this.collectionListResourceURL = "";
+
+    this.collections = [];
+}
+
+Bandwagon.Model.ServiceDocument.prototype.unserialize = function(xsharing)
+{
+    var xmlns = new Namespace('http://www.w3.org/XML/1998/namespace');
+    var baseURL = xsharing.@xmlns::base.toString();
+
+    // resource urls
+    
+    this.emailResourceURL = baseURL + "/" + xsharing.email.attribute("href").toString();
+    this.collectionListResourceURL = baseURL + "/" + xsharing.collections.attribute("href").toString();
+
+    // collections
+
+    for each (var xcollection in xsharing.collections.collection)
+    {
+        var collection = new this.Bandwagon.Model.Collection();
+        collection.Bandwagon = this.Bandwagon;
+
+        collection.resourceURL = baseURL + "/" + xcollection.attribute("href").toString();
+
+        collection.name = xcollection.attribute("name").toString();
+        collection.description = xcollection.attribute("description").toString();
+        collection.creator = xcollection.attribute("creator").toString();
+        collection.listed = (xcollection.attribute("listed").toString()=="yes"?true:false);
+        collection.writable = (xcollection.attribute("writable").toString()=="yes"?true:false);
+        collection.subscribed = (xcollection.attribute("subscribed").toString()=="yes"?true:false);
+        collection.lastModified = this.Bandwagon.Util.ISO8601toDate(xcollection.attribute("lastmodified").toString());
+
+        collection.addonsResourceURL = baseURL + "/" + xcollection.addons.attribute("href").toString();
+
+        this.collections.push(collection);
+    }
+}
diff --git a/bandwagon/content/scripts/rpc/constants.js b/bandwagon/content/scripts/rpc/constants.js
index 7f6e7da..7ecc85e 100644
--- a/bandwagon/content/scripts/rpc/constants.js
+++ b/bandwagon/content/scripts/rpc/constants.js
@@ -37,11 +37,14 @@
 
 Bandwagon.RPC.Constants = new function()
 {
-    this.BANDWAGON_RPC_BASE_URL = "https://preview.addons.mozilla.org/en-US/";
-    this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_SHARE_TO_EMAIL_ACTION = "firefox/api/recommend_email";
+    this.BANDWAGON_RPC_SERVICE_DOCUMENT = "https://bandwagon.stage.mozilla.com/en-US/firefox/api/1.3/sharing";
 
-    this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_GET_FEED_COMPLETE  = 100;
-    this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_SHARE_TO_EMAIL_COMPLETE = 200;
+    this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_GET_SERVICE_DOCUMENT_COMPLETE  = 100;
+    this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_GET_COLLECTION_COMPLETE  = 200;
+    this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_SHARE_TO_EMAIL_COMPLETE = 300;
+    this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_PUBLISH_COMPLETE  = 400;
+    this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_REMOVE_ADDON_FROM_COLLECTION_COMPLETE  = 500;
+    this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_NEW_COLLECTION_COMPLETE  = 600;
 
     // xhr layer constants
 
@@ -63,7 +66,7 @@ Bandwagon.RPC.Constants = new function()
     this.BANDWAGON_RPC_SERVICE_ERROR_BAD_REQUEST = 1400;           //400 BAD REQUEST = Invalid request URI or header, or unsupported nonstandard parameter.
     this.BANDWAGON_RPC_SERVICE_ERROR_UNAUTHORIZED = 1401;          //401 UNAUTHORIZED = Authorization required.
     this.BANDWAGON_RPC_SERVICE_ERROR_FORBIDDEN = 1403;             //403 FORBIDDEN = Unsupported standard parameter, or authentication or authorization failed.
-    this.BANDWAGON_RPC_SERVICE_ERROR_NOT_FOUND = 1404;             //404 NOT FOUND = Resource (such as a feed or entry) not found.
+    this.BANDWAGON_RPC_SERVICE_ERROR_NOT_FOUND = 1404;             //404 NOT FOUND = Resource (such as a collection or entry) not found.
     this.BANDWAGON_RPC_SERVICE_ERROR_CONFLICT = 1409;              //409 CONFLICT = Specified version number doesn't match resource's latest version number.
     this.BANDWAGON_RPC_SERVICE_ERROR_BAD_CONTEXT = 1422;           //422 BAD CONTENT = The data within this entry's <content> is not valid. For example, this may indicate not "well-formed" XML
     this.BANDWAGON_RPC_SERVICE_ERROR_INTERNAL_SERVER_ERROR = 1500; //500 INTERNAL SERVER ERROR = Internal error. This is the default code that is used for all unrecognized errors.
diff --git a/bandwagon/content/scripts/rpc/net.js b/bandwagon/content/scripts/rpc/net.js
index 82c712e..28c3340 100644
--- a/bandwagon/content/scripts/rpc/net.js
+++ b/bandwagon/content/scripts/rpc/net.js
@@ -117,9 +117,12 @@ Bandwagon.RPC.Net = function(Bandwagon, Components)
             // parse xml here instead, put in response var
             var xmlStr = rpcnetrequest.responseText;
 
-            // workaround for E4X bug/feature
+            // workaround for E4X bugs/features
             xmlStr = xmlStr.replace(/^<\?xml\s+version\s*=\s*(["'])[^\1]+\1[^?]*\?>/, ""); // bug 336551
 
+            //default xml namespace = 'http://addons.mozilla.org/';
+            xmlStr = xmlStr.replace(/xmlns="http:\/\/addons.mozilla.org\/"/, "");
+
             response = new XML(xmlStr);
 
             //rpcnet._logger.debug("Bandwagon.RPC.Net.send.onreadystatechange: ' + rpcnet.id + ': XML representation: '" + response.toXMLString() + "'");
@@ -257,10 +260,16 @@ Bandwagon.RPC.Net.prototype.setMethod = function(method)
     {
         this._method = 'POST';
     }
-    else
+    else if (method == 'DELETE')
+    {
+        this._method = 'DELETE';
+    }
+    else 
     {
         this._method = 'GET';
     }
+
+    this._method = method;
 }
 
 Bandwagon.RPC.Net.prototype.setCredentials = function(username, password)
diff --git a/bandwagon/content/scripts/rpc/service.js b/bandwagon/content/scripts/rpc/service.js
index 3d86270..dbf2eef 100644
--- a/bandwagon/content/scripts/rpc/service.js
+++ b/bandwagon/content/scripts/rpc/service.js
@@ -46,7 +46,8 @@ Bandwagon.RPC.Service = function()
     // private instance variables
     this._observers = new Array();
     this._logger = null;
-    this._serviceRootURL = this.Bandwagon.RPC.Constants.BANDWAGON_RPC_BASE_URL;
+    this._serviceDocument = null;
+    this._serviceRootURL = this.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_DOCUMENT;
 
     this.rpcComplete = function(rpcnet, result, response, type, callback)
     {
@@ -119,6 +120,10 @@ Bandwagon.RPC.Service = function()
             rpcnet.setMethod("POST");
             rpcnet.setPostData(data);
         }
+        else if (method == "DELETE")
+        {
+            rpcnet.setMethod("DELETE");
+        }
         else
         {
             rpcnet.setMethod("GET");
@@ -189,30 +194,59 @@ Bandwagon.RPC.Service.prototype.unregisterObserver = function(observerId)
  * Bandwagon Protocol Methods Below Here
  */
 
-Bandwagon.RPC.Service.prototype.getFeed = function(feed, callback)
+Bandwagon.RPC.Service.prototype.getServiceDocument = function(callback)
+{
+	var service = this;
+
+    this._logger.debug("Bandwagon.RPC.Service.getServiceDocument: getting service document for logged in user");
+
+    var internalCallback = function(event)
+    {
+        if (event.isError())
+        {
+        }
+        else
+        {
+            event.serviceDocument = new Bandwagon.Model.ServiceDocument();
+            event.serviceDocument.unserialize(event.getData());
+        }
+
+        if (callback)
+        {
+            callback(event);
+        }
+    }
+
+    this.rpcSend(service.Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_GET_SERVICE_DOCUMENT_COMPLETE, 
+                 internalCallback, 
+                 service.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_DOCUMENT,
+                 "GET",
+                 null);
+}
+
+Bandwagon.RPC.Service.prototype.getCollection = function(collection, callback)
 {
     var service = this;
 
-    this._logger.debug("Bandwagon.RPC.Service.login: getting updates for feed '" + feed.url +  "' ...");
+    this._logger.debug("Bandwagon.RPC.Service.getCollection: getting updates for collection '" + collection.toString() +  "' ...");
 
-    feed.status = feed.STATUS_LOADING;
+    collection.status = collection.STATUS_LOADING;
 
-    // TODO feed.password handling goes here
     var data = null;
 
     var internalCallback = function(event)
     {
         if (event.isError())
         {
-            feed.status = feed.STATUS_LOADERROR;
+            collection.status = collection.STATUS_LOADERROR;
         }
         else
         {
-            feed.unserialize(event.getData());
-            feed.status = feed.STATUS_LOADED;
+            collection.unserialize(event.getData());
+            collection.status = collection.STATUS_LOADED;
         }
 
-        event.feed = feed;
+        event.collection = collection;
 
         if (callback)
         {
@@ -220,53 +254,143 @@ Bandwagon.RPC.Service.prototype.getFeed = function(feed, callback)
         }
     }
 
-    this.rpcSend(service.Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_GET_FEED_COMPLETE, 
+    this.rpcSend(service.Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_GET_COLLECTION_COMPLETE, 
                  internalCallback, 
-                 feed.url,
+                 collection.resourceURL,
                  "GET",
                  data);
 }
 
-Bandwagon.RPC.Service.prototype.subscribeFeed = function(feed, callback)
+Bandwagon.RPC.Service.prototype.newCollection = function(collection, callback)
+{
+    var service = this;
+
+    this._logger.debug("Bandwagon.RPC.Service.newCollection: creating new collection '" + collection.toString() +  "' ...");
+
+    if (collection.name == "" || service._serviceDocument == null)
+    {
+        if (callback)
+            callback(new this.Bandwagon.RPC.Event());
+
+        return;
+    }
+
+    var data = {
+        name: collection.name,
+        description: collection.description,
+        nickname: collection.getNicknameFromName(),
+        listed: (collection.listed?1:0)
+    };
+
+    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_NEW_COLLECTION_COMPLETE, 
+                 internalCallback, 
+                 service._serviceDocument.collectionListResourceURL,
+                 "POST",
+                 data);
+}
+
+
+/** OBSOLETE
+Bandwagon.RPC.Service.prototype.subscribeCollection = function(collection, callback)
 {
-    Bandwagon.Logger.debug("Bandwagon.RPC.Service.subscribeFeed: TBD");
+    Bandwagon.Logger.debug("Bandwagon.RPC.Service.subscribeCollection: TBD");
 
     // TODO
 
     if (callback)
         callback(new this.Bandwagon.RPC.Event());
 }
+*/
 
-Bandwagon.RPC.Service.prototype.unsubscribeFeed = function(feed, callback)
+/** OBSOLETE
+Bandwagon.RPC.Service.prototype.unsubscribeCollection = function(collection, callback)
 {
-    Bandwagon.Logger.debug("Bandwagon.RPC.Service.unsubscribeFeed: TBD");
+    Bandwagon.Logger.debug("Bandwagon.RPC.Service.unsubscribeCollection: TBD");
 
     // TODO
 
     if (callback)
         callback(new this.Bandwagon.RPC.Event());
 }
+*/
 
-Bandwagon.RPC.Service.prototype.publishToFeed = function(extension, feed, personalNote, callback)
+Bandwagon.RPC.Service.prototype.removeAddonFromCollection = function(guid, collection, callback)
 {
-    Bandwagon.Logger.debug("Bandwagon.RPC.Service.publishToFeed: extension.guid = '" + extension.guid + "', extension.name = '" + extension.name + "', feed = '" + feed.url + "', personalNote = '" + personalNote + "'");
-    Bandwagon.Logger.debug("Bandwagon.RPC.Service.publishToFeed: TBD");
+    var service = this;
 
-    // TODO
+    if (guid.substring(0,1) == "{")
+    {
+        guid = guid.substring(1, guid.length-2);
+    }
 
-    if (callback)
+    Bandwagon.Logger.debug("Bandwagon.RPC.Service.removeAddonFromCollection: extension.guid = '" + guid + "', collection = '" + collection.resourceURL);
+
+    var internalCallback = function(event)
+    {
+        // don't need to do anything here
+        if (callback)
+            callback(event);
+    }
+
+    this.rpcSend(service.Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_REMOVE_ADDON_FROM_COLLECTION_COMPLETE, 
+                 internalCallback, 
+                 collection.addonsResourceURL + guid,
+                 "DELETE",
+                 null);
+}
+
+Bandwagon.RPC.Service.prototype.publishToCollection = function(extension, collection, personalNote, callback)
+{
+    var service = this;
+
+    Bandwagon.Logger.debug("Bandwagon.RPC.Service.publishToCollection: extension.guid = '" + extension.guid + "', extension.name = '" + extension.name + "', collection = '" + collection.resourceURL + "', personalNote = '" + personalNote + "'");
+
+    var data = {
+        "guid": extension.guid,
+        "comments": personalNote
+    };
+
+    var internalCallback = function(event)
     {
-        setTimeout(function() { callback(new this.Bandwagon.RPC.Event()) }, 2000);
+        // don't need to do anything here
+        if (callback)
+            callback(event);
     }
+
+    this.rpcSend(service.Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_PUBLISH_COMPLETE, 
+                 internalCallback, 
+                 collection.addonsResourceURL,
+                 "POST",
+                 data);
 }
 
 Bandwagon.RPC.Service.prototype.shareToEmail = function(extension, emailAddress, personalNote, callback)
 {
     var service = this;
 
-    Bandwagon.Logger.debug("Bandwagon.RPC.Service.publishToFeed: extension.guid = '" + extension.guid + "', extension.name = '" + extension.name + "', emailAddress = '" + emailAddress + "', personalNote = '" + personalNote + "'");
+    Bandwagon.Logger.debug("Bandwagon.RPC.Service.shareToEmail: extension.guid = '" + extension.guid + "', extension.name = '" + extension.name + "', emailAddress = '" + emailAddress + "', personalNote = '" + personalNote + "'");
 
-    if (!extension.guid || extension.guid == "" || !emailAddress || emailAddress == "")
+    if (!extension.guid || extension.guid == "" || !emailAddress || emailAddress == "" || service._serviceDocument == null)
     {
         if (callback)
             callback(new this.Bandwagon.RPC.Event());
@@ -274,48 +398,22 @@ Bandwagon.RPC.Service.prototype.shareToEmail = function(extension, emailAddress,
         return;
     }
 
-    var data = null;
-
     var data = {
         "guid": extension.guid,
-        "emails[0]": emailAddress,
-        "message": personalNote
+        "to": emailAddress,
+        "comments": personalNote
     };
 
     var internalCallback = function(event)
     {
-        if (!event.isError())
-        {
-            // check for service level errors
-
-            var response = event.getData();
-
-            // success has a body of "<success/>"
-            // failure has a body e.g. "<error>Add-on not found!</error>"
-
-            if (response.name() == "success")
-            {
-                // all ok
-            }
-            else if (response.name() == "error")
-            {
-                // "expected" error -- update the event to indicate this error
-                event.setError(new service.Bandwagon.RPC.Error(service.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR, response.text().toString()));
-            }
-            else
-            {
-                // unknown response -- update the event to indicate an error
-                event.setError(new service.Bandwagon.RPC.Error(service.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_UNEXPECTED_XML));
-            }
-        }
-
+        // don't need to do anything here
         if (callback)
             callback(event);
     }
 
     this.rpcSend(service.Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_SHARE_TO_EMAIL_COMPLETE, 
                  internalCallback, 
-                 service.Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_SHARE_TO_EMAIL_ACTION,
+                 service._serviceDocument.emailResourceURL,
                  "POST",
                  data);    
 }
diff --git a/bandwagon/content/scripts/util.js b/bandwagon/content/scripts/util.js
index 9dde8bb..8044f31 100644
--- a/bandwagon/content/scripts/util.js
+++ b/bandwagon/content/scripts/util.js
@@ -249,3 +249,47 @@ Bandwagon.Util.getInstalledExtensions = function()
     return items;
 }
 
+Bandwagon.Util.ISO8601toDate = function(dString)
+{
+    var x = new Date();
+
+    var regexp = /(\d\d\d\d)(-)?(\d\d)(-)?(\d\d)(T)?(\d\d)(:)?(\d\d)(:)?(\d\d)(\.\d+)?(Z|([+-])(\d\d)(:)?(\d\d))/;
+
+    if (dString.toString().match(new RegExp(regexp))) {
+        var d = dString.match(new RegExp(regexp));
+        var offset = 0;
+
+        x.setUTCDate(1);
+        x.setUTCFullYear(parseInt(d[1],10));
+        x.setUTCMonth(parseInt(d[3],10) - 1);
+        x.setUTCDate(parseInt(d[5],10));
+        x.setUTCHours(parseInt(d[7],10));
+        x.setUTCMinutes(parseInt(d[9],10));
+        x.setUTCSeconds(parseInt(d[11],10));
+        if (d[12])
+            x.setUTCMilliseconds(parseFloat(d[12]) * 1000);
+            else
+                x.setUTCMilliseconds(0);
+                if (d[13] != 'Z') {
+                    offset = (d[15] * 60) + parseInt(d[17],10);
+                    offset *= ((d[14] == '-') ? -1 : 1);
+                    x.setTime(x.getTime() - offset * 60 * 1000);
+                }
+    }
+    else
+    {
+        x.setTime(Date.parse(dString));
+    }
+
+    return x;
+};
+
+Bandwagon.Util.getBrowserLocale = function()
+{
+    var prefSvc = Components.classes["@mozilla.org/preferences-service;1"].
+                getService(Components.interfaces.nsIPrefService);
+    
+    return prefSvc.getCharPref("general.useragent.locale");
+};
+
+
diff --git a/bandwagon/content/ui/bindings/bandwagon.css b/bandwagon/content/ui/bindings/bandwagon.css
index 1d012cc..7bb9f18 100644
--- a/bandwagon/content/ui/bindings/bandwagon.css
+++ b/bandwagon/content/ui/bindings/bandwagon.css
@@ -1,13 +1,13 @@
-bandwagonFeedItem {
-      -moz-binding: url("chrome://bandwagon/content/ui/bindings/bandwagon.xml#bandwagon-feeditem");
+bandwagonAddon {
+      -moz-binding: url("chrome://bandwagon/content/ui/bindings/bandwagon.xml#bandwagon-addon");
 }
 
-bandwagonFeedItemExpanded {
-      -moz-binding: url("chrome://bandwagon/content/ui/bindings/bandwagon.xml#bandwagon-feeditem-expanded");
+bandwagonAddonExpanded {
+      -moz-binding: url("chrome://bandwagon/content/ui/bindings/bandwagon.xml#bandwagon-addon-expanded");
 }
 
-bandwagonFeed {
-      -moz-binding: url("chrome://bandwagon/content/ui/bindings/bandwagon.xml#bandwagon-feed");
+bandwagonCollection {
+      -moz-binding: url("chrome://bandwagon/content/ui/bindings/bandwagon.xml#bandwagon-collection");
 }
 
 bandwagonPublishButton {
diff --git a/bandwagon/content/ui/bindings/bandwagon.xml b/bandwagon/content/ui/bindings/bandwagon.xml
index 600d9f3..ac31bcf 100644
--- a/bandwagon/content/ui/bindings/bandwagon.xml
+++ b/bandwagon/content/ui/bindings/bandwagon.xml
@@ -44,7 +44,7 @@
     xmlns:xbl="http://www.mozilla.org/xbl"
     xmlns:html="http://www.w3.org/1999/xhtml">
 
-    <binding id="bandwagon-feed" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
+    <binding id="bandwagon-collection" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
 
         <resources>
             <stylesheet src="chrome://bandwagon/skin/extensionsOverlay.css"/>
@@ -59,13 +59,13 @@
         </content>
 
         <implementation>
-            <field name="feed"/>
+            <field name="collection"/>
             <field name="controller"/>
 
             <constructor>
             <![CDATA[
-               if (this.feed)
-                   this.setFeed(this.feed);
+               if (this.collection)
+                   this.setCollection(this.collection);
 
                 setTimeout(this.controller.bindingsReady, 100);
             ]]>
@@ -86,7 +86,7 @@
                 onset="this.setAttribute('preview', val);"
                 />
 
-            <property name="editable"
+            <property name="writable"
                 onget="return !document.getAnonymousElementByAttribute(this, 'anonid', 'star').collapsed;"
                 onset="document.getAnonymousElementByAttribute(this, 'anonid', 'star').collapsed = !val;"
                 />
@@ -96,16 +96,16 @@
                 onset="document.getAnonymousElementByAttribute(this, 'anonid', 'unread').value = val; document.getAnonymousElementByAttribute(this, 'anonid', 'unread').collapsed = (val == 0);"
                 />
 
-            <method name="setFeed">
-                <parameter name="feed"/>
+            <method name="setCollection">
+                <parameter name="collection"/>
                 <body>
                 <![CDATA[
-                    this.feed = feed;
-                    this.name = (feed.name && feed.name !=""?feed.name:feed.url);
-                    this.url = feed.url;
-                    this.preview = feed.preview;
-                    this.editable = feed.editable;
-                    this.unread = feed.getUnreadFeedItems().length;
+                    this.collection = collection;
+                    this.name = (collection.name && collection.name !=""?collection.name:collection.resourceURL);
+                    this.url = collection.resourceURL;
+                    this.preview = collection.preview;
+                    this.writable = collection.writable;
+                    this.unread = collection.getUnreadAddons().length;
                 ]]>
                 </body>
             </method>
@@ -114,14 +114,14 @@
     </binding>
 
 
-    <binding id="bandwagon-feeditem" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
+    <binding id="bandwagon-addon" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
 
         <resources>
             <stylesheet src="chrome://bandwagon/skin/extensionsOverlay.css"/>
         </resources>
 
         <content>
-            <xul:stringbundle src="chrome://bandwagon/locale/bandwagonFeedItem.properties"
+            <xul:stringbundle src="chrome://bandwagon/locale/bandwagonAddon.properties"
                 anonid="stringbundle"/>
 
             <xul:hbox flex="1">
@@ -144,13 +144,13 @@
         </content>
 
         <implementation>
-            <field name="feedItem"/>
+            <field name="addon"/>
             <field name="_stringBundle">document.getAnonymousElementByAttribute(this, "anonid", "stringbundle");</field>
 
             <constructor>
             <![CDATA[
-                if (this.feedItem)
-                    this.setFeedItem(this.feedItem);
+                if (this.addon)
+                    this.setAddon(this.addon);
             ]]>
             </constructor>
 
@@ -197,15 +197,43 @@
                 </setter>
             </property>
 
-            <property name="author"
-                onget="return (document.getAnonymousElementByAttribute(this, 'anonid', 'author')?document.getAnonymousElementByAttribute(this, 'anonid', 'author').value:'')"
-                onset="if (document.getAnonymousElementByAttribute(this, 'anonid', 'author')) document.getAnonymousElementByAttribute(this, 'anonid', 'author').value = this._stringBundle.getFormattedString('bandwagon.feeditem.author', [val])"
-                />
+            <property name="authors"
+                onget="return (document.getAnonymousElementByAttribute(this, 'anonid', 'author')?document.getAnonymousElementByAttribute(this, 'anonid', 'author').value:'')">
+                <setter>
+                <![CDATA[
+                    if (document.getAnonymousElementByAttribute(this, 'anonid', 'authors'))
+                    {
+                        var authors = "";
+
+                        if (!val || val.length == 0)
+                        {
+                            authors = "?";
+                        }
+                        else
+                        {
+                            for each (var item in val)
+                            {
+                                authors += item + ", ";
+                            }
 
+                            if (authors.substring(authors.length-2) == ", ")
+                            {
+                                authors = authors.substring(0, authors.length-2);
+                            }
+                        }
+
+                        document.getAnonymousElementByAttribute(this, 'anonid', 'authors').value = this._stringBundle.getFormattedString('bandwagon.addon.author', [authors]);
+                    }
+                ]]>
+                </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.feeditem.category', [val])"
+                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')"
@@ -226,36 +254,36 @@
 
                     if (diff < 60)
                     {
-                        sbString = "bandwagon.feeditem.added.justnow";
+                        sbString = "bandwagon.addon.added.justnow";
                     }
                     else if (diff < 60 * 60)
                     {
-                        sbString = "bandwagon.feeditem.added.minute";
+                        sbString = "bandwagon.addon.added.minute";
                         sbVal = Math.ceil(diff/60);
                     }
                     else if (diff < 60 * 60 * 24)
                     {
-                        sbString = "bandwagon.feeditem.added.hour";
+                        sbString = "bandwagon.addon.added.hour";
                         sbVal = Math.floor(diff/60/60);
                     }
                     else if (diff < 60 * 60 * 24 * 7)
                     {
-                        sbString = "bandwagon.feeditem.added.day";
+                        sbString = "bandwagon.addon.added.day";
                         sbVal = Math.floor(diff/60/60/24);
                     }
                     else if (diff < 60 * 60 * 24 * 30)
                     {
-                        sbString = "bandwagon.feeditem.added.week";
+                        sbString = "bandwagon.addon.added.week";
                         sbVal = Math.floor(diff/60/60/24/7);
                     }
                     else if (diff < 60 * 60 * 24 * 356)
                     {
-                        sbString = "bandwagon.feeditem.added.month";
+                        sbString = "bandwagon.addon.added.month";
                         sbVal = Math.floor(diff/60/60/24/30);
                     }
                     else
                     {
-                        sbString = "bandwagon.feeditem.added.year";
+                        sbString = "bandwagon.addon.added.year";
                         sbVal = Math.floor(diff/60/60/24/356);
                     }
 
@@ -284,31 +312,31 @@
                 >
                 <setter>
                 <![CDATA[
-                    if (document.getAnonymousElementByAttribute(this, 'anonid', 'commentdesc')) document.getAnonymousElementByAttribute(this, 'anonid', 'commentdesc').firstChild.nodeValue = this._stringBundle.getFormattedString('bandwagon.feeditem.comment.description', [val.comment]);
-                    if (document.getAnonymousElementByAttribute(this, 'anonid', 'commentauthor')) document.getAnonymousElementByAttribute(this, 'anonid', 'commentauthor').value = this._stringBundle.getFormattedString('bandwagon.feeditem.comment.author', [val.author]);
+                    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>
 
-            <method name="setFeedItem">
-                <parameter name="feedItem"/>
+            <method name="setAddon">
+                <parameter name="addon"/>
                 <body>
                 <![CDATA[
-                    this.feedItem = feedItem;
-                    this.name = feedItem.name;
-                    this.guid = feedItem.guid;
-                    this.summary = feedItem.summary;
-                    this.description = feedItem.summary; // Use summary and not description
-                    this.iconURL = feedItem.icon;
-                    this.thumbnailURL = feedItem.thumbnail;
-                    this.author = (feedItem.author?feedItem.author:"Unknown");
-                    this.category = (feedItem.category?feedItem.category:"Unknown");
-                    this.dateAdded = feedItem.dateAdded;
-                    this.read = feedItem.read;
-
-                    if (feedItem.comments.length > 0)
+                    this.addon = addon;
+                    this.name = addon.name;
+                    this.guid = addon.guid;
+                    this.summary = addon.summary;
+                    this.description = addon.summary; // Use summary and not description
+                    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)
                     {
-                        this.comment = feedItem.comments[0];
+                        this.comment = addon.comments[0];
                     }
                     else
                     {
@@ -319,7 +347,7 @@
                         }
                     }
 
-                    var canInstall = feedItem.canInstall(Bandwagon.Util.getHostEnvironmentInfo());
+                    var canInstall = addon.canInstall(Bandwagon.Util.getHostEnvironmentInfo());
                     this.showVersionHelper(canInstall.type, canInstall.requiredVersion);
 
                     if (document.getAnonymousElementByAttribute(this, 'anonid', 'publish'))
@@ -339,7 +367,7 @@
                     if (publishButton)
                     {
                         publishButton.emailAddresses = Bandwagon.Controller.ExtensionsOverlay._getEmailAddresses();
-                        publishButton.writableFeeds = Bandwagon.Controller.ExtensionsOverlay._getWritableFeeds();
+                        publishButton.writableCollections = Bandwagon.Controller.ExtensionsOverlay._getWritableCollections();
                         publishButton.invalidate();
                     }
                 ]]>
@@ -354,44 +382,44 @@
                     if (document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefox')
                         && document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning'))
                     {
-                        if (type == Bandwagon.Model.FeedItem.INSTALL_YES)
+                        if (type == Bandwagon.Model.Addon.INSTALL_YES)
                         {
                             document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefox').disabled = false;
                             document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning').collapsed = true;
                         }
                         else
                         {
-                            if (type == Bandwagon.Model.FeedItem.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.feeditem.olderversionsoffirefox")));
+                                    document.createTextNode(this._stringBundle.getString("bandwagon.addon.olderversionsoffirefox")));
                             }
-                            else if (type == Bandwagon.Model.FeedItem.INSTALL_NO_UPGRADE_TO_USE_THIS_VERSION)
+                            else if (type == Bandwagon.Model.Addon.INSTALL_NO_UPGRADE_TO_USE_THIS_VERSION)
                             {
                                 var atffwl = document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarninglink');
-                                atffwl.value = this._stringBundle.getFormattedString("bandwagon.feeditem.upgradetofirefoxn1", [version]);
+                                atffwl.value = this._stringBundle.getFormattedString("bandwagon.addon.upgradetofirefoxn1", [version]);
                                 atffwl.collapsed = false;
-                                atffwl.addEventListener("click", function() { Bandwagon.Controller.FeedsPane.doUpgradeToFirefoxN(version); }, true);
+                                atffwl.addEventListener("click", function() { Bandwagon.Controller.CollectionsPane.doUpgradeToFirefoxN(version); }, true);
 
                                 document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning').appendChild(
-                                    document.createTextNode(this._stringBundle.getString("bandwagon.feeditem.upgradetofirefoxn2")));
+                                    document.createTextNode(this._stringBundle.getString("bandwagon.addon.upgradetofirefoxn2")));
                             }
-                            else if (type == Bandwagon.Model.FeedItem.INSTALL_NO_MUST_DOWNLOAD_BETA)
+                            else if (type == Bandwagon.Model.Addon.INSTALL_NO_MUST_DOWNLOAD_BETA)
                             {
                                 document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning').appendChild(
-                                    document.createTextNode(this._stringBundle.getFormattedString("bandwagon.feeditem.requiresfirefoxbeta1", [version])));
+                                    document.createTextNode(this._stringBundle.getFormattedString("bandwagon.addon.requiresfirefoxbeta1", [version])));
 
                                 var atffwl = document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarninglink');
-                                atffwl.value = this._stringBundle.getFormattedString("bandwagon.feeditem.requiresfirefoxbeta2", [version]);
+                                atffwl.value = this._stringBundle.getFormattedString("bandwagon.addon.requiresfirefoxbeta2", [version]);
                                 atffwl.collapsed = false;
-                                atffwl.addEventListener("click", function() { Bandwagon.Controller.FeedsPane.doDownloadFirefoxNBeta(version); }, true);
+                                atffwl.addEventListener("click", function() { Bandwagon.Controller.CollectionsPane.doDownloadFirefoxNBeta(version); }, true);
 
                                 document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning').appendChild(atffwl);
                             }
-                            else if (type == Bandwagon.Model.FeedItem.INSTALL_NO_NOT_COMPATIBLE_OS)
+                            else if (type == Bandwagon.Model.Addon.INSTALL_NO_NOT_COMPATIBLE_OS)
                             {
                                 document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning').appendChild(
-                                    document.createTextNode(this._stringBundle.getFormattedString("bandwagon.feeditem.notcompatible", [version])));
+                                    document.createTextNode(this._stringBundle.getFormattedString("bandwagon.addon.notcompatible", [version])));
                             }
 
                             document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefox').disabled = true;
@@ -447,10 +475,10 @@
         </implementation>
     </binding>
 
-    <binding id="bandwagon-feeditem-expanded" extends="chrome://bandwagon/content/ui/bindings/bandwagon.xml#bandwagon-feeditem">
+    <binding id="bandwagon-addon-expanded" extends="chrome://bandwagon/content/ui/bindings/bandwagon.xml#bandwagon-addon">
 
         <content>
-            <xul:stringbundle src="chrome://bandwagon/locale/bandwagonFeedItem.properties"
+            <xul:stringbundle src="chrome://bandwagon/locale/bandwagonAddon.properties"
                 anonid="stringbundle"/>
 
             <xul:hbox flex="1">
@@ -466,15 +494,17 @@
                                 <xul:label anonid="dateadded"/>
                             </xul:hbox>
                             <xul:hbox anonid="byline" flex="1">
-                                <xul:label anonid="author"/>
+                                <xul:label anonid="authors"/>
                                 <xul:spacer flex="1"/>
-                                <xul:label anonid="category"/>
+                                <!--<xul:label anonid="category"/>-->
                             </xul:hbox>
+                            <xul:label anonid="commentauthor" flex="1"/>
+                            <xul:description anonid="commentdesc"> </xul:description>
                         </xul:vbox>
                     </xul:hbox>
                     <xul:hbox align="stretch"
                               anonid="fulldesc"
-                              class="feed-item-details"
+                              class="collection-item-details"
                               flex="1">
                         <xul:vbox pack="start">
                             <xul:hbox anonid="bandwagonThumbnailContainer"
@@ -485,15 +515,13 @@
                             </xul:hbox>
                         </xul:vbox>
                         <xul:vbox flex="1">
-                            <xul:description anonid="commentdesc"> </xul:description>
-                            <xul:label anonid="commentauthor" flex="1" class="right"/>
                             <xul:description anonid="description">
-                                <xul:label anonid="learnmore" class="text-link" value="&feeditem.moreinfo;" onclick="Bandwagon.Controller.FeedsPane.doMoreInfo()"/>
+                                <xul:label anonid="learnmore" class="text-link" value="&addon.moreinfo;" onclick="Bandwagon.Controller.CollectionsPane.doMoreInfo()"/>
                             </xul:description>
                             <xul:spacer flex="1"/>
                             <xul:hbox pack="end" class="publishButton">
                                 <xul:bandwagonPublishButton anonid="publish" label="&publishto.label;"/>
-                                <xul:button anonid="addtofirefox" label="&feeditem.addtofirefox;" oncommand="Bandwagon.Controller.FeedsPane.doAddToFirefox()"/>
+                                <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"/>
@@ -530,43 +558,32 @@
         <content>
             <xul:button label="&publishto.label;"
                         type="menu"
-                        anonid="publishButton1"
+                        anonid="publishButton"
                         class="publishButton"
                         collapsed="true">
-                <xul:menupopup anonid="writableFeeds">
-                    <!-- writable feeds go here -->
-                    <xul:menuseparator anonid="writableFeedSeparator"/>
-                    <xul:menu label="&email.address.label;" anonid="emailAddressMenu1">
-                        <xul:menupopup anonid="emailAddresses1">
+                <xul:menupopup anonid="writableCollections">
+                    <!-- writable collections go here -->
+                    <xul:menuitem label="&new.collection.label;" oncommand="Bandwagon.Controller.ExtensionsOverlay.doNewCollection();" anonid="newCollection"/>
+                    <xul:menuseparator anonid="writableCollectionSeparator"/>
+                    <xul:menu label="&email.address.label;" anonid="emailAddressMenu">
+                        <xul:menupopup anonid="emailAddresses">
                             <!-- email addresses go here -->
-                            <xul:menuseparator anonid="emailAddressSeparator1"/>
+                            <xul:menuseparator anonid="emailAddressSeparator"/>
                             <xul:menuitem label="&new.email.address.label;" oncommand="Bandwagon.Controller.ExtensionsOverlay.doAddNewShareEmail();"/>
                         </xul:menupopup>
                     </xul:menu>
                  </xul:menupopup>
             </xul:button>
 
-            <xul:button label="&publishto.label;"
-                        type="menu"
-                        anonid="publishButton2"
-                        class="publishButton"
-                        collapsed="true">
-                <xul:menupopup anonid="emailAddresses2">
-                    <!-- email addresses go here -->
-                    <xul:menuseparator anonid="emailAddressSeparator2"/>
-                    <xul:menuitem label="&new.email.address.label;"/>
-                </xul:menupopup>
-            </xul:button>
-
         </content>
 
         <implementation>
             <field name="emailAddresses"/>
-            <field name="writableFeeds"/>
+            <field name="writableCollections"/>
 
             <constructor>
             <![CDATA[
-                if (this.emailAddresses && this.writableFeeds)
+                if (this.emailAddresses && this.writableCollections)
                 {
                     this.invalidate();
                 }
@@ -578,21 +595,18 @@
                 <![CDATA[
                     const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-                    var elemWritableFeedsPopup = document.getAnonymousElementByAttribute(this, "anonid", "writableFeeds");
-                    var elemWritableFeedSeparator = document.getAnonymousElementByAttribute(this, "anonid", "writableFeedSeparator");
-                    var elemEmailAddressesPopup1 = document.getAnonymousElementByAttribute(this, "anonid", "emailAddresses1");
-                    var elemEmailAddressesPopup2 = document.getAnonymousElementByAttribute(this, "anonid", "emailAddresses2");
-                    var elemEmailAddressSeparator1 = document.getAnonymousElementByAttribute(this, "anonid", "emailAddressSeparator1");
-                    var elemEmailAddressSeparator2 = document.getAnonymousElementByAttribute(this, "anonid", "emailAddressSeparator2");
-                    var elemEmailAddressMenu1 = document.getAnonymousElementByAttribute(this, "anonid", "emailAddressMenu1");
-                    var elemEmailAddressMenu2 = document.getAnonymousElementByAttribute(this, "anonid", "emailAddressMenu2");
-                    var elemPublishButton1 = document.getAnonymousElementByAttribute(this, "anonid", "publishButton1");
-                    var elemPublishButton2 = document.getAnonymousElementByAttribute(this, "anonid", "publishButton2");
+                    var elemWritableCollectionsPopup = document.getAnonymousElementByAttribute(this, "anonid", "writableCollections");
+                    var elemWritableCollectionSeparator = document.getAnonymousElementByAttribute(this, "anonid", "writableCollectionSeparator");
+                    var elemEmailAddressesPopup = document.getAnonymousElementByAttribute(this, "anonid", "emailAddresses");
+                    var elemEmailAddressSeparator = document.getAnonymousElementByAttribute(this, "anonid", "emailAddressSeparator");
+                    var elemEmailAddressMenu = document.getAnonymousElementByAttribute(this, "anonid", "emailAddressMenu");
+                    var elemPublishButton = document.getAnonymousElementByAttribute(this, "anonid", "publishButton");
+                    var elemNewCollection = document.getAnonymousElementByAttribute(this, "anonid", "newCollection");
 
                     // populate the email address menu
 
-                    var activeEmailMenu = (this.writableFeeds.length==0?elemEmailAddressesPopup2:elemEmailAddressesPopup1);
-                    var activeEmailAddressSeparator = (this.writableFeeds.length==0?elemEmailAddressSeparator2:elemEmailAddressSeparator1);
+                    var activeEmailMenu = elemEmailAddressesPopup;
+                    var activeEmailAddressSeparator = elemEmailAddressSeparator;
 
                     if (this.emailAddresses.length)
                     {
@@ -621,40 +635,47 @@
                         activeEmailAddressSeparator.collapsed = true;
                     }
 
-                    if (this.writableFeeds.length)
+                    // populate the collections menu
+
+                    function createAddToCollectionCallbackFunction(collection)
                     {
-                        // populate the feeds menu
+                        return function() { Bandwagon.Controller.ExtensionsOverlay.doPublishToCollection(collection); }
+                    }
 
-                        function createFeedCallbackFunction(feed)
-                        {
-                            return function() { Bandwagon.Controller.ExtensionsOverlay.doPublishToFeed(feed); }
-                        }
+                    function createRemoveFromCollectionCallbackFunction(collection)
+                    {
+                        return function() { Bandwagon.Controller.ExtensionsOverlay.doRemoveFromCollection(collection); }
+                    }
 
-                        for (var i=0; i<this.writableFeeds.length; i++)
-                        {
-                            var feed = this.writableFeeds[i];
+                    for (var i=0; i<this.writableCollections.length; i++)
+                    {
+                        var collection = this.writableCollections[i];
 
-                            if (document.getAnonymousElementByAttribute(this, "anonid", "bandwagon-feed-" + feed.url))
-                                continue;
+                        if (document.getAnonymousElementByAttribute(this, "anonid", "bandwagon-collection-" + collection.resourceURL))
+                            continue;
 
-                            var callback = createFeedCallbackFunction(feed);
+                        var callbackAdd = createAddToCollectionCallbackFunction(collection);
+                        var callbackRemove = createRemoveFromCollectionCallbackFunction(collection);
 
-                            var elemWritableFeed = document.createElementNS(XULNS, "menuitem");
-                            elemWritableFeed.setAttribute("label", (feed.name?feed.name:feed.url));
-                            elemWritableFeed.setAttribute("anonid", "bandwagon-feed-" + feed.url);
-                            elemWritableFeed.addEventListener("command", callback, true);
+                        var elemWritableCollection = document.createElementNS(XULNS, "menuitem");
+                        elemWritableCollection.setAttribute("label", (collection.name?collection.name:collection.resourceURL));
+                        elemWritableCollection.setAttribute("anonid", "bandwagon-collection-" + collection.resourceURL);
 
-                            elemWritableFeedsPopup.insertBefore(elemWritableFeed, elemWritableFeedSeparator);
+                        if (collection.__containsCurrentlySelectedExtension)
+                        {
+                            elemWritableCollection.setAttribute("checked", "true");
+                            elemWritableCollection.setAttribute("autocheck", "false");
+                            elemWritableCollection.addEventListener("command", callbackRemove, true);
+                        }
+                        else 
+                        {
+                            elemWritableCollection.addEventListener("command", callbackAdd, true);
                         }
 
-                        elemPublishButton1.collapsed = false;
-                        elemPublishButton2.collapsed = true;
-                    }
-                    else
-                    {
-                        elemPublishButton1.collapsed = true;
-                        elemPublishButton2.collapsed = false;
+                        elemWritableCollectionsPopup.insertBefore(elemWritableCollection, elemNewCollection);
                     }
+
+                    elemPublishButton.collapsed = false;
                 ]]>
                 </body>
             </method>
diff --git a/bandwagon/content/ui/collectionsPaneController.js b/bandwagon/content/ui/collectionsPaneController.js
new file mode 100644
index 0000000..017e4fe
--- /dev/null
+++ b/bandwagon/content/ui/collectionsPaneController.js
@@ -0,0 +1,838 @@
+/* ***** 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 bandwagon.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): David McNamara
+ *
+ * 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 ***** */
+
+Bandwagon.Controller.CollectionsPane = new function()
+{
+    this.initialized = false;
+    this.initializedBindings = false;
+
+    this.preferredCollection = null;
+
+    this.elemBandwagonCollections = null;
+    this.elemBandwagonAddons = null;
+    this.elemBandwagonButtonViewSite = null;
+    //this.elemBandwagonButtonUpdate = null;
+    this.elemBandwagonButtonRemove = null;
+    this.elemBandwagonCollectionTitle = null;
+    this.elemBandwagonCollectionDescription = null;
+    this.elemBandwagonCollectionsNotification = null;
+    this.elemBandwagonCollectionDeck = null;
+    this.elemBandwagonCollectionHeader = null;
+    this.stringBundle = null;
+
+    //this.previewNotificationVal = "bandwagon-collection-preview";
+}
+
+Bandwagon.Controller.CollectionsPane.init = function()
+{
+    if (Bandwagon.Controller.CollectionsPane.initialized == true) return;
+
+    Bandwagon.Logger.debug("Initializing Bandwagon.Controller.CollectionsPane");
+
+    this.elemBandwagonCollections = document.getElementById("bandwagon-collections-list");
+    this.elemBandwagonAddons = document.getElementById("bandwagon-addons-list");
+    this.elemBandwagonButtonViewSite = document.getElementById("bandwagon-button-viewsite");
+    //this.elemBandwagonButtonUpdate = document.getElementById("bandwagon-button-update");
+    this.elemBandwagonButtonRemove = document.getElementById("bandwagon-button-remove");
+    this.elemBandwagonExtensionsDeck = document.getElementById("bandwagon-extensions-deck");
+    this.elemBandwagonCollectionTitle = document.getElementById("bandwagon-collection-title");
+    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();
+
+    this.elemBandwagonCollections.addEventListener("select", Bandwagon.Controller.CollectionsPane.doShowCollection, true);
+    this.elemBandwagonAddons.addEventListener("select", Bandwagon.Controller.CollectionsPane.doExpandAddon, true);
+
+    bandwagonService.registerCollectionUpdateObserver(Bandwagon.Controller.CollectionsPane.collectionUpdateObserver);
+    bandwagonService.registerCollectionListChangeObserver(Bandwagon.Controller.CollectionsPane.collectionListChangeObserver);
+
+    Bandwagon.Preferences.addObserver(Bandwagon.Controller.CollectionsPane.prefObserver);
+    Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService).addObserver(Bandwagon.Controller.CollectionsPane.prefObserver, "nsPref:changed", false);
+}
+
+/**
+ * Triggered when the user navigates to the collections pane from a different view in the extensions manager
+ */
+Bandwagon.Controller.CollectionsPane.onViewSelect = function()
+{
+    Bandwagon.Logger.debug("in Bandwagon.Controller.CollectionsPane.onViewSelect()");
+
+    if (Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem != null)
+    {
+        // make sure the expanded collection item is scrolled into view
+        var elemsAddonExpanded = Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.getElementsByTagName("bandwagonAddonExpanded");
+
+        if (elemsAddonExpanded && elemsAddonExpanded[0])
+        {
+            Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.ensureElementIsVisible(elemsAddonExpanded[0]);
+        }
+    }
+}
+
+Bandwagon.Controller.CollectionsPane.bindingsReady = function()
+{
+    // the bindings are ready, do any final initialization
+
+    if (Bandwagon.Controller.CollectionsPane.initializedBindings == false)
+    {
+        Bandwagon.Controller.CollectionsPane._selectPreferredCollection();
+        Bandwagon.Controller.CollectionsPane.initializedBindings = true;
+    }
+
+    Bandwagon.Controller.CollectionsPane.initialized = true;
+}
+
+Bandwagon.Controller.CollectionsPane.uninit = function()
+{
+    if (Bandwagon.Controller.CollectionsPane.initialized != true) return;
+
+    Bandwagon.Logger.debug("Uninitializing Bandwagon.Controller.CollectionsPane");
+
+    Bandwagon.Controller.CollectionsPane.initialized = false;
+
+    bandwagonService.unregisterCollectionUpdateObserver(Bandwagon.Controller.CollectionsPane.collectionUpdateObserver);
+    bandwagonService.unregisterCollectionListChangeObserver(Bandwagon.Controller.CollectionsPane.collectionListChangeObserver);
+
+    Bandwagon.Preferences.removeObserver(Bandwagon.Controller.CollectionsPane.prefObserver);
+
+    // now is a good time to save collections to storage
+    if (Bandwagon.COMMIT_NOW)
+        bandwagonService.commitAll();
+}
+
+/**
+ * Updates the interface disabled-ness based on the state of the selected collection, etc.
+ */
+Bandwagon.Controller.CollectionsPane.invalidate = function()
+{
+    if (Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem == null)
+    {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonButtonViewSite.disabled = true;
+        //Bandwagon.Controller.CollectionsPane.elemBandwagonButtonUpdate.disabled = true;
+        Bandwagon.Controller.CollectionsPane.elemBandwagonButtonRemove.disabled = true;
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionHeader.collapsed = true;
+
+        Bandwagon.Controller.CollectionsPane._repopulateAddonsList(null);
+
+        Bandwagon.Controller.CollectionsPane._invalidateExtensionsDeck();
+    }
+    else
+    {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonButtonViewSite.disabled = false;
+        //Bandwagon.Controller.CollectionsPane.elemBandwagonButtonUpdate.disabled = false;
+        Bandwagon.Controller.CollectionsPane.elemBandwagonButtonRemove.disabled = false;
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionHeader.collapsed = false;
+
+        var collection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem.collection;
+
+        if (collection.status == collection.STATUS_LOADING)
+        {
+            Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDeck.selectedIndex = 1;
+        }
+        else if (collection.status == collection.STATUS_LOADERROR)
+        {
+            Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDeck.selectedIndex = 3;
+        }
+        else if (collection.hasAddon() == 0)
+        {
+            Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDeck.selectedIndex = 2;
+        }
+        else
+        {
+            Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDeck.selectedIndex = 0;
+        }
+    }
+}
+
+Bandwagon.Controller.CollectionsPane._invalidateExtensionsDeck = function()
+{
+    var elemsBandwagonCollection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.getElementsByTagName("bandwagonCollection");
+
+    if (elemsBandwagonCollection.length == 0)
+    {
+        if (!bandwagonService.isAMOAuthenticated())
+        {
+            Bandwagon.Controller.CollectionsPane.elemBandwagonExtensionsDeck.selectedIndex = 2;
+        }
+        else
+        {
+            Bandwagon.Controller.CollectionsPane.elemBandwagonExtensionsDeck.selectedIndex = 1;
+        }
+    }
+    else
+    {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonExtensionsDeck.selectedIndex = 0;
+    }
+}
+
+Bandwagon.Controller.CollectionsPane.collectionListChangeObserver = function()
+{
+    Bandwagon.Logger.debug("In Bandwagon.Controller.CollectionsPane.collectionListChangeObserver()");
+
+    var prevCollection = null;
+
+    if (Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem)
+    {
+        prevCollection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem.collection;
+    }
+
+    Bandwagon.Controller.CollectionsPane._repopulateCollectionsList();
+    Bandwagon.Controller.CollectionsPane._invalidateExtensionsDeck();
+
+    if (prevCollection != null)
+    {
+        Bandwagon.Controller.CollectionsPane._selectCollection(prevCollection);
+    }
+}
+
+Bandwagon.Controller.CollectionsPane.collectionUpdateObserver = function(collection)
+{
+    if (collection == null)
+    {
+        Bandwagon.Logger.debug("In Bandwagon.Controller.CollectionsPane.collectionUpdateObserver() with collection <null>");
+    }
+    else
+    {
+        Bandwagon.Logger.debug("In Bandwagon.Controller.CollectionsPane.collectionUpdateObserver() with collection '" + collection.toString() + "'");
+
+        // update the unread count for this collection
+
+        const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+        var elemsBandwagonCollection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.getElementsByTagNameNS(XULNS, "bandwagonCollection");
+
+        for (var i=0; i<elemsBandwagonCollection.length; i++)
+        {
+            if (elemsBandwagonCollection[i].collection.equals(collection))
+            {
+                elemsBandwagonCollection[i].unread = collection.getUnreadAddons().length;
+                break;
+            }
+        }
+
+        // if this collection is currently selected, update the view
+
+        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.doUpdateAll = function(event)
+{
+    Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDeck.selectedIndex = 1;
+
+    bandwagonService.forceCheckAllForUpdatesAndUpdateCollectionsList();
+}
+
+Bandwagon.Controller.CollectionsPane.doSubscribe = function(event)
+{
+    Bandwagon.Controller.CollectionsPane._openLocalizedURL(Bandwagon.COLLECTIONSPANE_DO_SUBSCRIBE_URL);
+}
+
+Bandwagon.Controller.CollectionsPane.doLogin = function(event)
+{
+    Bandwagon.Controller.CollectionsPane._openLocalizedURL(Bandwagon.COLLECTIONSPANE_DO_LOGIN_URL);
+}
+
+
+Bandwagon.Controller.CollectionsPane.doSettings = function(event)
+{
+    var prefSvc = Components.classes["@mozilla.org/preferences-service;1"].
+        getService(Components.interfaces.nsIPrefService);
+    var prefServiceCache = prefSvc.getBranch(null);
+    var instantApply = prefServiceCache.getBoolPref("browser.preferences.instantApply");
+    var flags = "chrome,titlebar,toolbar,centerscreen" + (instantApply ? ",dialog=no" : ",modal");
+
+    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+        .getService(Components.interfaces.nsIWindowMediator);
+    var win = wm.getMostRecentWindow("Bandwagon:Settings");
+
+    if (win)
+    {
+        win.focus();
+    }
+    else
+    {
+        window.openDialog("chrome://bandwagon/content/ui/settings.xul", 
+                "bandwagonsettings",
+                flags);
+    }
+}
+
+Bandwagon.Controller.CollectionsPane.doViewSite = function(event)
+{
+    // TODO use url from collection
+    Bandwagon.Controller.CollectionsPane._openURL("http://www.google.com/search?hl=en&q=bandwagon+view+site&btnG=Search");
+}
+
+Bandwagon.Controller.CollectionsPane.doUpdate = function(event)
+{
+    if (Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem == null)
+        return;
+
+    Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDeck.selectedIndex = 1;
+
+    var collection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem.collection;
+
+    if (collection == null)
+        return;
+
+    bandwagonService.forceCheckForUpdates(collection);
+}
+
+Bandwagon.Controller.CollectionsPane.doRemove = function(event)
+{
+    // TODO
+    alert('TBD');
+}
+
+/** 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;
+
+    bandwagonService.deleteCollection(collection);
+
+    if (!collection.preview)
+        bandwagonService.unsubscribe(collection);
+}
+*/
+
+Bandwagon.Controller.CollectionsPane.doShowCollection = function()
+{
+    var collection = null;
+
+    var selectedElemBandwagonCollection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem;
+
+    if (selectedElemBandwagonCollection != null)
+    {
+        collection = selectedElemBandwagonCollection.collection;
+    }
+
+    // if collection == null, then display will be cleared
+
+    // misc. ui 
+
+    Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionTitle.setAttribute("value", (collection?(collection.name?collection.name:collection.resourceURL):""));
+
+    if (collection && collection.description != "")
+    {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDescription.setAttribute("value", collection.description);
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDescription.removeAttribute("collsaped");
+    }
+    else
+    {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDescription.setAttribute("collapsed", 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
+
+    Bandwagon.Controller.CollectionsPane._repopulateAddonsList(collection);
+
+    // invalidate
+
+    Bandwagon.Controller.CollectionsPane.invalidate();
+
+    // show the loading dialog if needed
+
+    if (collection && collection.status == collection.STATUS_LOADING)
+    {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDeck.selectedIndex = 1;
+    }
+
+    // set all items in this collection to be "read"
+    // if we've just opened this dialog, don't update the read count
+
+    if (collection)
+    {
+        collection.setAllRead();
+
+        if (Bandwagon.Controller.CollectionsPane.initialized)
+        {
+            Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem.unread = 0;
+        }
+    }
+}
+
+Bandwagon.Controller.CollectionsPane.doExpandAddon = function(event)
+{
+    if (event)
+        event.preventDefault();
+
+    if (Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.selectedItem && Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.selectedItem.nodeName == "bandwagonAddonExpanded")
+    {
+        return;
+    }
+
+    var elemsAddonExpanded = Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.getElementsByTagName("bandwagonAddonExpanded");
+
+    for (var i=0; i<elemsAddonExpanded.length; i++)
+    {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.removeChild(elemsAddonExpanded[i]);
+    }
+
+    var elemsAddon = Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.childNodes;
+
+    for (var i=0; i<elemsAddon.length; i++)
+    {
+        elemsAddon[i].collapsed = false;
+    }
+
+    var selectedElemBandwagonAddon = Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.selectedItem;
+
+    if (selectedElemBandwagonAddon != null && selectedElemBandwagonAddon.addon != null)
+    {
+        selectedElemBandwagonAddon.read = true;
+
+        var addon = selectedElemBandwagonAddon.addon;
+        addon.read = true;
+
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem.unread = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem.collection.getUnreadAddons().length;
+
+        // collapse this, show the expanded binding
+
+        const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+        var elemBandwagonAddonExpanded = document.createElementNS(XULNS, "bandwagonAddonExpanded");
+
+        elemBandwagonAddonExpanded.addon = addon;
+
+        try
+        {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonAddonExpanded.setAddon(addon);
+        } catch (e) {}
+
+        Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.insertBefore(elemBandwagonAddonExpanded, selectedElemBandwagonAddon);
+
+        selectedElemBandwagonAddon.collapsed = true;
+    }
+}
+
+Bandwagon.Controller.CollectionsPane.doMoreInfo = function(event)
+{
+    if (event)
+        event.preventDefault();
+
+    if (Bandwagon.Controller.CollectionsPane.elemBandwagonAddons == null)
+        return;
+
+    Bandwagon.Controller.CollectionsPane._openURL(Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.selectedItem.addon.learnmore);
+}
+
+Bandwagon.Controller.CollectionsPane.doAddToFirefox = function()
+{
+    if (Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.selectedItem == null)
+        return;
+
+    var addon = Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.selectedItem.addon;
+
+    if (!isXPInstallEnabled())
+        return;
+
+    if (addon.eula && addon.eula != "")
+    {
+        var eula = {
+          name: addon.name,
+          text: addon.eula,
+          accepted: false
+        };
+
+        window.openDialog("chrome://mozapps/content/extensions/eula.xul", "_blank",
+                          "chrome,dialog,modal,centerscreen,resizable=no", eula);
+
+        if (!eula.accepted)
+            return;
+    }
+
+    var installer = addon.getInstaller(Bandwagon.Util.getHostEnvironmentInfo().os);
+
+    if (!installer)
+    {
+        Bandwagon.Logger.warn("No compatible os targets found.");
+        return;
+    }
+
+    var params = [];
+    params[addon.name] = installer;
+
+    // TODO do some user collectionback here?
+
+    var callback = function(url, status)
+    {
+        Bandwagon.Logger.info("Finished installing '" + url + "'; status = " + status);
+
+        // TODO some user collectionback here?
+    }
+
+    InstallTrigger.install(params, callback);
+}
+
+Bandwagon.Controller.CollectionsPane.doUpgradeToFirefoxN = function(version)
+{
+    Bandwagon.Logger.info("in Bandwagon.Controller.CollectionsPane.doUpgradeToFirefoxN() with version = " + version);
+
+    Bandwagon.Controller.CollectionsPane._openURL("http://www.mozilla.com/en-US/firefox/all.html");
+}
+
+Bandwagon.Controller.CollectionsPane.doDownloadFirefoxNBeta = function(version)
+{
+    Bandwagon.Logger.info("in Bandwagon.Controller.CollectionsPane.doDownloadFirefoxNBeta() with version = " + 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
+ */
+Bandwagon.Controller.CollectionsPane.refresh = function()
+{
+    var selectedElemBandwagonCollection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem;
+
+    if (selectedElemBandwagonCollection != null)
+    {
+        collection = selectedElemBandwagonCollection.collection;
+        Bandwagon.Controller.CollectionsPane._repopulateAddonsList(collection);
+    }
+
+    Bandwagon.Controller.CollectionsPane.invalidate();
+}
+
+Bandwagon.Controller.CollectionsPane.prefObserver = 
+{
+    observe: function(subject, topic, data)
+    {
+        if (topic != "nsPref:changed")
+            return;
+
+        if (data.match(/addonsperpage/))
+        {
+            Bandwagon.Controller.CollectionsPane.refresh();
+        }
+    }
+}
+
+/**
+ * Function to select a collection ui programmatically based on its collection object.
+ */
+Bandwagon.Controller.CollectionsPane._selectCollection = function(collection)
+{
+    // select the collection and show (collection == null clears the selection)
+
+    if (collection == null)
+    {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.clearSelection();
+        Bandwagon.Controller.CollectionsPane.doShowCollection();
+        return;
+    }
+
+    // select the richlistitem
+
+    const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+    var elemsBandwagonCollection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.getElementsByTagNameNS(XULNS, "bandwagonCollection");
+    var elemBandwagonCollection = null;
+
+    for (var i=0; i<elemsBandwagonCollection.length; i++)
+    {
+        if (elemsBandwagonCollection[i].collection.equals(collection))
+        {
+            elemBandwagonCollection = elemsBandwagonCollection[i];
+            break;
+        }
+    }
+
+    if (elemBandwagonCollection == null)
+    {
+        Bandwagon.Logger.warn("could not find a richlistitem to select");
+        return;
+    }
+
+    Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectItem(elemBandwagonCollection);
+    Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.ensureElementIsVisible(elemBandwagonCollection);
+    Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.focus();
+}
+
+Bandwagon.Controller.CollectionsPane._selectPreferredCollection = function()
+{
+    // select a collection - last selected or the first one
+    var elemsBandwagonCollection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.getElementsByTagName("bandwagonCollection");
+
+    if (Bandwagon.Controller.CollectionsPane.preferredCollection != null && bandwagonService.collections[Bandwagon.Controller.CollectionsPane.preferredCollection.resourceURL] != null)
+    {
+        Bandwagon.Logger.debug("selecting preferred collection (defined)");
+        Bandwagon.Controller.CollectionsPane._selectCollection(Bandwagon.Controller.CollectionsPane.preferredCollection);
+    }
+    else if (elemsBandwagonCollection.length > 0)
+    {
+        Bandwagon.Logger.debug("selecting preferred collection (the first in the list)");
+        Bandwagon.Controller.CollectionsPane._selectCollection(elemsBandwagonCollection[0].collection);
+    }
+    else
+    {
+        Bandwagon.Logger.debug("preferred collection is none");
+        Bandwagon.Controller.CollectionsPane._selectCollection(null);
+    }
+}
+
+Bandwagon.Controller.CollectionsPane._repopulateCollectionsList = function()
+{
+    //Bandwagon.Logger.debug("Bandwagon.Controller.CollectionsPane: about to repopulate the collections list");
+
+    // first clear the list
+
+    while (Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.hasChildNodes())
+    {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.removeChild(Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.firstChild);
+    }
+
+    // repopulate with collections
+
+    for (var id in bandwagonService.collections)
+    {
+        var collection = bandwagonService.collections[id];
+
+        if (collection == null)
+            return;
+
+        const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+        var elemBandwagonCollection = document.createElementNS(XULNS, "bandwagonCollection");
+        elemBandwagonCollection.collection = collection;
+        elemBandwagonCollection.controller = Bandwagon.Controller.CollectionsPane;
+
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.appendChild(elemBandwagonCollection);
+    }
+}
+
+Bandwagon.Controller.CollectionsPane._repopulateAddonsList = function(collection)
+{
+    // first clear the list
+   
+    while (Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.hasChildNodes())
+    {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.removeChild(Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.firstChild);
+    }
+
+    Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.clearSelection();
+
+    if (collection == null)
+        return;
+
+    Bandwagon.Logger.debug("Bandwagon.Controller.CollectionsPane: repopulating collection '" + collection.resourceURL + "'");
+
+    // sort by addon.dateAdded
+
+    var addonsSorted = collection.getSortedAddons();
+
+    // repopulate with collection items
+
+    var addonsPerPage = bandwagonService.getAddonsPerPage(collection);
+    const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+    for (var i=0; (i<addonsSorted.length&&i<addonsPerPage); i++)
+    {
+        var addon = collection.addons[addonsSorted[i].guid];
+
+        if (addon == null)
+            continue;
+
+        var elemBandwagonAddon = document.createElementNS(XULNS, "bandwagonAddon");
+        elemBandwagonAddon.addon = addon;
+
+        Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.appendChild(elemBandwagonAddon);
+    }
+}
+
+Bandwagon.Controller.CollectionsPane._openURL = function(url)
+{
+    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                       .getService(Components.interfaces.nsIWindowMediator);
+    var mainWindow = wm.getMostRecentWindow("navigator:browser");
+
+    if (mainWindow)
+    {
+        var tab = mainWindow.getBrowser().addTab(url);
+        mainWindow.getBrowser().selectedTab = tab;
+        mainWindow.focus();
+    }
+    else
+    {
+        window.open(url);
+    }
+}
+
+Bandwagon.Controller.CollectionsPane._openLocalizedURL = function(url)
+{
+    var locale = Bandwagon.Util.getBrowserLocale();
+
+    if (locale && locale != "")
+        url = url.replace(/en-US/, locale, "g");
+
+    Bandwagon.Controller.CollectionsPane._openURL(url);
+}
+
+// when this window closes, we do any uninit stuff
+
+window.addEventListener("unload", Bandwagon.Controller.CollectionsPane.uninit, true);
+
diff --git a/bandwagon/content/ui/dialog.js b/bandwagon/content/ui/dialog.js
index 33e635c..84d096f 100644
--- a/bandwagon/content/ui/dialog.js
+++ b/bandwagon/content/ui/dialog.js
@@ -14,11 +14,11 @@
  * The Original Code is bandwagon.
  *
  * The Initial Developer of the Original Code is
- * David McNamara.
+ * Mozilla Corporation.
  * Portions created by the Initial Developer are Copyright (C) 2008
  * the Initial Developer. All Rights Reserved.
  *
- * Contributor(s):
+ * Contributor(s): David McNamara
  *
  * 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
diff --git a/bandwagon/content/ui/feedsPaneController.js b/bandwagon/content/ui/feedsPaneController.js
deleted file mode 100644
index af23cf7..0000000
--- a/bandwagon/content/ui/feedsPaneController.js
+++ /dev/null
@@ -1,779 +0,0 @@
-/* ***** 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 bandwagon.
- *
- * The Initial Developer of the Original Code is
- * David McNamara.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-Bandwagon.Controller.FeedsPane = new function()
-{
-    this.initialized = false;
-    this.initializedBindings = false;
-
-    this.preferredFeed = null;
-
-    this.elemBandwagonFeeds = null;
-    this.elemBandwagonFeedItems = null;
-    this.elemBandwagonButtonViewSite = null;
-    this.elemBandwagonButtonUpdate = null;
-    this.elemBandwagonButtonRemove = null;
-    this.elemBandwagonFeedTitle = null;
-    this.elemBandwagonFeedDescription = null;
-    this.elemBandwagonFeedsNotification = null;
-    this.elemBandwagonFeedDeck = null;
-    this.elemBandwagonFeedHeader = null;
-    this.stringBundle = null;
-
-    this.previewNotificationVal = "bandwagon-feed-preview";
-}
-
-Bandwagon.Controller.FeedsPane.init = function()
-{
-    if (Bandwagon.Controller.FeedsPane.initialized == true) return;
-
-    Bandwagon.Logger.debug("Initializing Bandwagon.Controller.FeedsPane");
-
-    this.elemBandwagonFeeds = document.getElementById("bandwagon-feeds-list");
-    this.elemBandwagonFeedItems = document.getElementById("bandwagon-feeditems-list");
-    this.elemBandwagonButtonViewSite = document.getElementById("bandwagon-button-viewsite");
-    this.elemBandwagonButtonUpdate = document.getElementById("bandwagon-button-update");
-    this.elemBandwagonButtonRemove = document.getElementById("bandwagon-button-remove");
-    this.elemBandwagonFeedTitle = document.getElementById("bandwagon-feed-title");
-    this.elemBandwagonFeedDescription = document.getElementById("bandwagon-feed-description");
-    this.elemBandwagonFeedsNotification = document.getElementById("bandwagon-feeds-notification");
-    this.elemBandwagonFeedDeck = document.getElementById("bandwagon-feed-deck");
-    this.elemBandwagonFeedHeader = document.getElementById("bandwagon-feed-header");
-
-    Bandwagon.Controller.FeedsPane._repopulateFeedsList();
-    Bandwagon.Controller.FeedsPane.invalidate();
-
-    this.elemBandwagonFeeds.addEventListener("select", Bandwagon.Controller.FeedsPane.doShowFeed, true);
-    this.elemBandwagonFeedItems.addEventListener("select", Bandwagon.Controller.FeedsPane.doExpandFeedItem, true);
-
-    bandwagonService.registerFeedUpdateObserver(Bandwagon.Controller.FeedsPane.feedUpdateObserver);
-    bandwagonService.registerFeedListChangeObserver(Bandwagon.Controller.FeedsPane.feedListChangeObserver);
-
-    Bandwagon.Preferences.addObserver(Bandwagon.Controller.FeedsPane.prefObserver);
-    Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService).addObserver(Bandwagon.Controller.FeedsPane.prefObserver, "nsPref:changed", false);
-}
-
-/**
- * Triggered when the user navigates to the feeds pane from a different view in the extensions manager
- */
-Bandwagon.Controller.FeedsPane.onViewSelect = function()
-{
-    Bandwagon.Logger.debug("in Bandwagon.Controller.FeedsPane.onViewSelect()");
-
-    if (Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem != null)
-    {
-        // make sure the expanded feed item is scrolled into view
-        var elemsFeedItemExpanded = Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.getElementsByTagName("bandwagonFeedItemExpanded");
-
-        if (elemsFeedItemExpanded && elemsFeedItemExpanded[0])
-        {
-            Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.ensureElementIsVisible(elemsFeedItemExpanded[0]);
-        }
-    }
-}
-
-Bandwagon.Controller.FeedsPane.bindingsReady = function()
-{
-    // the bindings are ready, do any final initialization
-
-    if (Bandwagon.Controller.FeedsPane.initializedBindings == false)
-    {
-        Bandwagon.Controller.FeedsPane._selectPreferredFeed();
-        Bandwagon.Controller.FeedsPane.initializedBindings = true;
-    }
-
-    Bandwagon.Controller.FeedsPane.initialized = true;
-}
-
-Bandwagon.Controller.FeedsPane.uninit = function()
-{
-    if (Bandwagon.Controller.FeedsPane.initialized != true) return;
-
-    Bandwagon.Logger.debug("Uninitializing Bandwagon.Controller.FeedsPane");
-
-    Bandwagon.Controller.FeedsPane.initialized = false;
-
-    bandwagonService.unregisterFeedUpdateObserver(Bandwagon.Controller.FeedsPane.feedUpdateObserver);
-    bandwagonService.unregisterFeedListChangeObserver(Bandwagon.Controller.FeedsPane.feedListChangeObserver);
-
-    Bandwagon.Preferences.removeObserver(Bandwagon.Controller.FeedsPane.prefObserver);
-
-    // now is a good time to save feeds to storage
-    if (Bandwagon.COMMIT_NOW)
-        bandwagonService.commitAll();
-}
-
-/**
- * Updates the interface disabled-ness based on the state of the selected feed, etc.
- */
-Bandwagon.Controller.FeedsPane.invalidate = function()
-{
-    if (Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem == null)
-    {
-        Bandwagon.Controller.FeedsPane.elemBandwagonButtonViewSite.disabled = true;
-        Bandwagon.Controller.FeedsPane.elemBandwagonButtonUpdate.disabled = true;
-        Bandwagon.Controller.FeedsPane.elemBandwagonButtonRemove.disabled = true;
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedHeader.collapsed = true;
-
-        Bandwagon.Controller.FeedsPane._repopulateFeedItemsList(null);
-
-        var elemsBandwagonFeed = Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.getElementsByTagName("bandwagonFeed");
-
-        if (elemsBandwagonFeed.length == 0)
-        {
-            Bandwagon.Controller.FeedsPane.elemBandwagonFeedDeck.selectedIndex = 1;
-        }
-        else
-        {
-            Bandwagon.Controller.FeedsPane.elemBandwagonFeedDeck.selectedIndex = 0;
-        }
-    }
-    else
-    {
-        Bandwagon.Controller.FeedsPane.elemBandwagonButtonViewSite.disabled = false;
-        Bandwagon.Controller.FeedsPane.elemBandwagonButtonUpdate.disabled = false;
-        Bandwagon.Controller.FeedsPane.elemBandwagonButtonRemove.disabled = false;
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedHeader.collapsed = false;
-
-        var feed = Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem.feed;
-
-        if (feed.status == feed.STATUS_LOADING)
-        {
-            Bandwagon.Controller.FeedsPane.elemBandwagonFeedDeck.selectedIndex = 2;
-        }
-        else if (feed.status == feed.STATUS_LOADERROR)
-        {
-            Bandwagon.Controller.FeedsPane.elemBandwagonFeedDeck.selectedIndex = 4;
-        }
-        else if (feed.hasFeedItem() == 0)
-        {
-            Bandwagon.Controller.FeedsPane.elemBandwagonFeedDeck.selectedIndex = 3;
-        }
-        else
-        {
-            Bandwagon.Controller.FeedsPane.elemBandwagonFeedDeck.selectedIndex = 0;
-        }
-    }
-}
-
-Bandwagon.Controller.FeedsPane.feedListChangeObserver = function()
-{
-    Bandwagon.Logger.debug("In Bandwagon.Controller.FeedsPane.feedListChangeObserver()");
-
-    Bandwagon.Controller.FeedsPane._repopulateFeedsList();
-    Bandwagon.Controller.FeedsPane._selectPreferredFeed();
-}
-
-Bandwagon.Controller.FeedsPane.feedUpdateObserver = function(feed)
-{
-    if (feed == null)
-    {
-        Bandwagon.Logger.debug("In Bandwagon.Controller.FeedsPane.feedUpdateObserver() with feed <null>");
-    }
-    else
-    {
-        Bandwagon.Logger.debug("In Bandwagon.Controller.FeedsPane.feedUpdateObserver() with feed '" + feed.url + "'");
-
-        // update the unread count for this feed
-
-        const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-        var elemsBandwagonFeed = Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.getElementsByTagNameNS(XULNS, "bandwagonFeed");
-
-        for (var i=0; i<elemsBandwagonFeed.length; i++)
-        {
-            if (elemsBandwagonFeed[i].feed.equals(feed))
-            {
-                elemsBandwagonFeed[i].unread = feed.getUnreadFeedItems().length;
-                break;
-            }
-        }
-
-        // if this feed is currently selected, update the view
-
-        if (Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem && feed.equals(Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem.feed))
-        {
-            Bandwagon.Controller.FeedsPane._repopulateFeedItemsList(feed);
-
-            // if this is a just arrived feed preview, show the notification box
-            if (feed.preview)
-            {
-                Bandwagon.Controller.FeedsPane.elemBandwagonFeedsNotification.notificationsHidden = false;
-                setTimeout(Bandwagon.Controller.FeedsPane._createPreviewNotification, 200);
-            }
-        }
-    }
-
-    Bandwagon.Controller.FeedsPane.invalidate();
-}
-
-Bandwagon.Controller.FeedsPane.doUpdateAll = function(event)
-{
-    Bandwagon.Controller.FeedsPane.elemBandwagonFeedDeck.selectedIndex = 2;
-
-    bandwagonService.forceCheckAllForUpdates();
-}
-
-Bandwagon.Controller.FeedsPane.doSubscribe = function(event)
-{
-    Bandwagon.Controller.FeedsPane._openURL(Bandwagon.FEEDSPANE_DO_SUBSCRIBE_URL);
-}
-
-Bandwagon.Controller.FeedsPane.doSettings = function(event)
-{
-    var prefSvc = Components.classes["@mozilla.org/preferences-service;1"].
-        getService(Components.interfaces.nsIPrefService);
-    var prefServiceCache = prefSvc.getBranch(null);
-    var instantApply = prefServiceCache.getBoolPref("browser.preferences.instantApply");
-    var flags = "chrome,titlebar,toolbar,centerscreen" + (instantApply ? ",dialog=no" : ",modal");
-
-    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-        .getService(Components.interfaces.nsIWindowMediator);
-    var win = wm.getMostRecentWindow("Bandwagon:Settings");
-
-    if (win)
-    {
-        win.focus();
-    }
-    else
-    {
-        window.openDialog("chrome://bandwagon/content/ui/settings.xul", 
-                "bandwagonsettings",
-                flags);
-    }
-}
-
-Bandwagon.Controller.FeedsPane.doViewSite = function(event)
-{
-    // TODO use url from feed
-    Bandwagon.Controller.FeedsPane._openURL("http://www.google.com/search?hl=en&q=bandwagon+view+site&btnG=Search");
-}
-
-Bandwagon.Controller.FeedsPane.doUpdate = function(event)
-{
-    if (Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem == null)
-        return;
-
-    Bandwagon.Controller.FeedsPane.elemBandwagonFeedDeck.selectedIndex = 2;
-
-    var feed = Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem.feed;
-
-    if (feed == null)
-        return;
-
-    bandwagonService.forceCheckForUpdates(feed);
-}
-
-Bandwagon.Controller.FeedsPane.doRemove = function(event)
-{
-    if (Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem == null)
-        return;
-
-    var feed = Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem.feed;
-
-    if (feed == null)
-        return;
-
-    bandwagonService.deleteFeed(feed);
-
-    if (!feed.preview)
-        bandwagonService.unsubscribe(feed);
-}
-
-Bandwagon.Controller.FeedsPane.doShowFeed = function()
-{
-    var feed = null;
-
-    var selectedElemBandwagonFeed = Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem;
-
-    if (selectedElemBandwagonFeed != null)
-    {
-        feed = selectedElemBandwagonFeed.feed;
-    }
-
-    // if feed == null, then display will be cleared
-
-    // misc. ui 
-
-    Bandwagon.Controller.FeedsPane.elemBandwagonFeedTitle.setAttribute("value", (feed?(feed.name?feed.name:feed.url):""));
-
-    if (feed && feed.description != "")
-    {
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedDescription.setAttribute("value", feed.description);
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedDescription.removeAttribute("collsaped");
-    }
-    else
-    {
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedDescription.setAttribute("collapsed", true);
-    }
-
-    // feed preview notification box
-
-    if (feed && feed.preview && feed.status != feed.STATUS_LOADING)
-    {
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedsNotification.notificationsHidden = false;
-
-        // this needs to be in a seperate thread
-        setTimeout(Bandwagon.Controller.FeedsPane._createPreviewNotification, 500);
-    }
-    else
-    {
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedsNotification.notificationsHidden = true;
-    }
-
-    // show items
-
-    Bandwagon.Controller.FeedsPane._repopulateFeedItemsList(feed);
-
-    // invalidate
-
-    Bandwagon.Controller.FeedsPane.invalidate();
-
-    // show the loading dialog if needed
-
-    if (feed && feed.status == feed.STATUS_LOADING)
-    {
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedDeck.selectedIndex = 2;
-    }
-
-    // set all items in this feed to be "read"
-    // if we've just opened this dialog, don't update the read count
-
-    if (feed)
-    {
-        feed.setAllRead();
-
-        if (Bandwagon.Controller.FeedsPane.initialized)
-        {
-            Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem.unread = 0;
-        }
-    }
-}
-
-Bandwagon.Controller.FeedsPane.doExpandFeedItem = function(event)
-{
-    if (event)
-        event.preventDefault();
-
-    if (Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.selectedItem && Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.selectedItem.nodeName == "bandwagonFeedItemExpanded")
-    {
-        return;
-    }
-
-    var elemsFeedItemExpanded = Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.getElementsByTagName("bandwagonFeedItemExpanded");
-
-    for (var i=0; i<elemsFeedItemExpanded.length; i++)
-    {
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.removeChild(elemsFeedItemExpanded[i]);
-    }
-
-    var elemsFeedItem = Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.childNodes;
-
-    for (var i=0; i<elemsFeedItem.length; i++)
-    {
-        elemsFeedItem[i].collapsed = false;
-    }
-
-    var selectedElemBandwagonFeedItem = Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.selectedItem;
-
-    if (selectedElemBandwagonFeedItem != null && selectedElemBandwagonFeedItem.feedItem != null)
-    {
-        selectedElemBandwagonFeedItem.read = true;
-
-        var feedItem = selectedElemBandwagonFeedItem.feedItem;
-        feedItem.read = true;
-
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem.unread = Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem.feed.getUnreadFeedItems().length;
-
-        // collapse this, show the expanded binding
-
-        const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-        var elemBandwagonFeedItemExpanded = document.createElementNS(XULNS, "bandwagonFeedItemExpanded");
-
-        elemBandwagonFeedItemExpanded.feedItem = feedItem;
-
-        try
-        {
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedItemExpanded.setFeedItem(feedItem);
-        } catch (e) {}
-
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.insertBefore(elemBandwagonFeedItemExpanded, selectedElemBandwagonFeedItem);
-
-        selectedElemBandwagonFeedItem.collapsed = true;
-    }
-}
-
-Bandwagon.Controller.FeedsPane.doMoreInfo = function(event)
-{
-    if (event)
-        event.preventDefault();
-
-    if (Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems == null)
-        return;
-
-    Bandwagon.Controller.FeedsPane._openURL(Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.selectedItem.feedItem.learnmore);
-}
-
-Bandwagon.Controller.FeedsPane.doAddToFirefox = function()
-{
-    if (Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.selectedItem == null)
-        return;
-
-    var feedItem = Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.selectedItem.feedItem;
-
-    if (!isXPInstallEnabled())
-        return;
-
-    if (feedItem.eula && feedItem.eula != "")
-    {
-        var eula = {
-          name: feedItem.name,
-          text: feedItem.eula,
-          accepted: false
-        };
-
-        window.openDialog("chrome://mozapps/content/extensions/eula.xul", "_blank",
-                          "chrome,dialog,modal,centerscreen,resizable=no", eula);
-
-        if (!eula.accepted)
-            return;
-    }
-
-    var installer = feedItem.getInstaller(Bandwagon.Util.getHostEnvironmentInfo().os);
-
-    if (!installer)
-    {
-        Bandwagon.Logger.warn("No compatible os targets found.");
-        return;
-    }
-
-    var params = [];
-    params[feedItem.name] = installer;
-
-    // TODO do some user feedback here?
-
-    var callback = function(url, status)
-    {
-        Bandwagon.Logger.info("Finished installing '" + url + "'; status = " + status);
-
-        // TODO some user feedback here?
-    }
-
-    InstallTrigger.install(params, callback);
-}
-
-Bandwagon.Controller.FeedsPane.doUpgradeToFirefoxN = function(version)
-{
-    Bandwagon.Logger.info("in Bandwagon.Controller.FeedsPane.doUpgradeToFirefoxN() with version = " + version);
-
-    Bandwagon.Controller.FeedsPane._openURL("http://www.mozilla.com/en-US/firefox/all.html");
-}
-
-Bandwagon.Controller.FeedsPane.doDownloadFirefoxNBeta = function(version)
-{
-    Bandwagon.Logger.info("in Bandwagon.Controller.FeedsPane.doDownloadFirefoxNBeta() with version = " + version);
-
-    Bandwagon.Controller.FeedsPane._openURL("http://www.mozilla.com/en-US/firefox/all-beta.html");
-}
-
-Bandwagon.Controller.FeedsPane.doShowFeedPreview = function(feedURL)
-{
-    // this is executed when the browser overlay controller opens the EM window to subscribe to a new feed.
-    // i.e. after a custom bandwagonSubscribe is detected and handled
-
-    Bandwagon.Logger.debug("In Bandwagon.Controller.FeedsPane.doShowFeedPreview() with feedURL = " + feedURL);
-
-    // check if we already have this feed
-
-    if (bandwagonService.feeds[feedURL])
-    {
-        var feed = bandwagonService.feeds[feedURL];
-        Bandwagon.Controller.FeedsPane.preferredFeed = feed;
-        //Bandwagon.Controller.FeedsPane._selectFeed(feed);
-        setTimeout(function() { Bandwagon.Controller.FeedsPane._selectFeed(feed); }, 500);
-        return;
-    }
-
-    // add and select the feed
-
-    var feed = bandwagonService.addPreviewFeed(feedURL);
-    //feed.status = feed.STATUS_LOADING;
-
-    Bandwagon.Controller.FeedsPane.preferredFeed = feed;
-    setTimeout(function() { Bandwagon.Controller.FeedsPane._selectFeed(feed); }, 500);
-}
-
-Bandwagon.Controller.FeedsPane._createPreviewNotification = function()
-{
-    if (!Bandwagon.Controller.FeedsPane.elemBandwagonFeedsNotification.getNotificationWithValue(Bandwagon.Controller.FeedsPane.previewNotificationVal))
-    {
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedsNotification.appendNotification
-        (
-            Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("feedspane.this.is.only.a.preview"),
-            Bandwagon.Controller.FeedsPane.previewNotificationVal,
-            null,
-            Bandwagon.Controller.FeedsPane.elemBandwagonFeedsNotification.PRIORITY_WARNING_MEDIUM,
-            [
-                {
-                    accessKey: Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("feedspane.dont.subscribe.accesskey"),
-                    callback: Bandwagon.Controller.FeedsPane.doFeedPreviewDontSubscribe,
-                    label: Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("feedspane.dont.subscribe"),
-                    popup: null
-                },
-                {
-                    accessKey: Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("feedspane.subscribe.accesskey"),
-                    callback: Bandwagon.Controller.FeedsPane.doFeedPreviewSubscribe,
-                    label: Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("feedspane.subscribe"),
-                    popup: null
-                }
-            ]
-        );
-    }
-}
-
-Bandwagon.Controller.FeedsPane.doFeedPreviewDontSubscribe = function()
-{
-    Bandwagon.Logger.debug("in Bandwagon.Controller.FeedsPane.doFeedPreviewDontSubscribe()");
-
-    Bandwagon.Controller.FeedsPane.preferredFeed = null;
-
-    Bandwagon.Controller.FeedsPane.doRemove();
-}
-
-Bandwagon.Controller.FeedsPane.doFeedPreviewSubscribe = function()
-{
-    Bandwagon.Logger.debug("in Bandwagon.Controller.FeedsPane.doFeedPreviewSubscribe()");
-
-    if (Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem == null)
-        return;
-
-    var feed = Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem.feed;
-
-    if (feed == null)
-        return;
-
-    bandwagonService.subscribe(feed);
-
-    if (Bandwagon.COMMIT_NOW)
-        bandwagonService.commit(feed);
-
-    Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem.preview = false;
-    Bandwagon.Controller.FeedsPane.doShowFeed();
-} 
-
-
-/**
- * Refreshes the feed pane
- */
-Bandwagon.Controller.FeedsPane.refresh = function()
-{
-    var selectedElemBandwagonFeed = Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectedItem;
-
-    if (selectedElemBandwagonFeed != null)
-    {
-        feed = selectedElemBandwagonFeed.feed;
-        Bandwagon.Controller.FeedsPane._repopulateFeedItemsList(feed);
-    }
-
-    Bandwagon.Controller.FeedsPane.invalidate();
-}
-
-Bandwagon.Controller.FeedsPane.prefObserver = 
-{
-    observe: function(subject, topic, data)
-    {
-        if (topic != "nsPref:changed")
-            return;
-
-        if (data.match(/feeditemsperpage/))
-        {
-            Bandwagon.Controller.FeedsPane.refresh();
-        }
-    }
-}
-
-/**
- * Function to select a feed ui programmatically based on its feed object.
- */
-Bandwagon.Controller.FeedsPane._selectFeed = function(feed)
-{
-    // select the feed and show (feed == null clears the selection)
-
-    if (feed == null)
-    {
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.clearSelection();
-        Bandwagon.Controller.FeedsPane.doShowFeed();
-        return;
-    }
-
-    // select the richlistitem
-
-    const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-
-    var elemsBandwagonFeed = Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.getElementsByTagNameNS(XULNS, "bandwagonFeed");
-    var elemBandwagonFeed = null;
-
-    for (var i=0; i<elemsBandwagonFeed.length; i++)
-    {
-        if (elemsBandwagonFeed[i].feed.equals(feed))
-        {
-            elemBandwagonFeed = elemsBandwagonFeed[i];
-            break;
-        }
-    }
-
-    if (elemBandwagonFeed == null)
-    {
-        Bandwagon.Logger.warn("could not find a richlistitem to select");
-        return;
-    }
-
-    Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.selectItem(elemBandwagonFeed);
-    Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.ensureElementIsVisible(elemBandwagonFeed);
-    Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.focus();
-}
-
-Bandwagon.Controller.FeedsPane._selectPreferredFeed = function()
-{
-    // select a feed - last selected or the first one
-    var elemsBandwagonFeed = Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.getElementsByTagName("bandwagonFeed");
-
-    if (Bandwagon.Controller.FeedsPane.preferredFeed != null && bandwagonService.feeds[Bandwagon.Controller.FeedsPane.preferredFeed.url] != null)
-    {
-        Bandwagon.Logger.debug("selecting preferred feed (defined)");
-        Bandwagon.Controller.FeedsPane._selectFeed(Bandwagon.Controller.FeedsPane.preferredFeed);
-    }
-    else if (elemsBandwagonFeed.length > 0)
-    {
-        Bandwagon.Logger.debug("selecting preferred feed (the first in the list)");
-        Bandwagon.Controller.FeedsPane._selectFeed(elemsBandwagonFeed[0].feed);
-    }
-    else
-    {
-        Bandwagon.Logger.debug("preferred feed is none");
-        Bandwagon.Controller.FeedsPane._selectFeed(null);
-    }
-}
-
-Bandwagon.Controller.FeedsPane._repopulateFeedsList = function()
-{
-    //Bandwagon.Logger.debug("Bandwagon.Controller.FeedsPane: about to repopulate the feeds list");
-
-    // first clear the list
-
-    while (Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.hasChildNodes())
-    {
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.removeChild(Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.firstChild);
-    }
-
-    // repopulate with feeds
-
-    for (var id in bandwagonService.feeds)
-    {
-        var feed = bandwagonService.feeds[id];
-
-        if (feed == null)
-            return;
-
-        const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-        var elemBandwagonFeed = document.createElementNS(XULNS, "bandwagonFeed");
-        elemBandwagonFeed.feed = feed;
-        elemBandwagonFeed.controller = Bandwagon.Controller.FeedsPane;
-
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeeds.appendChild(elemBandwagonFeed);
-    }
-}
-
-Bandwagon.Controller.FeedsPane._repopulateFeedItemsList = function(feed)
-{
-    // first clear the list
-   
-    while (Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.hasChildNodes())
-    {
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.removeChild(Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.firstChild);
-    }
-
-    Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.clearSelection();
-
-    if (feed == null)
-        return;
-
-    Bandwagon.Logger.debug("Bandwagon.Controller.FeedsPane: repopulating feed '" + feed.url + "'");
-
-    // sort by feedItem.dateAdded
-
-    var feedItemsSorted = feed.getSortedFeedItems();
-
-    // repopulate with feed items
-
-    var feedItemsPerPage = bandwagonService.getFeedItemsPerPage(feed);
-    const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-
-    for (var i=0; (i<feedItemsSorted.length&&i<feedItemsPerPage); i++)
-    {
-        var feedItem = feed.feedItems[feedItemsSorted[i].guid];
-
-        if (feedItem == null)
-            continue;
-
-        var elemBandwagonFeedItem = document.createElementNS(XULNS, "bandwagonFeedItem");
-        elemBandwagonFeedItem.feedItem = feedItem;
-
-        Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.appendChild(elemBandwagonFeedItem);
-    }
-}
-
-Bandwagon.Controller.FeedsPane._openURL = function(url)
-{
-    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                       .getService(Components.interfaces.nsIWindowMediator);
-    var mainWindow = wm.getMostRecentWindow("navigator:browser");
-
-    if (mainWindow)
-    {
-        var tab = mainWindow.getBrowser().addTab(url);
-        mainWindow.getBrowser().selectedTab = tab;
-        mainWindow.focus();
-    }
-    else
-    {
-        window.open(url);
-    }
-}
-
-// when this window closes, we do any uninit stuff
-
-window.addEventListener("unload", Bandwagon.Controller.FeedsPane.uninit, true);
-
diff --git a/bandwagon/content/ui/overlays/browserOverlay.xul b/bandwagon/content/ui/overlays/browserOverlay.xul
index 619b97b..cb9d0e8 100644
--- a/bandwagon/content/ui/overlays/browserOverlay.xul
+++ b/bandwagon/content/ui/overlays/browserOverlay.xul
@@ -19,7 +19,7 @@
   - Portions created by the Initial Developer are Copyright (C) 2008
   - the Initial Developer. All Rights Reserved.
   -
-  - Contributor(s): Brian King
+  - Contributor(s): Brian King <brian (at) briks (dot) si>
   -
   - 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,6 +35,10 @@
   - 
   - ***** END LICENSE BLOCK ***** -->
 
+<!DOCTYPE overlay SYSTEM "chrome://bandwagon/locale/browserOverlay.dtd" >
+
+<?xml-stylesheet href="chrome://bandwagon/skin/browserOverlay.css" type="text/css"?>
+
 <overlay id="bandwagon-browser-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
@@ -47,9 +51,10 @@
     <script src="chrome://bandwagon/content/scripts/rpc/error.js"/>
     <script src="chrome://bandwagon/content/scripts/rpc/event.js"/>
     <script src="chrome://bandwagon/content/scripts/rpc/net.js"/>
-    <script src="chrome://bandwagon/content/scripts/model/feed.js"/>
-    <script src="chrome://bandwagon/content/scripts/model/feedItem.js"/>
-    <script src="chrome://bandwagon/content/scripts/factory/feedFactory.js"/>
+    <script src="chrome://bandwagon/content/scripts/model/serviceDocument.js"/>
+    <script src="chrome://bandwagon/content/scripts/model/collection.js"/>
+    <script src="chrome://bandwagon/content/scripts/model/addon.js"/>
+    <script src="chrome://bandwagon/content/scripts/factory/collectionFactory.js"/>
 
     <script src="chrome://bandwagon/content/ui/overlays/browserOverlayController.js"/>
 
@@ -57,4 +62,13 @@
         <stringbundle id="bandwagon-strings" src="chrome://bandwagon/locale/browserOverlay.properties"/>
     </stringbundleset>
 
+    <!-- Firefox Toolbar -->
+    <toolbarpalette id="BrowserToolbarPalette">
+      <toolbarbutton id="extensions-bandwagon-button"
+                     class="toolbarbutton-1 bandwagon-button"
+                     oncommand="Bandwagon.Controller.BrowserOverlay.openAddons();"
+                     tooltiptext="&bandwagon.tooltip;"
+                     label="&bandwagon.label;" />
+    </toolbarpalette>
+
 </overlay>
diff --git a/bandwagon/content/ui/overlays/browserOverlayController.js b/bandwagon/content/ui/overlays/browserOverlayController.js
index d2f3761..868ac37 100644
--- a/bandwagon/content/ui/overlays/browserOverlayController.js
+++ b/bandwagon/content/ui/overlays/browserOverlayController.js
@@ -14,11 +14,11 @@
  * The Original Code is bandwagon.
  *
  * The Initial Developer of the Original Code is
- * David McNamara.
+ * Mozilla Corporation.
  * Portions created by the Initial Developer are Copyright (C) 2008
  * the Initial Developer. All Rights Reserved.
  *
- * Contributor(s):
+ * Contributor(s): David McNamara
  *
  * 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
@@ -34,6 +34,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+var bandwagonService;
+
 Bandwagon.Controller.BrowserOverlay = new function() {}
 
 Bandwagon.Controller.BrowserOverlay.initBandwagon = function()
@@ -44,7 +46,7 @@ Bandwagon.Controller.BrowserOverlay.initBandwagon = function()
     {
         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-        var bandwagonService = Components.classes["@addons.mozilla.org/bandwagonservice;1"]
+        bandwagonService = Components.classes["@addons.mozilla.org/bandwagonservice;1"]
             .getService().wrappedJSObject;
 
         // We can safely call init() for each new browser window; the service
@@ -60,10 +62,44 @@ Bandwagon.Controller.BrowserOverlay.initBandwagon = function()
         Bandwagon.Logger.error("Error initializing bandwagon: " + 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)
+{
+    if (event.originalTarget instanceof HTMLDocument)
+    {
+        var doc = event.originalTarget;
+
+        if (event.originalTarget.defaultView.frameElement)
+        {
+            while (doc.defaultView.frameElement)
+            {
+                doc=doc.defaultView.frameElement.ownerDocument;
+            }
+        }
+        
+        // TODO only add to AMO
+
+        doc.addEventListener("bandwagonRefresh", Bandwagon.Controller.BrowserOverlay.handleSubscriptionRefreshEvent, true);
+
+        Bandwagon.Logger.debug("added bandwagonRefresh listener");
+    }
 }
 
+Bandwagon.Controller.BrowserOverlay.handleSubscriptionRefreshEvent = function(event)
+{
+    Bandwagon.Logger.info("Received bandwagon subscription refresh event");
+
+    bandwagonService.updateCollectionsList();
+}
+
+/** OBSOLETE
 Bandwagon.Controller.BrowserOverlay.addSubscribeEventListenerToDocument = function(event)
 {
     if (event.originalTarget instanceof HTMLDocument)
@@ -83,24 +119,28 @@ Bandwagon.Controller.BrowserOverlay.addSubscribeEventListenerToDocument = functi
         //Bandwagon.Logger.debug("added bandwagonSubscribe listener");
     }
 }
+*/
 
+/** OBSOLETE
 Bandwagon.Controller.BrowserOverlay.handleSubscribeEvent = function(event)
 {
     if (event.target && event.target.getAttribute("href"))
     {
-        var feedURL = event.target.getAttribute("href");
+        var collectionURL = event.target.getAttribute("href");
 
-        Bandwagon.Logger.info("Received subscribe event for feed: " + feedURL);
+        Bandwagon.Logger.info("Received subscribe event for collection: " + collectionURL);
 
-        Bandwagon.Controller.BrowserOverlay._openExtensionManagerFeedsPaneWithSubscribe(feedURL);
+        Bandwagon.Controller.BrowserOverlay._openExtensionManagerCollectionsPaneWithSubscribe(collectionURL);
     }
     else
     {
         Bandwagon.Logger.error("Missing data payload in bandwagonSubscribe event");
     }
 }
+*/
 
-Bandwagon.Controller.BrowserOverlay._openExtensionManagerFeedsPaneWithSubscribe = function(feedURL)
+/** OBSOLETE
+Bandwagon.Controller.BrowserOverlay._openExtensionManagerCollectionsPaneWithSubscribe = function(collectionURL)
 {
     const EMTYPE = "Extension:Manager";
     var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
@@ -109,23 +149,24 @@ Bandwagon.Controller.BrowserOverlay._openExtensionManagerFeedsPaneWithSubscribe
 
     if (theEM)
     {
-        // extensions manager window already open - focus, show feeds pane, call doShowFeedPreview
+        // extensions manager window already open - focus, show collections pane, call doShowCollectionPreview
 
         theEM.focus();
-        theEM.showView('bandwagon-feeds');
+        theEM.showView('bandwagon-collections');
 
-        setTimeout(function() { Bandwagon.Controller.FeedsPane.doShowFeedPreview(feedURL); }, 500);
+        setTimeout(function() { Bandwagon.Controller.CollectionsPane.doShowCollectionPreview(collectionURL); }, 500);
     }
     else
     {
-        // extensions manager window NOT already open - open with 'subscribe' argument (this will show feeds pane, call doShowFeedPreview)
+        // 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: feedURL});
+        window.openDialog(EMURL, "", EMFEATURES, {subscribe: collectionURL});
     }
 }
+*/
 
 Bandwagon.Controller.BrowserOverlay._removeLoadListener = function()
 {
@@ -144,18 +185,26 @@ Bandwagon.Controller.BrowserOverlay.openFirstRunLandingPage = function()
     1000);
 }
 
-Bandwagon.Controller.BrowserOverlay.showNewFeedItemsAlert = function(feed)
+/* Toolbar button action - Open add-ons window with Subscriptions tab focused */
+Bandwagon.Controller.BrowserOverlay.openAddons = function()
+{
+    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)
 {
-    Bandwagon.Logger.debug("in showNewFeedItemsAlert()");
+    Bandwagon.Logger.debug("in showNewAddonsAlert()");
 
     var bandwagonStrings = document.getElementById("bandwagon-strings");
 
     var alertsService = Components.classes["@mozilla.org/alerts-service;1"]
         .getService(Components.interfaces.nsIAlertsService);
 
-    var unnotifiedCount = feed.getUnnotifiedFeedItems().length;
-    var feedName = (feed.name?feed.name:feed.url);
-    var feedURL = feed.url;
+    var unnotifiedCount = collection.getUnnotifiedAddons().length;
+    var collectionName = (collection.name?collection.name:collection.resourceURL);
+    var collectionURL = collection.resourceURL;
 
     var listener =
     {
@@ -163,7 +212,7 @@ Bandwagon.Controller.BrowserOverlay.showNewFeedItemsAlert = function(feed)
         {
             if (topic == "alertclickcallback")
             {
-                var feedURL = data;
+                var collectionURL = data;
 
                 const EMTYPE = "Extension:Manager";
                 var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
@@ -173,22 +222,22 @@ Bandwagon.Controller.BrowserOverlay.showNewFeedItemsAlert = function(feed)
                 if (theEM)
                 {
                     theEM.focus();
-                    theEM.showView('bandwagon-feeds');
+                    theEM.showView('bandwagon-collections');
 
-                    // if the em is open, select the bandwagon-feeds pane, but don't select the feed itself.
+                    // if the em is open, select the bandwagon-collections pane, but don't select the collection itself.
                     // the user will be notified by the unread count in the left hand side bar
 
-                    //theEM.setTimeout(function() { Bandwagon.Controller.FeedsPane._selectFeed(feed); }, 500);
+                    //theEM.setTimeout(function() { Bandwagon.Controller.CollectionsPane._selectCollection(collection); }, 500);
                 }
                 else
                 {
                     const EMURL = "chrome://mozapps/content/extensions/extensions.xul";
                     const EMFEATURES = "chrome,menubar,extra-chrome,toolbar,dialog=no,resizable";
 
-                    // the em is not open - open it, and select this feed
+                    // the em is not open - open it, and select this collection
 
                     if (window)
-                        window.openDialog(EMURL, "", EMFEATURES, {selectFeed: feedURL});
+                        window.openDialog(EMURL, "", EMFEATURES, {selectCollection: collectionURL});
                     else
                         Bandwagon.Logger.error("No browser windows open - can't open EM");
                 }
@@ -200,11 +249,11 @@ Bandwagon.Controller.BrowserOverlay.showNewFeedItemsAlert = function(feed)
     try
     {
         alertsService.showAlertNotification(
-                "chrome://bandwagon/skin/images/tango-addonfeed-32x32.png",
-                bandwagonStrings.getString("newfeeditems.alert.title"),
-                bandwagonStrings.getFormattedString("newfeeditems.alert.text", [feedName]),
+                "chrome://bandwagon/skin/images/icon32.png",
+                bandwagonStrings.getString("newaddons.alert.title"),
+                bandwagonStrings.getFormattedString("newaddons.alert.text", [collectionName]),
                 true, 
-                feedURL,
+                collectionURL,
                 listener
                 );
     }
diff --git a/bandwagon/content/ui/overlays/extensionsOverlay.xul b/bandwagon/content/ui/overlays/extensionsOverlay.xul
index 0d679f1..6f546dc 100644
--- a/bandwagon/content/ui/overlays/extensionsOverlay.xul
+++ b/bandwagon/content/ui/overlays/extensionsOverlay.xul
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- ***** BEGIN LICENSE BLOCK *****
   -   Version: MPL 1.1/GPL 2.0/LGPL 2.1
   -
@@ -15,11 +16,12 @@
   - The Original Code is bandwagon.
   -
   - The Initial Developer of the Original Code is
-  - David McNamara.
+  - Mozilla Corporation.
   - Portions created by the Initial Developer are Copyright (C) 2008
   - the Initial Developer. All Rights Reserved.
   -
-  - Contributor(s): Brian King
+  - Contributor(s): David McNamara
+  -                 Brian King <brian (at) briks (dot) si>
   -
   - 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,7 +48,7 @@
 
     <script src="chrome://bandwagon/content/ui/dialog.js"/>
     <script src="chrome://bandwagon/content/ui/overlays/extensionsOverlayController.js"/>
-    <script src="chrome://bandwagon/content/ui/feedsPaneController.js"/>
+    <script src="chrome://bandwagon/content/ui/collectionsPaneController.js"/>
 
     <stringbundleset>
         <stringbundle id="bandwagon-strings" src="chrome://bandwagon/locale/extensionOverlay.properties"/>
@@ -55,10 +57,10 @@
 
     <stack id="topStackBar">
         <radiogroup id="viewGroup">
-            <radio id="bandwagon-feeds-view"
-                   label="&feeds.label;"
+            <radio id="bandwagon-collections-view"
+                   label="&collections.label;"
                    insertbefore="extensions-view"
-                   oncommand="showView('bandwagon-feeds');"
+                   oncommand="showView('bandwagon-collections');"
                    persist="last-selected"/>
             <radio id="search-view"
                    label="&search.label.bandwagon;"
@@ -69,65 +71,89 @@
     </stack>
 
     <vbox id="extensionsBox">
-        <hbox id="bandwagon-feeds-panel" hidden="true" flex="1">
-            <vbox id="bandwagon-feeds-list-box" persist="width">
-                <richlistbox id="bandwagon-feeds-list"
-                             seltype="single"
-                             style="min-width: 14em; width: 16em; max-width: 36em;"
-                             flex="1"/>
-                <toolbox class="bandwagon-feeds-toolbox">
-                    <toolbar pack="start"
-                             align="center">
-                        <toolbarbutton id="bandwagon-button-subscribe"
-                                       tooltiptext="&subscribe.label;"
-                                       oncommand="Bandwagon.Controller.FeedsPane.doSubscribe();"/>
-                        <toolbarbutton id="bandwagon-button-update-all"
-                                       tooltiptext="&reload.label;"
-                                       oncommand="Bandwagon.Controller.FeedsPane.doUpdateAll();"/>
-                        <toolbarbutton id="bandwagon-button-settings"
-                                       tooltiptext="&settings.label;"
-                                       oncommand="Bandwagon.Controller.FeedsPane.doSettings();"/>
-                    </toolbar>
-                </toolbox>
-            </vbox>
-            <splitter id="bandwagon-sidebar-splitter" />
-            <notificationbox flex="1" id="bandwagon-feeds-notification">
-                <toolbox class="bandwagon-feeds-toolbox">
-                    <toolbar pack="end">
-                        <button id="bandwagon-button-viewsite" label="&viewsite.label;" oncommand="Bandwagon.Controller.FeedsPane.doViewSite();"/>
-                        <button id="bandwagon-button-update" label="&update.label;" oncommand="Bandwagon.Controller.FeedsPane.doUpdate();"/>
-                        <button id="bandwagon-button-remove" label="&remove.label;" oncommand="Bandwagon.Controller.FeedsPane.doRemove();"/>
-                    </toolbar>
-                </toolbox>
-                <vbox id="bandwagon-feed-header">
-                    <label id="bandwagon-feed-title"/>
-                    <label id="bandwagon-feed-description"/>
-                </vbox>
-                <deck id="bandwagon-feed-deck" selectedIndex="0" flex="1">
-                    <hbox flex="1">
-                        <richlistbox id="bandwagon-feeditems-list"
+        <vbox id="bandwagon-collections-panel" hidden="true" flex="1">
+            <deck id="bandwagon-extensions-deck" flex="1">
+                <hbox id="bandwagon-subscriptions-panel" flex="1">
+                    <vbox id="bandwagon-collections-list-box" persist="width">
+                        <richlistbox id="bandwagon-collections-list"
                                      seltype="single"
+                                     style="min-width: 14em; width: 16em; max-width: 36em;"
                                      flex="1"/>
-                    </hbox>
-                    <vbox flex="1" align="center" pack="center">
-                        <label value="&nofeedssubscribed.label;"/>
-                        <button label="&clicktosubscribe.label;" oncommand="Bandwagon.Controller.FeedsPane.doSubscribe();"/>
-                    </vbox>
-                    <vbox flex="1" align="center" pack="center">
-                        <label class="userfeedback" value="&feedisloading.label;"/>
-                        <image src="chrome://bandwagon/skin/images/spinner.gif"/>
-                    </vbox>
-                    <vbox flex="1" align="center" pack="center">
-                        <image src="chrome://bandwagon/skin/images/information.png"/>
-                        <label class="userfeedback" value="&feedhasnoitems.label;"/>
+                        <toolbox class="bandwagon-collections-toolbox">
+                            <toolbar pack="start"
+                                     align="center">
+                                <toolbarbutton id="bandwagon-button-subscribe"
+                                               tooltiptext="&subscribe.label;"
+                                               oncommand="Bandwagon.Controller.CollectionsPane.doSubscribe();"/>
+                                <toolbarbutton id="bandwagon-button-update-all"
+                                               tooltiptext="&reload.label;"
+                                               oncommand="Bandwagon.Controller.CollectionsPane.doUpdateAll();"/>
+                                <toolbarbutton id="bandwagon-button-settings"
+                                               tooltiptext="&settings.label;"
+                                               oncommand="Bandwagon.Controller.CollectionsPane.doSettings();"/>
+                            </toolbar>
+                        </toolbox>
                     </vbox>
-                     <vbox flex="1" align="center" pack="center">
-                        <image src="chrome://bandwagon/skin/images/error.png"/>
-                        <label class="userfeedback"  value="&feedhaserror.label;"/>
-                    </vbox>
-                </deck>
-            </notificationbox>
-        </hbox>
+                    <splitter id="bandwagon-sidebar-splitter" />
+                    <notificationbox flex="1" id="bandwagon-collections-notification">
+                        <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.doRemove();"/>
+                        </hbox>
+                        <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"/>
+                            </hbox>
+                            <vbox flex="1" align="center" pack="center">
+                                <label class="usercollectionback" value="&collectionisloading.label;"/>
+                                <image src="chrome://bandwagon/skin/images/spinner.gif"/>
+                            </vbox>
+                            <vbox flex="1" align="center" pack="center">
+                                <image src="chrome://bandwagon/skin/images/information.png"/>
+                                <label class="usercollectionback" value="&collectionhasnoitems.label;"/>
+                            </vbox>
+                             <vbox flex="1" align="center" pack="center">
+                                <image src="chrome://bandwagon/skin/images/error.png"/>
+                                <label class="usercollectionback"  value="&collectionhaserror.label;"/>
+                            </vbox>
+                        </deck>
+                    </notificationbox>
+                </hbox>
+                <vbox id="nosubs-box" class="fs-info-panel" flex="1" >
+                    <label id="nosubs-header" class="fs-info-panel-header" value="&nocollectionstitle.label;"/>
+                    <separator/>
+                    <description class="fs-info-panel-text">&nocollectionssubscribed.label;</description>
+                    <separator/>
+                    <hbox pack="center">
+                        <button label="&clicktosubscribe.label;"
+                                oncommand="Bandwagon.Controller.CollectionsPane.doSubscribe();"/>
+                    </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>
     </vbox>
 
 </overlay>
diff --git a/bandwagon/content/ui/overlays/extensionsOverlayController.js b/bandwagon/content/ui/overlays/extensionsOverlayController.js
index 3cb08b5..a1faac0 100644
--- a/bandwagon/content/ui/overlays/extensionsOverlayController.js
+++ b/bandwagon/content/ui/overlays/extensionsOverlayController.js
@@ -19,7 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s): David McNamara
- *                 Brian King
+ *                 Brian King <brian (at) briks (dot) si>
  *
  * 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
@@ -54,7 +54,7 @@ Bandwagon.Controller.ExtensionsOverlay.init = function()
     // So lets hackily hide ours in that circumstance
 
     var extView = document.getElementById("extensions-view");
-    var bfv = document.getElementById("bandwagon-feeds-view");
+    var bfv = document.getElementById("bandwagon-collections-view");
     var lsi = extView.ownerDocument.defaultView.getComputedStyle( extView, '' ).getPropertyCSSValue("list-style-image").cssText;
 
     if (lsi == "none")
@@ -82,29 +82,32 @@ 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._showFeedsPaneView();
-                    Bandwagon.Controller.FeedsPane.doShowFeedPreview(inArgs.subscribe);
+                    Bandwagon.Controller.ExtensionsOverlay._showCollectionsPaneView();
+                    Bandwagon.Controller.CollectionsPane.doShowCollectionPreview(inArgs.subscribe);
                 },
                 500);
             }
-            else if (inArgs.selectFeed)
+            else
+            */
+            if (inArgs.selectCollection)
             {
-                Bandwagon.Logger.debug("Have window argument selectFeed = " + inArgs.selectFeed);
+                Bandwagon.Logger.debug("Have window argument selectCollection = " + inArgs.selectCollection);
 
-                if (bandwagonService.feeds[inArgs.selectFeed])
+                if (bandwagonService.collections[inArgs.selectCollection])
                 {
-                    Bandwagon.Controller.FeedsPane.preferredFeed = bandwagonService.feeds[inArgs.selectFeed];
+                    Bandwagon.Controller.CollectionsPane.preferredCollection = bandwagonService.collections[inArgs.selectCollection];
                 }
 
                 setTimeout(function() 
                 {
-                    Bandwagon.Controller.ExtensionsOverlay._showFeedsPaneView();
+                    Bandwagon.Controller.ExtensionsOverlay._showCollectionsPaneView();
                 }, 
                 500);
             }
@@ -112,22 +115,48 @@ Bandwagon.Controller.ExtensionsOverlay.init = function()
     }
 }
 
-Bandwagon.Controller.ExtensionsOverlay.doPublishToFeed = function(feed)
+Bandwagon.Controller.ExtensionsOverlay.doPublishToCollection = function(collection)
 {
-    Bandwagon.Logger.debug("In Bandwagon.Controller.ExtensionsOverlay.doPublishToFeed() with feed = '" + feed.url + "'");
+    Bandwagon.Logger.debug("In Bandwagon.Controller.ExtensionsOverlay.doPublishToCollection() with collection = '" + collection.toString() + "'");
 
     var extension = Bandwagon.Controller.ExtensionsOverlay._getSelectedExtension();
 
     var params =
     {
         publishType: 1,
-        publishDestination: feed,
+        publishDestination: collection,
         publishExtension: extension
     };
     
     Bandwagon.Controller.ExtensionsOverlay._openPublishDialog(params);
 }
 
+Bandwagon.Controller.ExtensionsOverlay.doRemoveFromCollection = function(collection)
+{
+    var extension = Bandwagon.Controller.ExtensionsOverlay._getSelectedExtension();
+
+    Bandwagon.Logger.debug("In Bandwagon.Controller.ExtensionsOverlay.doRemoveFromCollection() with collection = '" + collection.toString() + "' and extension: name = '" + extension.name + "', guid = '" + extension.guid + "'");
+
+    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("publish.remove.title"),
+        Bandwagon.Controller.ExtensionsOverlay.stringBundle.getFormattedString("publish.remove.label", [extension.name, collection.name]),
+        flags,
+        Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("publish.remove.button0"),
+        Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("publish.remove.button1"),
+        null,
+        null,
+        check);
+
+    if (button == 0)
+    {
+        bandwagonService.removeAddonFromCollection(extension.guid, collection);
+    }
+}
+
 Bandwagon.Controller.ExtensionsOverlay.doShareToEmail = function(emailAddress)
 {
     Bandwagon.Logger.debug("In Bandwagon.Controller.ExtensionsOverlay.doShareToEmail() with email = '" + emailAddress + "'");
@@ -150,15 +179,15 @@ Bandwagon.Controller.ExtensionsOverlay._getSelectedExtension = function()
 
     if (document.getElementById("extensionsView").selectedItem)
     {
-        var selectedFeedItem = document.getElementById("extensionsView").selectedItem;
-        extension.guid = selectedFeedItem.getAttribute("addonID");
-        extension.name = selectedFeedItem.getAttribute("name");
+        var selectedAddon = document.getElementById("extensionsView").selectedItem;
+        extension.guid = selectedAddon.getAttribute("addonID");
+        extension.name = selectedAddon.getAttribute("name");
     }
-    else if (Bandwagon.Controller.FeedsPane && Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.selectedItem)
+    else if (Bandwagon.Controller.CollectionsPane &&  Bandwagon.Controller.CollectionsPane.elemBandwagonAddons && Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.selectedItem)
     {
-        var selectedFeedItem = Bandwagon.Controller.FeedsPane.elemBandwagonFeedItems.selectedItem;
-        extension.guid = selectedFeedItem.guid;
-        extension.name = selectedFeedItem.name;
+        var selectedAddon = Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.selectedItem;
+        extension.guid = selectedAddon.guid;
+        extension.name = selectedAddon.name;
     }
     else
     {
@@ -168,6 +197,13 @@ Bandwagon.Controller.ExtensionsOverlay._getSelectedExtension = function()
     return extension;
 }
 
+Bandwagon.Controller.ExtensionsOverlay.doNewCollection = function()
+{
+    Bandwagon.Logger.debug("In Bandwagon.Controller.ExtensionsOverlay.doNewCollection()");
+
+    Bandwagon.Controller.CollectionsPane._openLocalizedURL(Bandwagon.COLLECTIONSPANE_DO_NEW_COLLECTION_URL);
+}
+
 Bandwagon.Controller.ExtensionsOverlay.doAddNewShareEmail = function()
 {
     Bandwagon.Logger.debug("In Bandwagon.Controller.ExtensionsOverlay.doAddNewShareEmail()");
@@ -241,7 +277,7 @@ Bandwagon.Controller.ExtensionsOverlay._invalidatePublishButton = function()
     }
 
     Bandwagon.Controller.ExtensionsOverlay._publishButton.emailAddresses = Bandwagon.Controller.ExtensionsOverlay._getEmailAddresses();
-    Bandwagon.Controller.ExtensionsOverlay._publishButton.writableFeeds = Bandwagon.Controller.ExtensionsOverlay._getWritableFeeds();
+    Bandwagon.Controller.ExtensionsOverlay._publishButton.writableCollections = Bandwagon.Controller.ExtensionsOverlay._getWritableCollections();
 
     try
     {
@@ -250,21 +286,39 @@ Bandwagon.Controller.ExtensionsOverlay._invalidatePublishButton = function()
     catch (e) {}
 }
 
-Bandwagon.Controller.ExtensionsOverlay._getWritableFeeds = function()
+Bandwagon.Controller.ExtensionsOverlay._getWritableCollections = function()
 {
-    var writableFeeds = [];
+    var writableCollections = [];
+
+    var extension = Bandwagon.Controller.ExtensionsOverlay._getSelectedExtension();
 
-    for (var id in bandwagonService.feeds)
+    for (var id in bandwagonService.collections)
     {
-        if (1 || (bandwagonService.feeds[id].editable && !bandwagonService.feeds[id].preview))
+        var collection = bandwagonService.collections[id];
+
+        //if (1 || (bandwagonService.collections[id].writable && !bandwagonService.collections[id].preview))
+        
+        if (collection.writable)
         {
-            writableFeeds.push(bandwagonService.feeds[id]);
+            // Check if extension is in collection
+            collection.__containsCurrentlySelectedExtension = false;
+
+            for (var id in collection.addons)
+            {
+                if (extension.guid == collection.addons[id].guid)
+                {
+                    collection.__containsCurrentlySelectedExtension = true;
+                    break;
+                }
+            }
+            
+            writableCollections.push(collection);
         }
     }  
 
-    writableFeeds.sort();
+    writableCollections.sort();
 
-    return writableFeeds;
+    return writableCollections;
 }
 
 Bandwagon.Controller.ExtensionsOverlay._getEmailAddresses = function()
@@ -276,12 +330,12 @@ Bandwagon.Controller.ExtensionsOverlay._getEmailAddresses = function()
     return previouslySharedEmailAddresses;
 }
 
-Bandwagon.Controller.ExtensionsOverlay._showFeedsPaneView = function()
+Bandwagon.Controller.ExtensionsOverlay._showCollectionsPaneView = function()
 {
-    Bandwagon.Logger.debug("in _showFeedsPaneView()");
+    Bandwagon.Logger.debug("in _showCollectionsPaneView()");
 
-    updateLastSelected("bandwagon-feeds");
-    gView = "bandwagon-feeds";
+    updateLastSelected("bandwagon-collections");
+    gView = "bandwagon-collections";
 
     document.getElementById("installFileButton").hidden = true;
     document.getElementById("checkUpdatesAllButton").hidden = true;
@@ -301,12 +355,12 @@ Bandwagon.Controller.ExtensionsOverlay._showFeedsPaneView = function()
 
     AddonsViewBuilder.clearChildren(gExtensionsView);
 
-    document.getElementById("bandwagon-feeds-panel").hidden = false;
+    document.getElementById("bandwagon-collections-panel").hidden = false;
 
     updateGlobalCommands();
 
-    Bandwagon.Controller.FeedsPane.init();
-    Bandwagon.Controller.FeedsPane.onViewSelect();
+    Bandwagon.Controller.CollectionsPane.init();
+    Bandwagon.Controller.CollectionsPane.onViewSelect();
 }
 
 // magic
@@ -315,13 +369,13 @@ Bandwagon.Controller.ExtensionsOverlay._defaultShowView = showView;
 
 Bandwagon.Controller.ExtensionsOverlay._showView = function(aView)
 {
-    if (aView == "bandwagon-feeds")
+    if (aView == "bandwagon-collections")
     {
-        Bandwagon.Controller.ExtensionsOverlay._showFeedsPaneView();
+        Bandwagon.Controller.ExtensionsOverlay._showCollectionsPaneView();
     }
     else
     {
-        document.getElementById("bandwagon-feeds-panel").hidden = true;
+        document.getElementById("bandwagon-collections-panel").hidden = true;
         document.getElementById("extensionsView").hidden = false;
         document.getElementById("extensionsView").parentNode.hidden = false;
 
diff --git a/bandwagon/content/ui/publish.xul b/bandwagon/content/ui/publish.xul
index 54e9e83..380a4c2 100644
--- a/bandwagon/content/ui/publish.xul
+++ b/bandwagon/content/ui/publish.xul
@@ -20,7 +20,7 @@
   - the Initial Developer. All Rights Reserved.
   -
   - Contributor(s): David McNamara
-  -                 Brian King
+  -                 Brian King <brian (at) briks (dot) si>
   -
   - 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
@@ -45,6 +45,7 @@
         windowtype="Bandwagon:Publish"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&window.title;"
+        style="&publish.style;"
         buttons="accept,cancel"
         buttonlabelcancel="&cancel.label;"
         buttonlabelaccept="&publish.label;"
@@ -54,20 +55,18 @@
     <script src="chrome://bandwagon/content/ui/dialog.js"/>
     <script src="chrome://bandwagon/content/ui/publishController.js"/>
 
-    <stringbundleset>
-        <stringbundle id="bandwagon-strings" src="chrome://bandwagon/locale/publish.properties"/>
-    </stringbundleset>
+    <stringbundle id="bandwagon-strings" src="chrome://bandwagon/locale/publish.properties"/>
 
     <vbox>
-        <label id="dialog-desc"/>
+        <!--<label id="dialog-desc"/>-->
 
         <deck id="type-deck">
             <hbox id="publishing-to-box">
-                <label id="publishing-to"/>
+                <label id="publishing-to" class="dialog-header"/>
             </hbox>
 
             <hbox id="sharing-with-box">
-                <label id="sharing-with"/>
+                <description id="sharing-with" class="dialog-header" flex="1"/>
             </hbox>
  
             <groupbox id="new-email-box">
@@ -78,10 +77,14 @@
             </groupbox>
        </deck>
 
-        <label value="&enter.a.personal.note.label;"/>
+        <separator class="thin"/>
+
+        <description flex="1">&enter.a.personal.note.label;</description>
 
         <textbox id="personal-note" multiline="true"/>
 
+        <description id="sharing-with-new" flex="1"/>
+
         <hbox>
             <image id="spinner" src="chrome://bandwagon/skin/images/spinner-small.gif" collapsed="true"/>
             <label id="error" style="color: red; visibility: hidden;" value=" "/>
diff --git a/bandwagon/content/ui/publishController.js b/bandwagon/content/ui/publishController.js
index 492d5dc..1ff0d27 100644
--- a/bandwagon/content/ui/publishController.js
+++ b/bandwagon/content/ui/publishController.js
@@ -19,6 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s): David McNamara
+ *                 Brian King <brian (at) briks (dot) si>
  *
  * 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,13 +39,14 @@ Bandwagon.Controller.Publish = new function()
 {
     this.stringBundle = null;
     this.hasSubmitted = false;
+    this.hasSubmittedWithSuccess = false;
 
     this.publishType = -1; // one of the TYPE_ constants
-    this.publishDestination = null; // email address or feed obj
+    this.publishDestination = null; // email address or collection obj
     this.publishExtension = null; // the add-on / theme obj to publish
 }
 
-Bandwagon.Controller.Publish.TYPE_FEED = 1;
+Bandwagon.Controller.Publish.TYPE_COLLECTION = 1;
 Bandwagon.Controller.Publish.TYPE_EXISTING_EMAIL = 2;
 Bandwagon.Controller.Publish.TYPE_NEW_EMAIL = 3;
 
@@ -62,27 +64,33 @@ Bandwagon.Controller.Publish.init = function()
     Bandwagon.Controller.Publish.publishDestination = inArgs.publishDestination;
     Bandwagon.Controller.Publish.publishExtension = inArgs.publishExtension;
 
-    document.getElementById("dialog-desc").value = Bandwagon.Controller.Publish.stringBundle.getFormattedString("you.are.sharing.the.add.on", [Bandwagon.Controller.Publish.publishExtension.name]);
+    //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;
 
     switch (Bandwagon.Controller.Publish.publishType)
     {
-        case Bandwagon.Controller.Publish.TYPE_FEED:
-            document.getElementById("publishing-to").value = Bandwagon.Controller.Publish.stringBundle.getFormattedString("publishing.to", [(Bandwagon.Controller.Publish.publishDestination.name?Bandwagon.Controller.Publish.publishDestination.name:Bandwagon.Controller.Publish.publishDestination.url)]);
+        case Bandwagon.Controller.Publish.TYPE_COLLECTION:
+            document.getElementById("publishing-to").value = Bandwagon.Controller.Publish.stringBundle.getFormattedString("publishing.to", [Bandwagon.Controller.Publish.publishExtension.name, (Bandwagon.Controller.Publish.publishDestination.name?Bandwagon.Controller.Publish.publishDestination.name:Bandwagon.Controller.Publish.publishDestination.url)]);
             document.getElementById("new-email-box").collapsed = true;
             document.getElementById("sharing-with-box").collapsed = true;
             document.getElementById("publishing-to-box").collapsed = false;
+            document.getElementById("sharing-with-new").collapsed = true;
             break;
         case Bandwagon.Controller.Publish.TYPE_EXISTING_EMAIL:
-            document.getElementById("sharing-with").value = Bandwagon.Controller.Publish.stringBundle.getFormattedString("sharing.with", [Bandwagon.Controller.Publish.publishDestination]);
+            document.getElementById("sharing-with").textContent = Bandwagon.Controller.Publish.stringBundle.getFormattedString("sharing.with", [Bandwagon.Controller.Publish.publishDestination, Bandwagon.Controller.Publish.publishExtension.name]);
             document.getElementById("new-email-box").collapsed = true;
             document.getElementById("sharing-with-box").collapsed = false;
             document.getElementById("publishing-to-box").collapsed = true;
+            document.getElementById("sharing-with-new").collapsed = true;
+            document.getElementById("bandwagon-publish").getButton("accept").label = Bandwagon.Controller.Publish.stringBundle.getString("send.email");
             break;
         case Bandwagon.Controller.Publish.TYPE_NEW_EMAIL:
+            document.getElementById("sharing-with-new").textContent = Bandwagon.Controller.Publish.stringBundle.getFormattedString("sharing.with.new", [Bandwagon.Controller.Publish.publishExtension.name]);
+            document.getElementById("sharing-with-new").collapsed = false;
             document.getElementById("new-email-box").collapsed = false;
             document.getElementById("sharing-with-box").collapsed = true;
             document.getElementById("publishing-to-box").collapsed = true;
+            document.getElementById("bandwagon-publish").getButton("accept").label = Bandwagon.Controller.Publish.stringBundle.getString("send.email");
             break;
     }
 
@@ -93,6 +101,12 @@ Bandwagon.Controller.Publish.doAccept = function()
 {
     Bandwagon.Logger.debug("In Bandwagon.Controller.Publish.doAccept();");
 
+    if (Bandwagon.Controller.Publish.hasSubmittedWithSuccess)
+    {
+        document.getElementById("bandwagon-publish").cancelDialog();
+        return true;
+    }
+
     if (Bandwagon.Controller.Publish.publishType == Bandwagon.Controller.Publish.TYPE_NEW_EMAIL && document.getElementById("email-address").value == "")
     {
         Bandwagon.Controller.Publish._showError(Bandwagon.Controller.Publish.stringBundle.getString("please.enter.an.email.address"));
@@ -104,8 +118,8 @@ Bandwagon.Controller.Publish.doAccept = function()
 
     switch (Bandwagon.Controller.Publish.publishType)
     {
-        case Bandwagon.Controller.Publish.TYPE_FEED:
-            Bandwagon.Controller.Publish._publishToFeed();
+        case Bandwagon.Controller.Publish.TYPE_COLLECTION:
+            Bandwagon.Controller.Publish._publishToCollection();
             break;
         case Bandwagon.Controller.Publish.TYPE_EXISTING_EMAIL:
             Bandwagon.Controller.Publish._shareToExistingEmail();
@@ -123,9 +137,9 @@ Bandwagon.Controller.Publish.doCancel = function()
     return true;
 }
 
-Bandwagon.Controller.Publish._publishToFeed = function()
+Bandwagon.Controller.Publish._publishToCollection = function()
 {
-    bandwagonService.publishToFeed(
+    bandwagonService.publishToCollection(
         Bandwagon.Controller.Publish.publishExtension,
         Bandwagon.Controller.Publish.publishDestination,
         document.getElementById("personal-note").value,
@@ -164,22 +178,46 @@ Bandwagon.Controller.Publish.invalidate = function()
 
 Bandwagon.Controller.Publish.finished = function(event)
 {
-    Bandwagon.Controller.Publish.hasSubmitted = false;
-    Bandwagon.Controller.Publish.invalidate();
-
     if (event.isError())
     {
+        Bandwagon.Controller.Publish.hasSubmitted = false;
+        Bandwagon.Controller.Publish.invalidate();
+
         Bandwagon.Controller.Publish._showError(event.getError());
+
         return;
     }
 
+    Bandwagon.Controller.Publish.hasSubmittedWithSuccess = true;
+
     if (Bandwagon.Controller.Publish.publishType == Bandwagon.Controller.Publish.TYPE_NEW_EMAIL
         && document.getElementById("remember-email").checked)
     {
-        bandwagonService.addPreviouslySharedEmailAddress(document.getElementById("email-address").value);
+        bandwagonService.addPreviouslySharedEmailAddresses(document.getElementById("email-address").value);
     }
 
-    document.getElementById("bandwagon-publish").cancelDialog();
+    if (Bandwagon.Controller.Publish.publishType == Bandwagon.Controller.Publish.TYPE_COLLECTION)
+    {
+        bandwagonService.forceCheckForUpdates(Bandwagon.Controller.Publish.publishDestination);
+
+        document.getElementById("error").value = Bandwagon.Controller.Publish.stringBundle.getString("the.addon.has.been.published");
+    }
+    else
+    {
+        document.getElementById("error").value = Bandwagon.Controller.Publish.stringBundle.getString("the.email.has.been.sent");
+    }
+
+    document.getElementById("error").style.visibility = "visible";
+    document.getElementById("error").style.color = 'green';
+    document.getElementById("spinner").collapsed = true;
+    document.getElementById("email-address").disabled = true;
+    document.getElementById("personal-note").disabled = true;
+    document.getElementById("bandwagon-publish").getButton("cancel").hidden = true;
+    document.getElementById("bandwagon-publish").getButton("accept").disabled = false;
+    document.getElementById("bandwagon-publish").getButton("accept").label = Bandwagon.Controller.Publish.stringBundle.getFormattedString("closing.in", ["2"]);
+
+    setTimeout(function() { document.getElementById("bandwagon-publish").getButton("accept").label = Bandwagon.Controller.Publish.stringBundle.getFormattedString("closing.in", ["1"]); }, 2000);
+    setTimeout(function() { document.getElementById("bandwagon-publish").cancelDialog(); }, 3000);
 }
 
 Bandwagon.Controller.Publish._showError = function(message)
diff --git a/bandwagon/content/ui/settings.xul b/bandwagon/content/ui/settings.xul
index 90126ed..3985d6b 100644
--- a/bandwagon/content/ui/settings.xul
+++ b/bandwagon/content/ui/settings.xul
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- ***** BEGIN LICENSE BLOCK *****
   -   Version: MPL 1.1/GPL 2.0/LGPL 2.1
   -
@@ -20,7 +21,7 @@
   - the Initial Developer. All Rights Reserved.
   -
   - Contributor(s): David McNamara
-  -                 Brian King
+  -                 Brian King <brian (at) briks (dot) si>
   -
   - 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,41 +38,115 @@
   - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://bandwagon/skin/global.css" 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/content/ui/bindings/bandwagon.css" type="text/css"?>
 
 <!DOCTYPE prefwindow SYSTEM "chrome://bandwagon/locale/settings.dtd">
 
 <prefwindow id="bandwagon-settings"
-            windowtype="Bandwagon:Settings"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             title="&window.title;"
             ondialogaccept="return Bandwagon.Controller.Settings.doAccept();"
-            ondialogcancel="return Bandwagon.Controller.Settings.doCancel();">
-
-    <script src="chrome://bandwagon/content/ui/dialog.js"/>
-    <script src="chrome://bandwagon/content/ui/settingsController.js"/>
-
-    <stringbundleset>
-        <stringbundle id="bandwagon-strings" src="chrome://bandwagon/locale/settings.properties"/>
-    </stringbundleset>
+            ondialogcancel="return Bandwagon.Controller.Settings.doCancel();"
+            persist="lastSelected screenX screenY">
 
-    <prefpane id="pane1"
+    <prefpane id="paneManage"
+              label="&manage.label;"
               flex="1">
         <preferences>
             <preference id="extensions.bandwagon.updateall.enabled"
                         name="extensions.bandwagon.updateall.enabled"
                         type="bool"/>
-            <preference id="extensions.bandwagon.feeditemsperpage.enabled"
-                        name="extensions.bandwagon.feeditemsperpage.enabled"
+            <preference id="extensions.bandwagon.addonsperpage.enabled"
+                        name="extensions.bandwagon.addonsperpage.enabled"
                         type="bool"/>
-            <preference id="extensions.bandwagon.feeditemsperpage"
-                        name="extensions.bandwagon.feeditemsperpage"
-                        type="int"/>
             <preference id="extensions.bandwagon.notifyall.enabled"
                         name="extensions.bandwagon.notifyall.enabled"
                         type="bool"/>
+        </preferences>
+
+        <hbox>
+            <vbox>
+                <label id="collections-list-header" crop="end" value="&subscriptions.header;"/>
+                <richlistbox id="collections-list" flex="1"/>
+            </vbox>
+            <vbox flex="1">
+                <!-- <label id="collection-name" crop="end" value=""/> -->
+  
+                <!-- Update Interval Settings -->
+                <groupbox>
+                    <caption label="&frequency.label;"/>
+                    <radiogroup id="updates-group">
+                        <radio id="updates-default" label="&default.label;"/>
+                        <hbox align="center">
+                            <radio id="updates-custom" label="&custom.label;"/>
+                            <label id="checkbox-updateinterval-percollection" value="&updatesingle.label;"/>
+                            <textbox id="textbox-updateinterval-quantity-percollection"
+                                     type="number"
+                                     min="1"
+                                     size="3"
+                                     maxlength="3"
+                                     value=""/>
+                            <menulist id="menulist-updateinterval-units-percollection"
+                                      class=""
+                                      crop="none">
+                                <menupopup>
+                                    <menuitem label="&minutes.label;" value="1"/>
+                                    <menuitem label="&hours.label;" value="2"/>
+                                    <menuitem label="&days.label;" value="3"/>
+                                </menupopup>
+                            </menulist>
+                        </hbox>
+                    </radiogroup>
+                </groupbox>
+
+                <!-- Show Notification Settings -->
+                <groupbox>
+                    <caption label="&notifications.label;"/>
+                    <radiogroup id="notifications-group">
+                        <radio id="notifications-default" label="&default.label;"/>
+                        <hbox>
+                            <radio id="notifications-custom" label="&custom.label;"/>
+                            <radiogroup id="checkbox-shownotifications-percollection"
+                                        orient="horizontal">
+                                <radio id="shownotifications-percollection-on" label="&on.label;"/>
+                                <radio id="shownotifications-percollection-off" label="&off.label;"/>
+                            </radiogroup>
+                        </hbox>
+                    </radiogroup>
+                </groupbox>
+
+                <!-- Add-ons Per Page Settings -->
+                <groupbox>
+                    <caption label="&perpage.label;"/>
+                    <radiogroup id="perpage-group">
+                        <radio id="perpage-default" label="&default.label;"/>
+                        <hbox align="center">
+                            <radio id="perpage-custom" label="&custom.label;"/>
+                            <label id="label-addonsshow-percollection"> &addonsleadin.label;</label>
+                            <textbox id="textbox-addonsperpage-percollection"
+                                     type="number"
+                                     size="3"/>
+                            <label id="label-addonsperpage-percollection"> &addonsperpage.label;</label>
+                        </hbox>
+                    </radiogroup>
+                </groupbox>
+                <hbox align="center" pack="end">
+                    <button id="remove-button"
+                            label="&remove.label;"
+                            oncommand="Bandwagon.Controller.Settings.doRemove();"/>
+                </hbox>
+            </vbox>
+        </hbox>
+
+    </prefpane>
+
+    <prefpane id="paneGeneral"
+              label="&general.label;">
+        <preferences>
+            <preference id="extensions.bandwagon.addonsperpage"
+                        name="extensions.bandwagon.addonsperpage"
+                        type="int"/>
             <preference id="extensions.bandwagon.updateall.interval"
                         name="extensions.bandwagon.updateall.interval"
                         type="int"/>
@@ -79,73 +154,130 @@
                         name="extensions.bandwagon.updateall.units"
                         type="int"/>
         </preferences>
+        <groupbox>
+            <caption label="&subscriptions.label;"/>
+            <hbox align="center">
+                <label id="updateinterval-all" value="&updateall.label;"/>
+                <textbox id="textbox-updateinterval-quantity"
+                         type="number"
+                         min="1"
+                         size="3"
+                         maxlength="3"
+                         value=""
+                         onkeypress=""
+                         onchange=""
+                         preference="extensions.bandwagon.updateall.interval"/>
+                <menulist id="menulist-updateinterval-units" class="" crop="none" preference="extensions.bandwagon.updateallglobal.units">
+                    <menupopup>
+                        <menuitem label="&minutes.label;" value="1"/>
+                        <menuitem label="&hours.label;" value="2"/>
+                        <menuitem label="&days.label;" value="3"/>
+                    </menupopup>
+                </menulist>
+            </hbox>
+            <hbox align="center">
+                <label id="notify-all" value="&notifyglobal.label;"/>
+                <radiogroup id="notify-all-group" orient="horizontal">
+                    <radio id="notify-all-on" label="&on.label;"/>
+                    <radio id="notify-all-off" label="&off.label;"/>
+                </radiogroup>
+            </hbox>
+            <hbox align="center">
+                <label id="label-addonsshow"> &addonsleadin.label;</label>
+                <textbox id="textbox-addonsperpage-global"
+                         type="number"
+                         size="3"
+                         preference="extensions.bandwagon.addonsperpage"/>
+                <label id="label-addonsperpage"> &addonsperpage.label;</label>
+            </hbox>
+        </groupbox>
 
-        <hbox flex="1">
-          <vbox>
-              <richlistbox id="feeds-list" flex="1"/>
-              <toolbox class="bandwagon-feeds-toolbox">
-                  <toolbar pack="start"
-                           align="center">
-                      <toolbarbutton id="add-feed-button"
-                                     tooltiptext="&add.label;"
-                                     oncommand="Bandwagon.Controller.Settings.doAdd();"/>
-                      <toolbarbutton id="remove-feed-button"
-                                     tooltiptext="&remove.label;"
-                                     oncommand="Bandwagon.Controller.Settings.doRemove();"/>
-                  </toolbar>
-              </toolbox>
-          </vbox>
-          <vbox flex="1">
-              <label id="feed-name" crop="end" value=""/>
-
-              <!-- Update Interval Settings -->
-
-              <hbox align="center">
-                  <checkbox id="checkbox-updateinterval-perfeed" label="&updatesingle.label;"/>
-                  <textbox id="textbox-updateinterval-quantity"
-                           type="number"
-                           min="1"
-                           size="3"
-                           maxlength="3"
-                           value=""
-                           onkeypress=""
-                           onchange=""
-                           preference="extensions.bandwagon.updateall.interval"
-                           />
-                  <menulist id="menulist-updateinterval-units" class="" crop="none" preference="extensions.bandwagon.updateall.units">
-                      <menupopup>
-                          <menuitem label="&minutes.label;" value="1"/>
-                          <menuitem label="&hours.label;" value="2"/>
-                          <menuitem label="&days.label;" value="3"/>
-                      </menupopup>
-                  </menulist>
-              </hbox>
-              <checkbox id="checkbox-updateinterval-global" class="all-check" label="&applyall.label;"/>
-              <separator class="groove"/>
-
-              <!-- Show Notification Settings -->
-
-              <checkbox id="checkbox-shownotifications-perfeed" label="&notify.label;"/>
-              <checkbox id="checkbox-shownotifications-global" class="all-check" label="&applyall.label;"/>
-              <separator class="groove"/>
-
-              <!-- Add-ons Per Page Settings -->
-
-              <hbox align="center">
-                  <textbox id="textbox-feeditemsperpage-global"
-                           type="number"
-                           size="3"
-                           preference="extensions.bandwagon.feeditemsperpage"/>
-                  <label id="label-feeditemsperpage"> &feeditemsperpage.label;</label>
-              </hbox>
-
-              <!-- Auto-publish Settings -->
+        <groupbox>
+            <caption label="&data.label;"/>
+            <hbox align="center" pack="start">
+                <label id="clear-emails-text" value="" />
+                <button id="clear-emails-button"
+                        label="&clearemails.label;"
+                        oncommand="Bandwagon.Controller.Settings.doClearEmails();"/>
+            </hbox>
+            <hbox align="center" pack="start">
+                <label id="login-status-text" value="" />
+                <button id="login-button"
+                        label="&login.label;"
+                        oncommand="Bandwagon.Controller.Settings.doLogin();"/>
+                <button id="logout-button"
+                        label="&logout.label;"
+                        oncommand="Bandwagon.Controller.Settings.doLogout();"
+                        collapsed="true"/>
+            </hbox>
+        </groupbox>
+    </prefpane>
 
-              <checkbox id="checkbox-autopublish-perfeed" label="&autopublish.label;"/>
+    <prefpane id="paneAuto"
+              label="&pub.label;">
+                <!-- Auto-publish Settings -->
+                <!--
+                <checkbox id="checkbox-autopublish-percollection" label="&autopublish.label;"/>
+                -->
+        <groupbox>
+            <caption label="&auto.label;"/>
+            <description>&autoleadin.label;</description>
+            <separator class="thin"/>
+            <grid>
+              <columns>
+                <column/>
+                <column/>
+              </columns>
+              <rows>
+                <row align="center">
+                  <label value="&name.label;"/>
+                  <textbox id="auto-name"/>
+                </row>
+                <row align="center">
+                  <spacer/>
+                  <checkbox id="auto-list" label="&list.label;"/>
+                </row>
+              </rows>
+            </grid>
+            <separator class="thin"/>
+            <grid>
+              <columns>
+                <column/>
+                <column/>
+                <column/>
+              </columns>
+              <rows>
+                <row align="center">
+                  <label value="&types.label;"/>
+                  <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;"/>
+                  <checkbox id="auto-type-langpacks" label="&type.langpacks.label;"/>
+                </row>
+              </rows>
+            </grid>
+        </groupbox>
+        <hbox class="bottomBox" pack="center">
+            <groupbox id="auto-groupbox" orient="horizontal">
+                <button id="auto-create-button"
+                        label="&createauto.label;"
+                        oncommand="Bandwagon.Controller.Settings.doAutoCreate();"/>
+                <button id="auto-delete-button"
+                        label="&deleteauto.label;"
+                        oncommand="Bandwagon.Controller.Settings.doAutoDelete();"
+                        collapsed="true"/>
+                <image id="auto-spinner" src="chrome://bandwagon/skin/images/spinner-small.gif" collapsed="true"/>
+            </groupbox>
+        </hbox>
+        <label id="auto-error" style="color: red;" value=" " collapsed="true"/>
+    </prefpane>
 
-          </vbox>
-      </hbox>
+    <stringbundle id="bandwagon-strings" src="chrome://bandwagon/locale/settings.properties"/>
 
-    </prefpane>
+    <script type="application/x-javascript" src="chrome://bandwagon/content/ui/dialog.js"/>
+    <script type="application/x-javascript" src="chrome://bandwagon/content/ui/settingsController.js"/>
 
 </prefwindow>
diff --git a/bandwagon/content/ui/settingsController.js b/bandwagon/content/ui/settingsController.js
index 34ccb8f..d521d15 100644
--- a/bandwagon/content/ui/settingsController.js
+++ b/bandwagon/content/ui/settingsController.js
@@ -19,7 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s): David McNamara
- *                 Brian King
+ *                 Brian King <brian (at) briks (dot) si>
  *
  * 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,49 +37,56 @@
 
 Bandwagon.Controller.Settings = new function()
 {
-    this.feeds = {};
+    this.collections = {};
 
-    this.elemBandwagonFeeds = null;
-    this.elemFeedName = null;
+    this.elemBandwagonCollections = null;
+    this.elemCollectionName = null;
 
     this.stringBundle = null;
 }
 
 Bandwagon.Controller.Settings.init = function()
 {
-    //alert("Initializing Bandwagon.Controller.Settings");
     Bandwagon.Logger.debug("Initializing Bandwagon.Controller.Settings");
 
     Bandwagon.Controller.Settings.stringBundle = document.getElementById("bandwagon-strings");
 
-    Bandwagon.Controller.Settings.elemBandwagonFeeds = document.getElementById("feeds-list");
-    Bandwagon.Controller.Settings.elemBandwagonFeeds.addEventListener("select", Bandwagon.Controller.Settings.doShowFeed, true);
+    Bandwagon.Controller.Settings.elemBandwagonCollections = document.getElementById("collections-list");
+    Bandwagon.Controller.Settings.elemBandwagonCollections.addEventListener("select", Bandwagon.Controller.Settings.doShowCollection, true);
 
-    Bandwagon.Controller.Settings.elemFeedName = document.getElementById("feed-name");
+    Bandwagon.Controller.Settings.elemCollectionName = document.getElementById("collection-name");
 
     if (document.getElementById("extensions.bandwagon.updateall.enabled").value)
     {
-        document.getElementById("checkbox-updateinterval-global").checked = true;
-        document.getElementById("checkbox-updateinterval-perfeed").checked = true;
+        document.getElementById("updates-group").selectedIndex = 0;
     }
+    else
+        document.getElementById("updates-group").selectedIndex = 1;
 
-    document.getElementById("checkbox-updateinterval-global").addEventListener("command", Bandwagon.Controller.Settings.doUpdateIntervalScopeChange, true);
-    document.getElementById("textbox-updateinterval-quantity").addEventListener("input", Bandwagon.Controller.Settings.doSaveFeed, true);
-    document.getElementById("textbox-updateinterval-quantity").addEventListener("command", Bandwagon.Controller.Settings.doSaveFeed, false);
-    document.getElementById("menulist-updateinterval-units").addEventListener("command", Bandwagon.Controller.Settings.doSaveFeed, true);
+    document.getElementById("updates-group").addEventListener("command", Bandwagon.Controller.Settings.doUpdateIntervalScopeChange, true);
+    document.getElementById("textbox-updateinterval-quantity").addEventListener("input", Bandwagon.Controller.Settings.doSaveCollection, true);
+    document.getElementById("textbox-updateinterval-quantity").addEventListener("command", Bandwagon.Controller.Settings.doSaveCollection, false);
+    document.getElementById("textbox-updateinterval-quantity-percollection").addEventListener("input", Bandwagon.Controller.Settings.doSaveCollection, true);
+    document.getElementById("textbox-updateinterval-quantity-percollection").addEventListener("command", Bandwagon.Controller.Settings.doSaveCollection, false);
+    document.getElementById("menulist-updateinterval-units-percollection").addEventListener("command", Bandwagon.Controller.Settings.doSaveCollection, true);
 
     if (document.getElementById("extensions.bandwagon.notifyall.enabled").value)
     {
-        document.getElementById("checkbox-shownotifications-global").checked = true;
-        document.getElementById("checkbox-shownotifications-perfeed").checked = true;
+        document.getElementById("notifications-group").selectedIndex = 0;
     }
+    else
+        document.getElementById("notifications-group").selectedIndex = 1;
+
+    document.getElementById("notifications-group").addEventListener("command", Bandwagon.Controller.Settings.doShowNotificationsScopeChange, true);
+    document.getElementById("notifications-group").addEventListener("command", Bandwagon.Controller.Settings.doSaveCollection, true);
 
-    document.getElementById("checkbox-shownotifications-global").addEventListener("command", Bandwagon.Controller.Settings.doShowNotificationsScopeChange, true);
-    document.getElementById("checkbox-shownotifications-perfeed").addEventListener("command", Bandwagon.Controller.Settings.doSaveFeed, true);
+    //document.getElementById("checkbox-autopublish-percollection").addEventListener("command", Bandwagon.Controller.Settings.doSaveCollection, true);
 
-    document.getElementById("checkbox-autopublish-perfeed").addEventListener("command", Bandwagon.Controller.Settings.doSaveFeed, true);
+    bandwagonService.registerCollectionListChangeObserver(Bandwagon.Controller.Settings.collectionListChangeObserver);
 
-    bandwagonService.registerFeedListChangeObserver(Bandwagon.Controller.Settings.feedListChangeObserver);
+    Bandwagon.Controller.Settings.EmailsCheck();
+    Bandwagon.Controller.Settings.LoginCheck();
+    Bandwagon.Controller.Settings.AutoCheck();
 
     setTimeout(function() 
     {
@@ -90,33 +97,33 @@ Bandwagon.Controller.Settings.init = function()
 
 Bandwagon.Controller.Settings._delayedInit = function()
 {
-    Bandwagon.Controller.Settings._repopulateFeedsList();
+    Bandwagon.Controller.Settings._repopulateCollectionsList();
     Bandwagon.Controller.Settings.invalidate();
 }
 
 Bandwagon.Controller.Settings.uninit = function()
 {
-    bandwagonService.unregisterFeedListChangeObserver(Bandwagon.Controller.Settings.feedListChangeObserver);
+    bandwagonService.unregisterCollectionListChangeObserver(Bandwagon.Controller.Settings.collectionListChangeObserver);
 
-    // now is a good time to save feeds to storage
+    // now is a good time to save collections to storage
     if (Bandwagon.COMMIT_NOW)
         bandwagonService.commitAll();
 }
 
-Bandwagon.Controller.Settings.feedListChangeObserver = function()
+Bandwagon.Controller.Settings.collectionsListChangeObserver = function()
 {
-    Bandwagon.Controller.Settings._repopulateFeedsList();
+    Bandwagon.Controller.Settings._repopulateCollectionsList();
 
-    var elemBandwagonFeed = Bandwagon.Controller.Settings.elemBandwagonFeeds.getElementsByTagName("bandwagonFeed")[0];
+    var elemBandwagonCollection = Bandwagon.Controller.Settings.elemBandwagonCollections.getElementsByTagName("bandwagonCollection")[0];
 
-    if (elemBandwagonFeed)
+    if (elemBandwagonCollection)
     {
-        Bandwagon.Controller.Settings.elemBandwagonFeeds.selectItem(elemBandwagonFeed);
-        Bandwagon.Controller.Settings.elemBandwagonFeeds.focus();
+        Bandwagon.Controller.Settings.elemBandwagonCollections.selectItem(elemBandwagonCollection);
+        Bandwagon.Controller.Settings.elemBandwagonCollections.focus();
     }
     else
     {
-        Bandwagon.Controller.Settings.doShowFeed();
+        Bandwagon.Controller.Settings.doShowCollection();
     }
 
     Bandwagon.Controller.Settings.invalidate();
@@ -124,92 +131,95 @@ Bandwagon.Controller.Settings.feedListChangeObserver = function()
 
 Bandwagon.Controller.Settings.invalidate = function()
 {
-    var feedCount = Bandwagon.Controller.Settings.elemBandwagonFeeds.getElementsByTagName("bandwagonFeed").length;
-    var feedSelection = Bandwagon.Controller.Settings.elemBandwagonFeeds.selectedItem;
-
-    var disabled = (!feedSelection || feedCount == 0);
-
-    document.getElementById("remove-feed-button").disabled = disabled;
-    document.getElementById("checkbox-updateinterval-perfeed").disabled = disabled;
-    document.getElementById("textbox-updateinterval-quantity").disabled = disabled;
-    document.getElementById("menulist-updateinterval-units").disabled = disabled;
-    document.getElementById("checkbox-updateinterval-global").disabled = disabled;
-    document.getElementById("checkbox-shownotifications-perfeed").disabled = disabled;
-    document.getElementById("checkbox-shownotifications-global").disabled = disabled;
-    document.getElementById("textbox-feeditemsperpage-global").disabled = disabled;
-    document.getElementById("checkbox-autopublish-perfeed").disabled = disabled;
-    document.getElementById("label-feeditemsperpage").disabled = disabled;
+    var collectionCount = Bandwagon.Controller.Settings.elemBandwagonCollections.getElementsByTagName("bandwagonCollection").length;
+    var collectionSelection = Bandwagon.Controller.Settings.elemBandwagonCollections.selectedItem;
+
+    var disabled = (!collectionSelection || collectionCount == 0);
+
+    // 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;
+    document.getElementById("notifications-group").disabled = disabled;
+    document.getElementById("label-addonsshow-percollection").disabled = disabled;
+    document.getElementById("label-addonsperpage-percollection").disabled = disabled;
+    document.getElementById("textbox-addonsperpage-percollection").disabled = disabled;
+    //document.getElementById("checkbox-autopublish-percollection").disabled = disabled;
 }
 
-Bandwagon.Controller.Settings.doShowFeed = function()
+Bandwagon.Controller.Settings.doShowCollection = function()
 {
-    var feed = null;
-    var selectedItem = Bandwagon.Controller.Settings.elemBandwagonFeeds.selectedItem;
+    var collection = null;
+    var selectedItem = Bandwagon.Controller.Settings.elemBandwagonCollections.selectedItem;
 
-    if (selectedItem && Bandwagon.Controller.Settings.elemBandwagonFeeds.selectedItem.feed)
-        feed = Bandwagon.Controller.Settings.feeds[Bandwagon.Controller.Settings.elemBandwagonFeeds.selectedItem.feed.url];
+    if (selectedItem && Bandwagon.Controller.Settings.elemBandwagonCollections.selectedItem.collection)
+        collection = Bandwagon.Controller.Settings.collections[Bandwagon.Controller.Settings.elemBandwagonCollections.selectedItem.collection.resourceURL];
 
-    Bandwagon.Logger.debug("showing feed: " + (feed?feed.url:"<none>"));
+    Bandwagon.Logger.debug("showing collection: " + (collection?collection.resourceURL:"<none>"));
 
-    if (!feed)
+    if (!collection)
     {
-        Bandwagon.Controller.Settings.elemFeedName.value = "";
+        Bandwagon.Controller.Settings.elemCollectionName.value = "";
         Bandwagon.Controller.Settings.invalidate();
         return;
     }
 
-    Bandwagon.Controller.Settings.elemFeedName.value = (feed.name&&feed.name!=""?feed.name:feed.url);
+    if ( Bandwagon.Controller.Settings.elemCollectionName)
+    {
+        Bandwagon.Controller.Settings.elemCollectionName.value = (collection.name&&collection.name!=""?collection.name:collection.resourceURL);
+    }
 
-    if (document.getElementById("checkbox-updateinterval-global").checked)
+    if (document.getElementById("updates-group").selectedIndex == 0) // Hrm, this is not right, is it?
     {
-        // updateinterval: if "apply to all feeds" is checked - set updateinterval quantity and interval to global
+        // updateinterval: if "default" is selected - set updateinterval quantity and interval in default
 
         document.getElementById("textbox-updateinterval-quantity").valueNumber = parseInt(document.getElementById("extensions.bandwagon.updateall.interval").value);
         document.getElementById("menulist-updateinterval-units").selectedIndex = document.getElementById("extensions.bandwagon.updateall.units").value - 1;
     }
     else
     {
-        // updateinterval: if "apply to all feeds" is unchecked - set updateinterval quantity and interval to this feed
+        // updateinterval: if "Custom: " is selected - set updateinterval quantity and interval to this collection
 
-        var interval = Bandwagon.Util.intervalMillisecondsToUnits(feed.updateInterval*1000);
+        var interval = Bandwagon.Util.intervalMillisecondsToUnits(collection.updateInterval*1000);
+        document.getElementById("textbox-updateinterval-quantity-percollection").valueNumber = interval.interval;
+        document.getElementById("menulist-updateinterval-units-percollection").selectedIndex = interval.units-1;
 
-        document.getElementById("textbox-updateinterval-quantity").valueNumber = interval.interval;
-        document.getElementById("menulist-updateinterval-units").selectedIndex = interval.units-1;
-
-        document.getElementById("checkbox-updateinterval-perfeed").checked = true;
+        document.getElementById("updates-group").selectedIndex = 1;
     }
 
-    if (document.getElementById("checkbox-shownotifications-global").checked)
+    // Turning off for now, not sure how to handle notifications when a collection is loaded
+    if (true)
     {
-        // shownotifications: if "apply to all feeds" is checked - set shownotifications to global
-        document.getElementById("checkbox-shownotifications-perfeed").checked = document.getElementById("extensions.bandwagon.notifyall.enabled").value;
+        // shownotifications: if "default" is selected - set shownotifications to global
+        
     }
     else
     {
-        // shownotifications: if "apply to all feeds" not checked - set shownotifications to this feed
-        document.getElementById("checkbox-shownotifications-perfeed").checked = feed.showNotifications;
+        // shownotifications: if "Custom" not selected - set shownotifications to this collection
+        
     }
 
     // autopublish
-    document.getElementById("checkbox-autopublish-perfeed").checked = feed.autoPublish;
+    //document.getElementById("checkbox-autopublish-percollection").checked = collection.autoPublish;
 
     Bandwagon.Controller.Settings.invalidate();
 }
 
-Bandwagon.Controller.Settings.doSaveFeed = function()
+Bandwagon.Controller.Settings.doSaveCollection = function()
 {
-    Bandwagon.Logger.debug("in doSaveFeed()");
+    Bandwagon.Logger.debug("in doSaveCollection()");
 
-    // save settings to local copy of the feed objects
+    // save settings to local copy of the collection objects
 
-    var feed = Bandwagon.Controller.Settings.feeds[Bandwagon.Controller.Settings.elemBandwagonFeeds.selectedItem.feed.url];
+    var collection = Bandwagon.Controller.Settings.collections[Bandwagon.Controller.Settings.elemBandwagonCollections.selectedItem.collection.resourceURL];
 
-    if (!feed)
+    if (!collection)
         return;
 
-    feed.updateInterval = Bandwagon.Util.intervalUnitsToMilliseconds(document.getElementById("textbox-updateinterval-quantity").valueNumber, document.getElementById("menulist-updateinterval-units").selectedIndex+1) / 1000;
-    feed.showNotifications = document.getElementById("checkbox-shownotifications-perfeed").checked;
-    feed.autoPublish = document.getElementById("checkbox-autopublish-perfeed").checked;
+    collection.updateInterval = Bandwagon.Util.intervalUnitsToMilliseconds(document.getElementById("textbox-updateinterval-quantity").valueNumber, document.getElementById("menulist-updateinterval-units").selectedIndex+1) / 1000;
+    collection.showNotifications = (document.getElementById("notifications-group").selectedIndex == 1);
+    //collection.autoPublish = document.getElementById("checkbox-autopublish-percollection").checked;
 
     if (document.getElementById("bandwagon-settings").instantApply)
     {
@@ -217,63 +227,211 @@ Bandwagon.Controller.Settings.doSaveFeed = function()
     }
 }
 
-Bandwagon.Controller.Settings._repopulateFeedsList = function()
+Bandwagon.Controller.Settings._repopulateCollectionsList = function()
 {
     // first clear the list
 
-    while (Bandwagon.Controller.Settings.elemBandwagonFeeds.hasChildNodes())
+    while (Bandwagon.Controller.Settings.elemBandwagonCollections.hasChildNodes())
     {
-        Bandwagon.Controller.Settings.elemBandwagonFeeds.removeChild(Bandwagon.Controller.Settings.elemBandwagonFeeds.firstChild);
+        Bandwagon.Controller.Settings.elemBandwagonCollections.removeChild(Bandwagon.Controller.Settings.elemBandwagonCollections.firstChild);
     }
 
-    // repopulate with feeds
+    // repopulate with collections
 
-    for (var id in bandwagonService.feeds)
+    for (var id in bandwagonService.collections)
     {
-        var feed = bandwagonService.feeds[id];
+        var collection = bandwagonService.collections[id];
 
-        if (feed == null)
+        if (collection == null)
             return;
 
         const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-        var elemBandwagonFeed = document.createElementNS(XULNS, "bandwagonFeed");
-        elemBandwagonFeed.setAttribute("view", "settings");
+        var elemBandwagonCollection = document.createElementNS(XULNS, "bandwagonCollection");
+        elemBandwagonCollection.setAttribute("view", "settings");
 
-        elemBandwagonFeed.feed = feed;
-        elemBandwagonFeed.controller = Bandwagon.Controller.Settings;
+        elemBandwagonCollection.collection = collection;
+        elemBandwagonCollection.controller = Bandwagon.Controller.Settings;
 
-        Bandwagon.Controller.Settings.elemBandwagonFeeds.appendChild(elemBandwagonFeed);
+        Bandwagon.Controller.Settings.elemBandwagonCollections.appendChild(elemBandwagonCollection);
     }
 
-    // create the local copy of the feeds hash with the properties we need
+    // create the local copy of the collections hash with the properties we need
 
-    Bandwagon.Controller.Settings.feeds = {};
+    Bandwagon.Controller.Settings.collections = {};
 
-    for (var id in bandwagonService.feeds)
+    for (var id in bandwagonService.collections)
     {
-        var feed = bandwagonService.feeds[id];
+        var collection = bandwagonService.collections[id];
 
-        Bandwagon.Controller.Settings.feeds[id] =
+        Bandwagon.Controller.Settings.collections[id] =
         {
-            name: feed.name,
-            url: feed.url,
-            updateInterval: feed.updateInterval,
-            showNotifications: feed.showNotifications,
-            feedItemsPerPage: feed.feedItemsPerPage,
-            autoPublish: feed.autoPublish
+            name: collection.name,
+            url: collection.resourceURL,
+            updateInterval: collection.updateInterval,
+            showNotifications: collection.showNotifications,
+            addonsPerPage: collection.addonsPerPage,
+            autoPublish: collection.autoPublish
         };
     }
 }
 
 Bandwagon.Controller.Settings.bindingsReady = function()
 {
-    var elemBandwagonFeed = Bandwagon.Controller.Settings.elemBandwagonFeeds.getElementsByTagName("bandwagonFeed")[0];
+    var elemBandwagonCollection = Bandwagon.Controller.Settings.elemBandwagonCollections.getElementsByTagName("bandwagonCollection")[0];
+
+    if (elemBandwagonCollection)
+    {
+        Bandwagon.Controller.Settings.elemBandwagonCollections.selectItem(elemBandwagonCollection);
+        Bandwagon.Controller.Settings.elemBandwagonCollections.focus();
+    }
+}
+
+/* Startup check */
+Bandwagon.Controller.Settings.LoginCheck = function()
+{
+    var isLoggedIn = false; // XX TODO
+    var loginEmail = "me@example.com"; // XX TODO
+    var textNode = document.getElementById("login-status-text");
+    if (isLoggedIn)
+    {
+        document.getElementById("login-button").collapsed = true;
+        document.getElementById("logout-button").removeAttribute("collapsed");
+        textNode.value = Bandwagon.Controller.Settings.stringBundle.getFormattedString("login.status", [loginEmail]);
+    }
+    else
+    {
+        textNode.value = Bandwagon.Controller.Settings.stringBundle.getString("logout.status");;
+    }
+}
+
+Bandwagon.Controller.Settings.doLogin = function()
+{
+    // XX TODO
+}
+
+Bandwagon.Controller.Settings.doLogout = function()
+{
+    // XX TODO
+}
+
+/* Startup check */
+Bandwagon.Controller.Settings.AutoCheck = function()
+{
+    var hasAuto = false; // XX TODO
+    if (hasAuto)
+    {
+        document.getElementById("auto-create-button").collapsed = true;
+        document.getElementById("auto-delete-button").removeAttribute("collapsed");
+    }
+    else
+    {
+    }
+}
+
+Bandwagon.Controller.Settings.doAutoCreate = function()
+{
+    // check form
+    document.getElementById("auto-error").value = "";
+    document.getElementById("auto-error").collapsed = true;
+
+    var collectionName =  document.getElementById("auto-name").value;
 
-    if (elemBandwagonFeed)
+    if (!collectionName || collectionName == "")
     {
-        Bandwagon.Controller.Settings.elemBandwagonFeeds.selectItem(elemBandwagonFeed);
-        Bandwagon.Controller.Settings.elemBandwagonFeeds.focus();
+        document.getElementById("auto-error").value = Bandwagon.Controller.Settings.stringBundle.getFormattedString("auto.invalid.name", [collectionName]);
+        document.getElementById("auto-error").collapsed = false;
+        return;
+    }
+
+   var autoPublishExtensions = document.getElementById("auto-type-extensions").checked;
+   var autoPublishThemes = document.getElementById("auto-type-themes").checked;
+   var autoPublishDicts = document.getElementById("auto-type-dicts").checked;
+   var autoPublishLangPacks = document.getElementById("auto-type-langpacks").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;
+   }
+
+    // disable ui settings, show throbber
+
+    var toggleUIEnabledState = function(on)
+    {
+        document.getElementById("auto-create-button").disabled = on;
+        document.getElementById("auto-name").disabled = on;
+        document.getElementById("auto-list").disabled = on;
+        document.getElementById("auto-type-extensions").disabled = on;
+        document.getElementById("auto-type-themes").disabled = on;
+        document.getElementById("auto-type-dicts").disabled = on;
+        document.getElementById("auto-type-langpacks").disabled = on;
+        document.getElementById("auto-spinner").collapsed = !on;
+    }
+
+    toggleUIEnabledState(true);
+    
+    // create the collection object
+
+    var collection = new Bandwagon.Model.Collection();
+
+    collection.name = collectionName;
+    collection.description = collectionName; // nothing better to put here - api demands it
+    collection.listed = document.getElementById("auto-list").checked;
+    collection.writable = true;
+    collection.autoPublish = true;
+    collection.showNotifications = false;
+    collection.updateInterval = 60 * 60 * 24;
+    collection.addonsPerPage = Bandwagon.DEFAULT_ADDONS_PER_PAGE;
+    collection.status = collection.STATUS_NEW;
+
+    collection.autoPublishExtensions = autoPublishExtensions;
+    collection.autoPublishThemes = autoPublishThemes;
+    collection.autoPublishDicts = autoPublishDicts;
+    collection.autoPublishLangPacks = autoPublishLangPacks;
+    
+    // send the api call
+    
+    var newCollectionCallback = function(event)
+    {
+        if (event.isError())
+        {
+            document.getElementById("auto-error").value = Bandwagon.Controller.Settings.stringBundle.getString("auto.internal.error");
+            document.getElementById("auto-error").collapsed = false;
+            toggleUIEnabledState(false);
+        }
+        else
+        {
+            // 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.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-spinner").collapsed = true;
+        }
     }
+    
+    bandwagonService.newCollection(collection, newCollectionCallback);
+}
+
+Bandwagon.Controller.Settings.doAutoDelete = function()
+{
+    // XX TODO
+}
+
+/* Startup check */
+Bandwagon.Controller.Settings.EmailsCheck = function()
+{
+    var numEmails = 0; // XX TODO
+    var textNode = document.getElementById("clear-emails-text");
+    textNode.value = Bandwagon.Controller.Settings.stringBundle.getFormattedString("saved.emails.text", [numEmails]);
+    document.getElementById("clear-emails-button").disabled = (numEmails <= 0);
 }
 
 Bandwagon.Controller.Settings.doAccept = function()
@@ -282,27 +440,27 @@ Bandwagon.Controller.Settings.doAccept = function()
 
     // called:
     // - when user clicks 'Ok' (on systems that show the ok button)
-    // - when user changes feed properties (on systems that don't show buttons)
+    // - when user changes collection properties (on systems that don't show buttons)
 
-    // copy the locally update settings over the global feed settings
+    // copy the locally update settings over the global collection settings
 
-    for (var id in Bandwagon.Controller.Settings.feeds)
+    for (var id in Bandwagon.Controller.Settings.collections)
     {
-        var localFeed = Bandwagon.Controller.Settings.feeds[id];
-        var bwFeed = bandwagonService.feeds[id];
+        var localCollection = Bandwagon.Controller.Settings.collections[id];
+        var bwCollection = bandwagonService.collections[id];
 
-        if (!localFeed || !bwFeed)
+        if (!localCollection || !bwCollection)
             continue;
 
-        if (bwFeed.feedItemsPerPage != localFeed.feedItemsPerPage)
+        if (bwCollection.addonsPerPage != localCollection.addonsPerPage)
         {
-            bwFeed.feedItemsPerPage = localFeed.feedItemsPerPage;
-            Bandwagon.Preferences.notifyObservers("feeditemsperpage:" + bwFeed.url);
+            bwCollection.addonsPerPage = localCollection.addonsPerPage;
+            Bandwagon.Preferences.notifyObservers("addonsperpage:" + bwCollection.resourceURL);
         }
 
-        bwFeed.updateInterval = localFeed.updateInterval;
-        bwFeed.showNotifications = localFeed.showNotifications;
-        bwFeed.autoPublish = localFeed.autoPublish;
+        bwCollection.updateInterval = localCollection.updateInterval;
+        bwCollection.showNotifications = localCollection.showNotifications;
+        bwCollection.autoPublish = localCollection.autoPublish;
     }
 }
 
@@ -314,30 +472,35 @@ Bandwagon.Controller.Settings.doCancel = function()
 Bandwagon.Controller.Settings.doChangePassword = function()
 {
     // TODO
+    
+    alert('TBD');
 }
 
+/** 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.feed");
-    var promptMsg = Bandwagon.Controller.Settings.stringBundle.getString("enter.url.to.add.feed");
+    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.addPreviewFeed(input.value);
+        bandwagonService.addPreviewCollection(input.value);
     }
 }
+*/
 
+/** OBSOLETE XX Brian, er, I think not, see Remove Subscription button
 Bandwagon.Controller.Settings.doRemove = function()
 {
-    var feed = Bandwagon.Controller.Settings.elemBandwagonFeeds.selectedItem.feed;
+    var collection = Bandwagon.Controller.Settings.elemBandwagonCollections.selectedItem.collection;
 
-    if (feed == null)
+    if (collection == null)
         return;
 
     var promptService;
@@ -348,8 +511,8 @@ Bandwagon.Controller.Settings.doRemove = function()
         promptService = promptService.QueryInterface(Components.interfaces.nsIPromptService);
     } catch (e) { return; }
 
-    var promptTitle = Bandwagon.Controller.Settings.stringBundle.getString("remove.feed");
-    var promptMsg = Bandwagon.Controller.Settings.stringBundle.getFormattedString("are.you.sure.you.want.to.remove", [(feed.name?feed.name:feed.url)]);
+    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,
@@ -360,27 +523,41 @@ Bandwagon.Controller.Settings.doRemove = function()
     {
         // TODO for non-instant-apply dialogs, should we wait until 'Ok' is clicked before removal?
     
-        bandwagonService.deleteFeed(feed);
+        bandwagonService.deleteCollection(collection);
 
-        if (!feed.preview)
-            bandwagonService.unsubscribe(feed);
+        if (!collection.preview)
+            bandwagonService.unsubscribe(collection);
     }
 }
+*/
+
+/* See above */
+Bandwagon.Controller.Settings.doRemove = function()
+{
+    alert("TBD!");
+}
 
 Bandwagon.Controller.Settings.doUpdateIntervalScopeChange = function(event)
 {
-    document.getElementById("extensions.bandwagon.updateall.interval").value = document.getElementById("textbox-updateinterval-quantity").valueNumber;
-    document.getElementById("extensions.bandwagon.updateall.units").value = document.getElementById("menulist-updateinterval-units").selectedIndex + 1;
-    document.getElementById("extensions.bandwagon.updateall.enabled").value = (document.getElementById("checkbox-updateinterval-perfeed").checked && document.getElementById("checkbox-updateinterval-global").checked);
+    if (document.getElementById("updates-group").selectedIndex == 0) // Use default
+    {
+        document.getElementById("extensions.bandwagon.updateall.interval").value = document.getElementById("textbox-updateinterval-quantity").valueNumber;
+        document.getElementById("extensions.bandwagon.updateall.units").value = document.getElementById("menulist-updateinterval-units").selectedIndex + 1;
+    }
+    else
+    {
+        // Not sure if anything needs to be done here
+    }
+    document.getElementById("extensions.bandwagon.updateall.enabled").value = (document.getElementById("updates-group").selectedIndex == 0);
 
-    Bandwagon.Controller.Settings.doShowFeed();
+    Bandwagon.Controller.Settings.doShowCollection();
 }
 
 Bandwagon.Controller.Settings.doShowNotificationsScopeChange = function(event)
 {
-    document.getElementById("extensions.bandwagon.notifyall.enabled").value = (document.getElementById("checkbox-shownotifications-perfeed").checked && document.getElementById("checkbox-shownotifications-global").checked);
+    document.getElementById("extensions.bandwagon.notifyall.enabled").value = (document.getElementById("notifications-group").selectedIndex == 0);
 
-    Bandwagon.Controller.Settings.doShowFeed();
+    Bandwagon.Controller.Settings.doShowCollection();
 }
 
 
diff --git a/bandwagon/defaults/preferences/bandwagon.js b/bandwagon/defaults/preferences/bandwagon.js
index e458a62..7388f3f 100644
--- a/bandwagon/defaults/preferences/bandwagon.js
+++ b/bandwagon/defaults/preferences/bandwagon.js
@@ -43,8 +43,8 @@ pref("extensions.bandwagon.updateall.enabled", true);
 pref("extensions.bandwagon.updateall.interval", 2);
 pref("extensions.bandwagon.updateall.units", 1);
 pref("extensions.bandwagon.updateall.datelastcheck", 0);
-pref("extensions.bandwagon.feeditemsperpage.enabled", true);
-pref("extensions.bandwagon.feeditemsperpage", 20);
+pref("extensions.bandwagon.addonsperpage.enabled", true);
+pref("extensions.bandwagon.addonsperpage", 20);
 pref("extensions.bandwagon.publish.shared.emails", "");
 pref("extensions.bandwagon.notifyall.enabled", false);
 pref("extensions.bandwagon.autopublished.extensions", "");
diff --git a/bandwagon/install.rdf b/bandwagon/install.rdf
index d3d6a47..b984fc1 100644
--- a/bandwagon/install.rdf
+++ b/bandwagon/install.rdf
@@ -5,19 +5,20 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>sharing@addons.mozilla.org</em:id>
-    <em:name>Bandwagon</em:name>
-    <em:version>0.0.7</em:version>
-    <em:description>Share and discover Add-ons.</em:description>
+    <em:name>Add-on Collector</em:name>
+    <em:version>0.1</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:homepageURL>https://addons.mozilla.org/collections</em:homepageURL>
     <em:optionsURL>chrome://bandwagon/content/ui/settings.xul</em:optionsURL>
-    <em:iconURL>chrome://bandwagon/skin/images/tango-addonfeed-32x32.png</em:iconURL>
+    <em:iconURL>chrome://bandwagon/skin/images/icon32.png</em:iconURL>
 
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- firefox -->
-        <em:minVersion>2.0</em:minVersion>
-        <em:maxVersion>3.1b3pre</em:maxVersion>
+        <em:minVersion>3.0</em:minVersion>
+        <em:maxVersion>3.5b4pre</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>
diff --git a/bandwagon/locale/en-US/bandwagonAddon.properties b/bandwagon/locale/en-US/bandwagonAddon.properties
new file mode 100644
index 0000000..134478b
--- /dev/null
+++ b/bandwagon/locale/en-US/bandwagonAddon.properties
@@ -0,0 +1,27 @@
+bandwagon.category1=Extension
+
+bandwagon.addon.author=By %S
+bandwagon.addon.category=Category: %S
+bandwagon.addon.added.justnow=Added: Just now
+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.
+bandwagon.addon.upgradetofirefoxn1=Upgrade to Firefox %S
+bandwagon.addon.upgradetofirefoxn2=to use this add-on.
+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.
+bandwagon.addon.notcompatible=This add-on is not compatible with %S.
+bandwagon.addon.comment.description=“%S�
+bandwagon.addon.comment.author=Comment from %S:
+
diff --git a/bandwagon/locale/en-US/bandwagonFeedItem.properties b/bandwagon/locale/en-US/bandwagonFeedItem.properties
deleted file mode 100644
index 72a7b83..0000000
--- a/bandwagon/locale/en-US/bandwagonFeedItem.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-bandwagon.category1=Extension
-
-bandwagon.feeditem.author=By %S
-bandwagon.feeditem.category=Category: %S
-bandwagon.feeditem.added.justnow=Added: Just now
-bandwagon.feeditem.added.minute=Added: 1 minute ago
-bandwagon.feeditem.added.minutes=Added: %S minutes ago
-bandwagon.feeditem.added.hour=Added: 1 hour ago
-bandwagon.feeditem.added.hours=Added: %S hours ago
-bandwagon.feeditem.added.day=Added: Yesterday
-bandwagon.feeditem.added.days=Added: %S days ago
-bandwagon.feeditem.added.week=Added: 1 week ago
-bandwagon.feeditem.added.weeks=Added: %S weeks ago
-bandwagon.feeditem.added.month=Added: 1 month ago
-bandwagon.feeditem.added.months=Added: %S months ago
-bandwagon.feeditem.added.year=Added: 1 year ago
-bandwagon.feeditem.added.years=Added: %S years ago
-bandwagon.feeditem.moreinfo=More info.
-bandwagon.feeditem.olderversionsoffirefox=This add-on is for older versions of Firefox.
-bandwagon.feeditem.upgradetofirefoxn1=Upgrade to Firefox %S
-bandwagon.feeditem.upgradetofirefoxn2=to use this add-on.
-bandwagon.feeditem.requiresfirefoxbeta1=This add-on requires Firefox %S, which has not yet been released. To use this add-on, you may
-bandwagon.feeditem.requiresfirefoxbeta2=download Firefox %S beta.
-bandwagon.feeditem.notcompatible=This add-on is not compatible with %S.
-bandwagon.feeditem.comment.description=“%S�
-bandwagon.feeditem.comment.author=— %S
-
diff --git a/bandwagon/locale/en-US/browserOverlay.dtd b/bandwagon/locale/en-US/browserOverlay.dtd
new file mode 100644
index 0000000..a665207
--- /dev/null
+++ b/bandwagon/locale/en-US/browserOverlay.dtd
@@ -0,0 +1,38 @@
+<!-- ***** 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 bandwagon.

+  -

+  - The Initial Developer of the Original Code is

+  - Mozilla Corporation.

+  - Portions created by the Initial Developer are Copyright (C) 2008

+  - the Initial Developer. All Rights Reserved.

+  -

+  - Contributor(s): Brian King <brian (at) briks (dot) si>

+  -

+  - 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 ***** -->

+

+<!ENTITY bandwagon.label                     "Add-ons">

+<!ENTITY bandwagon.tooltip                   "Add-ons">

diff --git a/bandwagon/locale/en-US/browserOverlay.properties b/bandwagon/locale/en-US/browserOverlay.properties
index f3f1df5..217a947 100644
--- a/bandwagon/locale/en-US/browserOverlay.properties
+++ b/bandwagon/locale/en-US/browserOverlay.properties
@@ -1,2 +1,2 @@
-newfeeditems.alert.title=New Add-ons
-newfeeditems.alert.text=There are new add-ons in your subscribed feed '%S'.
+newaddons.alert.title=New Add-ons
+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 6620b47..4fa83e4 100644
--- a/bandwagon/locale/en-US/extensionOverlay.properties
+++ b/bandwagon/locale/en-US/extensionOverlay.properties
@@ -1,8 +1,12 @@
-feedspane.this.is.only.a.preview=This is only a preview!
-feedspane.if.you.do.not.subscribe=If you do not subscribe, this feed will disappear when you close Firefox.
-feedspane.subscribe=Subscribe
-feedspane.dont.subscribe=Don't Subscribe
-feedspane.subscribe.accesskey=s
-feedspane.dont.subscribe.accesskey=d
+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
+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
diff --git a/bandwagon/locale/en-US/extensionsOverlay.dtd b/bandwagon/locale/en-US/extensionsOverlay.dtd
index fcff6ca..29d18ce 100644
--- a/bandwagon/locale/en-US/extensionsOverlay.dtd
+++ b/bandwagon/locale/en-US/extensionsOverlay.dtd
@@ -14,11 +14,12 @@
   - The Original Code is bandwagon.

   -

   - The Initial Developer of the Original Code is

-  - Brian King.

+  - Mozilla Corporation.

   - Portions created by the Initial Developer are Copyright (C) 2008

   - the Initial Developer. All Rights Reserved.

   -

-  - Contributor(s): David McNamara

+  - Contributor(s): Brian King <brian (at) briks (dot) si>

+  -                 David McNamara

   -

   - 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

@@ -34,25 +35,29 @@
   - 

   - ***** END LICENSE BLOCK ***** -->

 

-<!ENTITY feeds.label                     "Feeds">

-<!ENTITY search.label.bandwagon          "Search">

+<!ENTITY collections.label                "Subscriptions">

+<!ENTITY search.label.bandwagon           "Search">

 

-<!ENTITY feeditem.moreinfo               "More info.">

-<!ENTITY feeditem.addtofirefox           "Add to Firefox">

-<!ENTITY subscribe.label                 "Subscribe to more Add-ons">

-<!ENTITY reload.label                    "Reload All">

-<!ENTITY settings.label                  "Settings">

+<!ENTITY addon.moreinfo                   "More info.">

+<!ENTITY addon.addtofirefox               "Add to Firefox">

+<!ENTITY subscribe.label                  "Subscribe to more Add-ons">

+<!ENTITY reload.label                     "Reload All">

+<!ENTITY settings.label                   "Settings">

 

-<!ENTITY viewsite.label                  "View Site">

-<!ENTITY update.label                    "Update">

-<!ENTITY remove.label                    "Remove">

+<!ENTITY view.label                       "View Collection">

+<!ENTITY unsubscribe.label                "Unsubscribe">

 

-<!ENTITY nofeedssubscribed.label         "You are not subscribed to any feeds">

-<!ENTITY clicktosubscribe.label          "Browse Feeds">

-<!ENTITY feedisloading.label             "Retrieving Feed">

-<!ENTITY feedhasnoitems.label            "This feed contains no items.">

-<!ENTITY feedhaserror.label              "This feed failed to load because it contains errors.">

+<!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 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.">

+

+<!ENTITY publishto.label                  "Publish to">

+<!ENTITY email.address.label              "E-mail Address">

+<!ENTITY new.email.address.label          "New E-mail Address">

+<!ENTITY new.collection.label             "New Collection">

 

-<!ENTITY publishto.label             "Publish to">

-<!ENTITY email.address.label             "E-mail Address">

-<!ENTITY new.email.address.label             "New E-mail Address">

diff --git a/bandwagon/locale/en-US/publish.dtd b/bandwagon/locale/en-US/publish.dtd
index 288d1e6..0e3ec14 100644
--- a/bandwagon/locale/en-US/publish.dtd
+++ b/bandwagon/locale/en-US/publish.dtd
@@ -19,7 +19,7 @@
   - the Initial Developer. All Rights Reserved.
   -
   - Contributor(s): David McNamara
-  -                 Brian King
+  -                 Brian King <brian (at) briks (dot) si>
   -
   - 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,11 +35,14 @@
   - 
   - ***** END LICENSE BLOCK ***** -->
 
+<!-- For localisers to change the width of the window -->
+<!ENTITY publish.style                    "width: 35em;">
+
 <!ENTITY window.title                     "Publish">
 <!ENTITY cancel.label                     "Cancel">
 <!ENTITY publish.label                    "Publish">
-<!ENTITY new.email.label                  "New E-mail">
-<!ENTITY enter.an.email.label             "Enter an e-mail address to share this add-on with:">
+<!ENTITY new.email.label                  "New E-mail Address">
+<!ENTITY enter.an.email.label             "Enter one or more e-mail addresses separated by commas:">
 <!ENTITY remember.this.email.label        "Remember this e-mail address">
-<!ENTITY enter.a.personal.note.label      "Enter an optional personal note to accompany this add-on:">
+<!ENTITY enter.a.personal.note.label      "Optional: Enter a personal note about this add-on to be included in the e-mail">
 
diff --git a/bandwagon/locale/en-US/publish.properties b/bandwagon/locale/en-US/publish.properties
index 88b8260..805b9ef 100644
--- a/bandwagon/locale/en-US/publish.properties
+++ b/bandwagon/locale/en-US/publish.properties
@@ -1,4 +1,9 @@
 you.are.sharing.the.add.on=You are sharing the add-on '%S'
-publishing.to=Publishing to '%S'
-sharing.with=Sharing with '%S'
+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.
+closing.in=Closing in %S
+send.email=Send E-mail
diff --git a/bandwagon/locale/en-US/settings.dtd b/bandwagon/locale/en-US/settings.dtd
index 8b4eb90..d67e154 100644
--- a/bandwagon/locale/en-US/settings.dtd
+++ b/bandwagon/locale/en-US/settings.dtd
@@ -18,7 +18,7 @@
   - Portions created by the Initial Developer are Copyright (C) 2008

   - the Initial Developer. All Rights Reserved.

   -

-  - Contributor(s): Brian King

+  - Contributor(s): Brian King <brian (at) briks (dot) si>

   -                 David McNamara

   -

   - Alternatively, the contents of this file may be used under the terms of

@@ -35,15 +35,67 @@
   - 

   - ***** END LICENSE BLOCK ***** -->

 

-<!ENTITY window.title                     "Sharing Feed Settings">

-<!ENTITY feeditemsperpage.label           "Add-ons displayed per page">

-<!ENTITY updateall.label                  "Update all add-ons every">

+<!-- For localisers to change the width of the window -->

+<!ENTITY settings.style                   "width: 42em;">

+

+<!ENTITY window.title                     "Add-ons Collector Settings">

+

+<!-- Tabs -->

+<!ENTITY manage.label                     "Manage Subscriptions">

+<!ENTITY general.label                    "General Settings">

+<!ENTITY pub.label                        "Auto-publisher Settings">

+

+<!-- Manage Subscriptions -->

+<!ENTITY subscriptions.header             "Select a subscription:">

+

+<!-- Groupbox captions in Manage Subscriptions -->

+<!ENTITY frequency.label                  "Subscription Update Frequency">

+<!ENTITY notifications.label              "New Add-on Notifications">

+<!ENTITY perpage.label                    "Add-ons per Page">

+

+<!ENTITY default.label                    "Use default setting">

+<!ENTITY custom.label                     "Custom:">

+

+<!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 autopublish.label                "Auto-publish installed add-ons to feed">

+<!ENTITY autopublish.label                "Auto-publish installed add-ons to subscription">

 <!ENTITY notify.label                     "Show notifications">

-<!ENTITY applyall.label                   "Apply to all feeds">

-<!ENTITY add.label                        "Add">

-<!ENTITY remove.label                     "Remove">

+<!ENTITY applyall.label                   "Apply to all subscriptions">

+<!ENTITY remove.label                     "Remove Subscription">

+<!ENTITY on.label                         "On">

+<!ENTITY off.label                        "Off">

+

+<!-- General -->

+

+<!-- Groupbox captions in General -->

+<!ENTITY subscriptions.label              "Default Subscription Settings">

+<!ENTITY data.label                       "Data Management">

+

+<!ENTITY updateall.label                  "Check subscriptions for update every">

+<!ENTITY notifyglobal.label               "Notification me when my subscriptions have new add-ons">

+

+<!ENTITY clearemails.label                "Clear">

+<!ENTITY login.label                      "Login">

+<!ENTITY logout.label                     "Logout">

+

+<!-- Auto-Publisher Settings -->

+

+<!-- Groupbox captions in Auto-Publisher Settings -->

+<!ENTITY auto.label                       "Auto-publisher Settings">

+

+<!ENTITY name.label                       "Collection Name:">

+<!ENTITY list.label                       "Listed in public Collection Directory">

+

+<!ENTITY autoleadin.label                 "Auto-publishers are special collections that are automatically updated when you install or uninstall add-ons from Firefox on this computer.">

+<!ENTITY types.label                      "Auto-published add-on types:">

+<!ENTITY type.extensions.label            "Extensions">

+<!ENTITY type.themes.label                "Themes">

+<!ENTITY type.dicts.label                 "Dictionaries">

+<!ENTITY type.langpacks.label             "Language Packs">

+

+<!ENTITY createauto.label                 "Create Auto-publisher">

+<!ENTITY deleteauto.label                 "Delete Auto-publisher">

diff --git a/bandwagon/locale/en-US/settings.properties b/bandwagon/locale/en-US/settings.properties
index b2426d3..2dfccc2 100644
--- a/bandwagon/locale/en-US/settings.properties
+++ b/bandwagon/locale/en-US/settings.properties
@@ -1,4 +1,11 @@
-add.feed=Add Feed
-enter.url.to.add.feed=Enter the URL of the feed you want to add.
-remove.feed=Remove Feed
-are.you.sure.you.want.to.remove=Are you sure you want to remove '%S' from your feeds?
+add.collection=Add Subscription
+enter.url.to.add.collection=Enter the URL of the subscription you want to add.
+remove.collection=Remove Subscription
+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
+login.status.text=You are logged in as %S
+logout.status=You are not logged in
+auto.invalid.name=The collection name '%S' is not valid.
+auto.please.select.type=Please select at least one auto-publish type.
+auto.internal.error=The collection could not be created (an internal error occurred).
+auto.done=Your auto-publish collection has been created.
diff --git a/bandwagon/skin/extensionsOverlay.css b/bandwagon/skin/extensionsOverlay.css
index ffce753..2581839 100644
--- a/bandwagon/skin/extensionsOverlay.css
+++ b/bandwagon/skin/extensionsOverlay.css
@@ -35,20 +35,27 @@
  *

  * ***** END LICENSE BLOCK ***** */

 

-radio#bandwagon-feeds-view {

-  list-style-image: url("chrome://bandwagon/skin/images/tango-addonfeed-32x32.png");

+radio#bandwagon-collections-view {

+  list-style-image: url("chrome://bandwagon/skin/images/icon32.png");

   -moz-image-region: rect(0px, 32px,  32px, 0px);

 }

 

-radio#bandwagon-feeds-view:hover, radio#bandwagon-feeds-view[selected="true"]  {

+radio#bandwagon-collections-view:hover, radio#bandwagon-collections-view[selected="true"]  {

   -moz-image-region: rect(0px, 32px,  32px, 0px);

 }

 

-radio[noimage="true"]#bandwagon-feeds-view {

+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;

+  margin-left: 0.4em;

+  margin-right: 0.4em;

+}

+

 #bandwagon-sidebar-splitter {

   -moz-border-start: none;

   -moz-border-end: 1px solid #404040;

@@ -57,12 +64,12 @@ radio[noimage="true"]#bandwagon-feeds-view {
   background-image: none !important;

 }

 

-#bandwagon-feeds-list {

+#bandwagon-collections-list {

   margin-top: 0;

   margin-left: 0;

 }

 

-#bandwagon-feeditems-list {

+#bandwagon-addons-list {

   border: 2px solid;

   border-left: 0px !important;

   -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;

@@ -72,17 +79,17 @@ radio[noimage="true"]#bandwagon-feeds-view {
   /*overflow: auto;*/

 }

 

-#bandwagon-feed-title {

+#bandwagon-collection-title {

   font-size: 150%;

 }

 

-#bandwagon-feed-title,

-#bandwagon-feed-description,

-#bandwagon-feed-header {

+#bandwagon-collection-title,

+#bandwagon-collection-description,

+#bandwagon-collection-header {

   background: -moz-dialog;

 }

 

-bandwagonFeed {

+bandwagonCollection {

   padding-top: 6px;

   padding-bottom: 6px;

   -moz-padding-start: 7px;

@@ -90,7 +97,7 @@ bandwagonFeed {
   min-height: 25px;

 }

 

-bandwagonFeed[view="settings"] {

+bandwagonCollection[view="settings"] {

   padding-top: 0;

   padding-bottom: 0;

   -moz-padding-start: 0;

@@ -98,21 +105,21 @@ bandwagonFeed[view="settings"] {
   min-height: 0;

 }

 

-bandwagonFeed[selected="true"] {

+bandwagonCollection[selected="true"] {

   background-color: -moz-cellhighlight;

   color: -moz-cellhighlighttext;

 }

 

-bandwagonFeed[preview="true"] label[anonid="name"] {

+bandwagonCollection[preview="true"] label[anonid="name"] {

   font-style: italic;

 }

 

-richlistbox:focus > bandwagonFeed[selected="true"] {

+richlistbox:focus > bandwagonCollection[selected="true"] {

   background-color: Highlight;

   color: HighlightText;

 }

 

-bandwagonFeed label[anonid="unread"] {

+bandwagonCollection label[anonid="unread"] {

   background-color: blue;

   color: white;

   min-width: 1.7em;

@@ -120,12 +127,12 @@ bandwagonFeed label[anonid="unread"] {
   -moz-border-radius: 40%;

 }

 

-bandwagonFeed[view="settings"] label[anonid="unread"] {

+bandwagonCollection[view="settings"] label[anonid="unread"] {

   display: none;

 }

 

-bandwagonFeedItem,

-bandwagonFeedItemExpanded {

+bandwagonAddon,

+bandwagonAddonExpanded {

   padding-top: 6px;

   padding-bottom: 6px;

   -moz-padding-start: 7px;

@@ -134,28 +141,28 @@ bandwagonFeedItemExpanded {
   border-bottom: 1px dotted #C0C0C0;

 }

 

-bandwagonFeedItemExpanded {

+bandwagonAddonExpanded {

   background-color: -moz-cellhighlight;

   color: -moz-cellhighlighttext;

 }

 

-richlistbox:focus > bandwagonFeedItemExpanded {

+richlistbox:focus > bandwagonAddonExpanded {

   background-color: Highlight;

   color: HighlightText;

 }

 

-bandwagonFeedItem[read="false"] {

+bandwagonAddon[read="false"] {

   background-color: #fdf2ab;

   color: #585620;

 }

 

-bandwagonFeedItem .right, 

-bandwagonFeedItemExpanded .right { 

+bandwagonAddon .right, 

+bandwagonAddonExpanded .right { 

   text-align: right;

 }

 

-bandwagonFeedItem .icon,

-bandwagonFeedItemExpanded .icon {

+bandwagonAddon .icon,

+bandwagonAddonExpanded .icon {

   width: 32px;

   height: 32px;

   max-width: 32px;

@@ -164,8 +171,8 @@ bandwagonFeedItemExpanded .icon {
   min-height: 32px;

 }

 

-bandwagonFeedItem .name,

-bandwagonFeedItemExpanded .name {

+bandwagonAddon .name,

+bandwagonAddonExpanded .name {

   font-size: 110%;

 }

 

@@ -175,7 +182,7 @@ bandwagonFeedItemExpanded .name {
   height: 32px;

 }

 

-.feed-item-details {

+.addon-details {

   margin-top: 5px;

   margin-bottom: 5px;

   -moz-margin-start: 6px;

@@ -201,16 +208,15 @@ bandwagonFeedItemExpanded .name {
 */

 

 #bandwagon-button-subscribe {

-  list-style-image: url("chrome://bandwagon/skin/images/twisty-clsd.png");

+  list-style-image: url("chrome://bandwagon/skin/images/plus.png");

 }

 

 #bandwagon-button-update-all {

-  list-style-image: url("chrome://bandwagon/skin/images/Toolbar-small.png");

-  -moz-image-region: rect(0px 64px 16px 48px);

+  list-style-image: url("chrome://bandwagon/skin/images/reload.png");

 }

 

 #bandwagon-button-settings {

-  list-style-image: url("chrome://bandwagon/skin/images/wrench.png");

+  list-style-image: url("chrome://bandwagon/skin/images/gear.png");

 }

 

 .publishButton,

@@ -227,3 +233,25 @@ bandwagonFeedItemExpanded .name {
   margin-top: 1em;

   margin-bottom: 1em;

 }

+

+.fs-info-panel

+{

+  margin: 20px;

+}

+

+.fs-info-panel-header

+{

+  margin-left: 0px;

+  font-size: larger;

+  font-weight: bold;

+}

+

+.fs-info-panel-text

+{

+  margin-left: 0px;

+}

+

+bandwagonCollection description[anonid="commentdesc"]

+{

+  font-style: italic;

+}

diff --git a/bandwagon/skin/global.css b/bandwagon/skin/global.css
index bc8df95..461c0cb 100644
--- a/bandwagon/skin/global.css
+++ b/bandwagon/skin/global.css
@@ -34,7 +34,7 @@
  *

  * ***** END LICENSE BLOCK ***** */

  

-.bandwagon-feeds-toolbox {

+.bandwagon-collections-toolbox {

   -moz-appearance: none;

   background-color: transparent !important;

   border: 0px;

diff --git a/bandwagon/skin/images/Toolbar-small.png b/bandwagon/skin/images/Toolbar-small.png
deleted file mode 100644
index 423e5a1..0000000
--- a/bandwagon/skin/images/Toolbar-small.png
+++ /dev/null
diff --git a/bandwagon/skin/images/addon-toolbar.png b/bandwagon/skin/images/addon-toolbar.png
new file mode 100644
index 0000000..a31028a
--- /dev/null
+++ b/bandwagon/skin/images/addon-toolbar.png
diff --git a/bandwagon/skin/images/gear.png b/bandwagon/skin/images/gear.png
new file mode 100644
index 0000000..735104b
--- /dev/null
+++ b/bandwagon/skin/images/gear.png
diff --git a/bandwagon/skin/images/icon32.png b/bandwagon/skin/images/icon32.png
new file mode 100644
index 0000000..d2c471b
--- /dev/null
+++ b/bandwagon/skin/images/icon32.png
diff --git a/bandwagon/skin/images/plus.png b/bandwagon/skin/images/plus.png
new file mode 100644
index 0000000..25f66fe
--- /dev/null
+++ b/bandwagon/skin/images/plus.png
diff --git a/bandwagon/skin/images/reload.png b/bandwagon/skin/images/reload.png
new file mode 100644
index 0000000..8c24c27
--- /dev/null
+++ b/bandwagon/skin/images/reload.png
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
diff --git a/bandwagon/skin/images/tango-addonfeed-32x32.png b/bandwagon/skin/images/tango-addonfeed-32x32.png
deleted file mode 100644
index ca8da41..0000000
--- a/bandwagon/skin/images/tango-addonfeed-32x32.png
+++ /dev/null
diff --git a/bandwagon/skin/images/wrench.png b/bandwagon/skin/images/wrench.png
deleted file mode 100644
index 229bb6e..0000000
--- a/bandwagon/skin/images/wrench.png
+++ /dev/null
diff --git a/site/app/views/pages/experimental_addons.thtml b/bandwagon/skin/platform/linux/browserOverlay.css
index 5aedb7d..deff4d3 100644
--- a/site/app/views/pages/experimental_addons.thtml
+++ b/bandwagon/skin/platform/linux/browserOverlay.css
@@ -1,61 +1,56 @@
-<?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) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Justin Scott <fligtar@gmail.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 = 'mozilla';
-?>
-
-<div id="content">
-    <?=$this->renderElement('search')?>
-    <?=$this->renderElement('sidebar', array('pitch' => true))?>
-    <?=$this->renderElement('app_chooser')?>
-    
-    <div id="content-main">
-
-
-
-
-<?=$localization->includeLocalPage('experimental_addons', array())?>
-    <script type="text/javascript">
-    if(document.referrer) {
-        document.write('<p><a href="javascript:history.go(-1)"><?=___('pages_experimental_addons_backbutton'); ?></a>.</p>');
-    }
-
-    </script>
-    </div>
-</div>
+/* ***** 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 bandwagon.

+ *

+ * The Initial Developer of the Original Code is

+ * Mozilla Corporation.

+ * Portions created by the Initial Developer are Copyright (C) 2008

+ * the Initial Developer. All Rights Reserved.

+ *

+ * Contributor(s): Brian King <brian (at) briks (dot) si>

+ *

+ * 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 ***** */

+

+/* ToolbarButton */

+#extensions-bandwagon-button {

+  list-style-image: url("chrome://bandwagon/skin/images/addon-toolbar.png");

+}

+

+.bandwagon-button {

+  -moz-image-region: rect(0px, 72px, 24px, 48px);

+}

+

+.bandwagon-button:hover  {

+  -moz-image-region: rect(0px, 72px, 24px, 48px);

+}

+

+[iconsize="small"] .bandwagon-button  {

+  -moz-image-region: rect(0px, 120px, 16px, 104px);

+}

+

+[iconsize="small"] .bandwagon-button:hover  {

+  -moz-image-region: rect(0px, 120px, 16px, 104px);

+}

diff --git a/site/app/views/pages/experimental_addons.thtml b/bandwagon/skin/platform/mac/browserOverlay.css
index 5aedb7d..590dcb2 100644
--- a/site/app/views/pages/experimental_addons.thtml
+++ b/bandwagon/skin/platform/mac/browserOverlay.css
@@ -1,61 +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
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Justin Scott <fligtar@gmail.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 = 'mozilla';
-?>
-
-<div id="content">
-    <?=$this->renderElement('search')?>
-    <?=$this->renderElement('sidebar', array('pitch' => true))?>
-    <?=$this->renderElement('app_chooser')?>
-    
-    <div id="content-main">
-
-
-
-
-<?=$localization->includeLocalPage('experimental_addons', array())?>
-    <script type="text/javascript">
-    if(document.referrer) {
-        document.write('<p><a href="javascript:history.go(-1)"><?=___('pages_experimental_addons_backbutton'); ?></a>.</p>');
-    }
-
-    </script>
-    </div>
-</div>
+/* ***** 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 bandwagon.

+ *

+ * The Initial Developer of the Original Code is

+ * Mozilla Corporation.

+ * Portions created by the Initial Developer are Copyright (C) 2008

+ * the Initial Developer. All Rights Reserved.

+ *

+ * Contributor(s): Brian King <brian (at) briks (dot) si>

+ *

+ * 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 ***** */

+

+/* ToolbarButton */

+#extensions-bandwagon-button {

+  list-style-image: url("chrome://bandwagon/skin/images/addon-toolbar.png");

+}

+

+.bandwagon-button {

+  -moz-image-region: rect(0px, 156px, 23px, 120px);

+}

+

+.bandwagon-button[disabled="true"]  {

+  -moz-image-region: rect(23px, 156px, 46px, 120px);

+}

+

+.bandwagon-button:hover:active  {

+  -moz-image-region: rect(46px, 156px, 69px, 120px);

+}

+

+[iconsize="small"] .bandwagon-button  {

+  -moz-image-region: rect(0px, 156px, 23px, 120px);

+}

+

+[iconsize="small"] .bandwagon-button[disabled="true"]  {

+  -moz-image-region: rect(23px, 156px, 46px, 120px);

+}

+

+[iconsize="small"] .bandwagon-button:hover:active  {

+  -moz-image-region: rect(46px, 156px, 69px, 120px);

+}

diff --git a/site/app/views/pages/experimental_addons.thtml b/bandwagon/skin/platform/vista/browserOverlay.css
index 5aedb7d..2cc8903 100644
--- a/site/app/views/pages/experimental_addons.thtml
+++ b/bandwagon/skin/platform/vista/browserOverlay.css
@@ -1,61 +1,56 @@
-<?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) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Justin Scott <fligtar@gmail.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 = 'mozilla';
-?>
-
-<div id="content">
-    <?=$this->renderElement('search')?>
-    <?=$this->renderElement('sidebar', array('pitch' => true))?>
-    <?=$this->renderElement('app_chooser')?>
-    
-    <div id="content-main">
-
-
-
-
-<?=$localization->includeLocalPage('experimental_addons', array())?>
-    <script type="text/javascript">
-    if(document.referrer) {
-        document.write('<p><a href="javascript:history.go(-1)"><?=___('pages_experimental_addons_backbutton'); ?></a>.</p>');
-    }
-
-    </script>
-    </div>
-</div>
+/* ***** 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 bandwagon.

+ *

+ * The Initial Developer of the Original Code is

+ * Mozilla Corporation.

+ * Portions created by the Initial Developer are Copyright (C) 2008

+ * the Initial Developer. All Rights Reserved.

+ *

+ * Contributor(s): Brian King <brian (at) briks (dot) si>

+ *

+ * 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 ***** */

+ 

+/* ToolbarButton */

+#extensions-bandwagon-button {

+  list-style-image: url("chrome://bandwagon/skin/images/addon-toolbar.png");

+}

+

+.bandwagon-button {

+  -moz-image-region: rect(0px, 24px, 24px, 0px);

+}

+

+.bandwagon-button:hover  {

+  -moz-image-region: rect(0px, 24px, 24px, 0px);

+}

+

+[iconsize="small"] .bandwagon-button  {

+  -moz-image-region: rect(0px, 88px, 16px, 72px);

+}

+

+[iconsize="small"] .bandwagon-button:hover  {

+  -moz-image-region: rect(0px, 88px, 16px, 72px);

+}

diff --git a/site/app/views/pages/experimental_addons.thtml b/bandwagon/skin/platform/xp/browserOverlay.css
index 5aedb7d..4b66025 100644
--- a/site/app/views/pages/experimental_addons.thtml
+++ b/bandwagon/skin/platform/xp/browserOverlay.css
@@ -1,61 +1,56 @@
-<?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) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Justin Scott <fligtar@gmail.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 = 'mozilla';
-?>
-
-<div id="content">
-    <?=$this->renderElement('search')?>
-    <?=$this->renderElement('sidebar', array('pitch' => true))?>
-    <?=$this->renderElement('app_chooser')?>
-    
-    <div id="content-main">
-
-
-
-
-<?=$localization->includeLocalPage('experimental_addons', array())?>
-    <script type="text/javascript">
-    if(document.referrer) {
-        document.write('<p><a href="javascript:history.go(-1)"><?=___('pages_experimental_addons_backbutton'); ?></a>.</p>');
-    }
-
-    </script>
-    </div>
-</div>
+/* ***** 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 bandwagon.

+ *

+ * The Initial Developer of the Original Code is

+ * Mozilla Corporation.

+ * Portions created by the Initial Developer are Copyright (C) 2008

+ * the Initial Developer. All Rights Reserved.

+ *

+ * Contributor(s): Brian King <brian (at) briks (dot) si>

+ *

+ * 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 ***** */

+

+/* ToolbarButton */

+#extensions-bandwagon-button {

+  list-style-image: url("chrome://bandwagon/skin/images/addon-toolbar.png");

+}

+

+.bandwagon-button {

+  -moz-image-region: rect(0px, 48px, 24px, 24px);

+}

+

+.bandwagon-button:hover  {

+  -moz-image-region: rect(24px, 48px, 48px, 24px);

+}

+

+[iconsize="small"] .bandwagon-button  {

+  -moz-image-region: rect(0px, 104px, 16px, 88px);

+}

+

+[iconsize="small"] .bandwagon-button:hover  {

+  -moz-image-region: rect(16px, 104px, 32px, 88px);

+}

diff --git a/bandwagon/skin/publish.css b/bandwagon/skin/publish.css
index b471432..e6ffc65 100644
--- a/bandwagon/skin/publish.css
+++ b/bandwagon/skin/publish.css
@@ -33,3 +33,8 @@
  * the terms of any one of the MPL, the GPL or the LGPL.

  *

  * ***** END LICENSE BLOCK ***** */

+

+.dialog-header

+{

+    font-weight: bold;

+}

diff --git a/bandwagon/skin/settings.css b/bandwagon/skin/settings.css
index 5646fc4..c9dc228 100644
--- a/bandwagon/skin/settings.css
+++ b/bandwagon/skin/settings.css
@@ -19,6 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s): David McNamara
+ *                 Brian King <brian (at) briks (dot) si>
  *
  * 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
@@ -34,24 +35,34 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#feeds-list {
+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;
 }
 
-#feed-name {
+#collection-name {
   font-weight: bold;
   font-size: larger;
 }
 
-.all-check {
-  padding-left: 15px;
-}
-
-#add-feed-button {
-  list-style-image: url("chrome://bandwagon/skin/images/twisty-clsd.png");
+prefwindow description {
+  width: 30em;
 }
 
-#remove-feed-button {
-  list-style-image: url("chrome://bandwagon/skin/images/twisty-open.png");
+/* No caption for this groupbox (there to fix a clipping issue), so hide the border */
+#auto-groupbox {
+  border: none;
 }
diff --git a/bin/compatibility_report.php b/bin/compatibility_report.php
index 1ad2ceb..567139e 100644
--- a/bin/compatibility_report.php
+++ b/bin/compatibility_report.php
@@ -52,39 +52,6 @@ class Object {}
 $db = new Database();
 $versioncompare = new VersioncompareComponent();
 
-global $compatibility_versions;
-
-$appversions = array();
-$totals = array();
-
-foreach ($compatibility_versions as $compatibility_version) {
-    $totals[$compatibility_version] = array(
-        COMPAT_LATEST => array(
-            'count' => 0,
-            'adu' => 0
-        ),
-        COMPAT_BETA => array(
-            'count' => 0,
-            'adu' => 0
-        ),
-        COMPAT_ALPHA => array(
-            'count' => 0,
-            'adu' => 0
-        ),
-        COMPAT_OTHER => array(
-            'count' => 0,
-            'adu' => 0
-        )
-    );
-    
-    $versions_qry = $db->query("SELECT id, version FROM appversions WHERE application_id = ".APP_FIREFOX." AND version LIKE '{$compatibility_version}%'");
-    while ($version = mysql_fetch_assoc($versions_qry)) {
-        $versions[$compatibility_version][$version['id']] = $version['version'];
-    }
-    
-    $appversions[$compatibility_version] = $versioncompare->getCompatibilityGrades($compatibility_version, $versions[$compatibility_version]);
-}
-
 // Get latest update pings date
 $date_qry = $db->query("SELECT date FROM update_counts ORDER BY date DESC LIMIT 1");
 $date_array = mysql_fetch_assoc($date_qry);
@@ -112,71 +79,116 @@ $addon_qry = $db->query("
                 translations.locale = 'en-US' AND
                 versions.id = (
                     SELECT id FROM versions WHERE addon_id = addons.id ORDER BY created DESC LIMIT 1
-                ) AND
-                addons.id NOT IN (1269,2390,10,4938)
+                )
             GROUP BY
                 addons.id
             ORDER BY
                 update_counts.count DESC
         ");
 
-$adu_total = 0;
 $all_addons = array();
-$addons = array();
 // Sum all update pings to establish total active users
 while ($addon = mysql_fetch_assoc($addon_qry)) {
-    $adu_total += $addon['updatepings'];
     $all_addons[] = $addon;
 }
 
-// Calculate 95%
-$adu_top95 = floor($adu_total * .95);
-$adu_counter = 0;
+// set in site/app/config/config.php
+global $compatibility_versions;
 
-// Iterate through each add-on
-foreach ($all_addons as $addon) {
-    // Only include add-ons that make up the top 95%
-    if ($adu_counter >= $adu_top95) break;
-    
-    $classification = array();
-    
-    foreach ($compatibility_versions as $compatibility_version) {
-        $classification[$compatibility_version] = $versioncompare->gradeCompatibility($addon['maxversion'], $compatibility_version, $appversions[$compatibility_version]);
+// Previous version defaults to 2.0 because 3.0 is the first compat version we have available
+$previous_version = '2.0';
 
-        $totals[$compatibility_version][$classification[$compatibility_version]]['count']++;
-        $totals[$compatibility_version][$classification[$compatibility_version]]['adu'] += $addon['updatepings'];
+/**
+ * iterate through each major compatibility version and make an individual
+ * report based on above general info
+ */
+foreach ($compatibility_versions as $compatibility_version) {
+    $compat_addons = array();
+    $adu_total = 0;
+    foreach ($all_addons as $addon) {
+        // Only count this add-on if it is compatible with the major/minor release before
+        if (!empty($previous_version) && $versioncompare->compareVersions($addon['maxversion'], $previous_version) < 0) continue;
+        
+        $compat_addons[] = $addon;
+        $adu_total += $addon['updatepings'];
     }
     
-    $addons[] = array(
-        'id' => $addon['id'],
-        'name' => $addon['name'],
-        'maxversion' => $addon['maxversion'],
-        'featured' => $addon['featured'],
-        'percentage' => ($addon['updatepings'] / $adu_top95),
-        'classification' => $classification
+    $adu_top95 = floor($adu_total * .95);
+    
+    $totals = array(
+        COMPAT_LATEST => array(
+            'count' => 0,
+            'adu' => 0
+        ),
+        COMPAT_BETA => array(
+            'count' => 0,
+            'adu' => 0
+        ),
+        COMPAT_ALPHA => array(
+            'count' => 0,
+            'adu' => 0
+        ),
+        COMPAT_OTHER => array(
+            'count' => 0,
+            'adu' => 0
+        )
     );
     
-    //echo "{$addon['name']} - {$addon['maxversion']} - {$classification['3.1']} - {$adu_counter}<br>";
-
-    $adu_counter += $addon['updatepings'];
-}
-
-$totals['adu95'] = $adu_top95;
-$totals['adu'] = $adu_total;
-$totals['addons95'] = count($addons);
-$totals['addons'] = mysql_num_rows($addon_qry);
+    $versions_qry = $db->query("SELECT id, version FROM appversions WHERE application_id = ".APP_FIREFOX." AND version LIKE '{$compatibility_version}%'");
+    $versions = array();
+    while ($version = mysql_fetch_assoc($versions_qry)) {
+        $versions[$version['id']] = $version['version'];
+    }
+    
+    $appversions = $versioncompare->getCompatibilityGrades($compatibility_version, $versions);
+    
+    
+    $adu_counter = 0;
+    $addons = array();
+    
+    // Iterate through each add-on
+    foreach ($compat_addons as $addon) {
+        // Only include add-ons that make up the top 95%
+        if ($adu_counter >= $adu_top95) break;
+        
+        $classification = $versioncompare->gradeCompatibility($addon['maxversion'], $compatibility_version, $appversions);
+        
+        $totals[$classification]['count']++;
+        $totals[$classification]['adu'] += $addon['updatepings'];
+        
+        $addons[] = array(
+            'id' => $addon['id'],
+            'name' => $addon['name'],
+            'maxversion' => $addon['maxversion'],
+            'featured' => $addon['featured'],
+            'percentage' => ($addon['updatepings'] / $adu_top95),
+            'classification' => $classification
+        );
+        
+        $adu_counter += $addon['updatepings'];
+    }
+    
+    $totals['adu95'] = $adu_top95;
+    $totals['adu'] = $adu_total;
+    $totals['addons95'] = count($addons);
+    $totals['addons'] = mysql_num_rows($addon_qry);
+    
+    echo "<br /><hr />Report for Firefox {$compatibility_version}<br />";
+    echo "Using data from {$latest_date}<br />";
+    echo "{$totals['adu']} total active users; {$totals['adu95']} making up top 95%<br />";
+    echo "{$totals['addons']} rows returned; {$totals['addons95']} addons counted<br /><br />";
+
+    $output = array(
+        'addons' => $addons,
+        'totals' => $totals,
+        'appversions' => $appversions
+    );
 
-echo "{$latest_date}<br />";
-echo "{$totals['adu']} total active users; {$totals['adu95']} making up top 95%<br />";
-echo "{$totals['addons']} rows returned; {$totals['addons95']} addons counted<br /><br />";
+    echo '<pre>'.print_r($output, true).'</pre>';
 
-$output = array(
-    'addons' => $addons,
-    'totals' => $totals,
-    'appversions' => $appversions
-);
+    file_put_contents(NETAPP_STORAGE.'/compatibility-fx-'.$compatibility_version.'.serialized', serialize($output));
 
-echo '<pre>'.print_r($output, true).'</pre>';
+    $previous_version = $compatibility_version;
+}
 
-file_put_contents(NETAPP_STORAGE.'/compatibility.serialized', serialize($output));
 ?>
diff --git a/bin/maintenance.php b/bin/maintenance.php
index 811421d..8269fe8 100755
--- a/bin/maintenance.php
+++ b/bin/maintenance.php
@@ -172,8 +172,6 @@ switch ($action) {
                 $total_counts[$row['addon_id']] = ($row['total_count'] > 0) ? $row['total_count'] : 0;
             }
 
-            echo 'Updating seven day counts in `main` ...'."\n";
-
             foreach ($total_counts as $id => $total_count) {
                 $total_count_update_sql = "
                     UPDATE `addons` SET `totaldownloads`='{$total_count}' WHERE `id`='{$id}'
@@ -268,26 +266,22 @@ switch ($action) {
         echo 'Starting review total updates...'."\n";
         
         $reviews_sql = "
-            SELECT
-                versions.addon_id as addon_id,
-                count(DISTINCT(reviews.user_id)) as count 
-            FROM reviews 
-            INNER JOIN versions ON reviews.version_id = versions.id 
-            WHERE reviews.reply_to IS NULL
-            GROUP BY versions.addon_id 
+            UPDATE addons AS a
+            INNER JOIN (
+                SELECT
+                    versions.addon_id as addon_id,
+                    COUNT(*) as count
+                FROM reviews 
+                INNER JOIN versions ON reviews.version_id = versions.id 
+                WHERE reviews.reply_to IS NULL
+                    AND reviews.rating > 0
+                GROUP BY versions.addon_id 
+            ) AS c ON (a.id = c.addon_id)
+            SET a.totalreviews = c.count
         ";
-
         $reviews_result = $db->query($reviews_sql);
 
-        $affected_rows = mysql_num_rows($reviews_result);
-
-        while ($row = mysql_fetch_array($reviews_result)) {
-            if ($db->query("UPDATE addons SET totalreviews = {$row['count']} WHERE id = {$row['addon_id']}", true)) {
-                echo "Review total updated to {$row['count']} updated for addon {$row['addon_id']}\n";
-            } else {
-                echo "Review total update failed for addon {$row['addon_id']}\n";
-            }
-        }
+        $affected_rows = mysql_affected_rows($reviews_result);
 
     break;
 
@@ -297,45 +291,65 @@ switch ($action) {
      * Get average ratings and update addons table.
      */
     case 'ratings':
-        echo 'Starting average ratings updates...'."\n";
-        $avg_sql = "SELECT SUM(rating)/count(rating) as avg from reviews WHERE rating > 0 AND reply_to IS NULL";
-        $avg_result = $db->query($avg_sql);
-        $row= mysql_fetch_array($avg_result);
-        $_smoothfunc = $row['avg'];
-
+        echo 'Updating average ratings...'."\n";
         $rating_sql = "
-            SELECT 
-                addon_id,(sum(latest_rating)+$_smoothfunc)/(count(latest_rating) + 1) AS avg
-            FROM (
-                    SELECT 
-                        v.addon_id,
-                        SUBSTRING_INDEX( GROUP_CONCAT( r.rating ORDER BY r.created DESC SEPARATOR ';'), ';', 1 ) AS latest_rating,
-                        SUBSTRING_INDEX( GROUP_CONCAT( r.created ORDER BY r.created DESC SEPARATOR ';'), ';', 1 ) AS latest_created
-                    FROM 
-                        reviews r
-                    INNER JOIN 
-                        versions v ON r.version_id = v.id 
-                    WHERE 
-                        r.rating > 0 AND 
-                        r.reply_to IS NULL
-                    GROUP BY r.user_id 
-                    ORDER BY latest_created DESC 
-                ) AS t1
-            GROUP BY addon_id
+            UPDATE addons AS a
+            INNER JOIN (
+                SELECT
+                    versions.addon_id as addon_id,
+                    AVG(rating) as avg_rating
+                FROM reviews 
+                INNER JOIN versions ON reviews.version_id = versions.id 
+                WHERE reviews.reply_to IS NULL
+                    AND reviews.rating > 0
+                GROUP BY versions.addon_id 
+            ) AS c ON (a.id = c.addon_id)
+            SET a.averagerating = ROUND(c.avg_rating, 2)
         ";
-
         $rating_result = $db->query($rating_sql);
 
-        $affected_rows = mysql_num_rows($rating_result);
+        echo 'Updating bayesian ratings...'."\n";
+        // get average review count and average rating
+        $rows = $db->query("
+            SELECT AVG(a.cnt) AS avg_cnt 
+            FROM (
+                SELECT COUNT(*) AS cnt
+                FROM reviews AS r
+                INNER JOIN versions AS v ON (r.version_id = v.id)
+                WHERE reply_to IS NULL
+                    AND rating > 0
+                GROUP BY v.addon_id
+                ) AS a
+        ");
+        $row = mysql_fetch_array($rows);
+        $avg_num_votes = $row['avg_cnt'];
+        
+        $rows = $db->query("
+            SELECT AVG(a.addon_rating) AS avg_rating 
+            FROM (
+                SELECT AVG(rating) AS addon_rating
+                FROM reviews AS r
+                INNER JOIN versions AS v ON (r.version_id = v.id)
+                WHERE reply_to IS NULL
+                    AND rating > 0
+                GROUP BY v.addon_id
+                ) AS a
+        ");
+        $row = mysql_fetch_array($rows);
+        $avg_rating = $row['avg_rating'];
+        
+        // calculate and store bayesian rating
+        $rating_sql = "
+            UPDATE addons AS a
+            SET a.bayesianrating =
+                IF (a.totalreviews > 0, (
+                    ( ({$avg_num_votes} * {$avg_rating}) + (a.totalreviews * a.averagerating) ) /
+                    ({$avg_num_votes} + a.totalreviews)
+                ), 0)
+        ";
+        $rating_result = $db->query($rating_sql);
 
-        while ($row = mysql_fetch_array($rating_result)) {
-            $_avg = round($row['avg'],2);
-            if ($db->query("UPDATE addons SET averagerating = '{$_avg}' WHERE id = {$row['addon_id']}", true)) {
-                echo "Rating average updated to {$_avg} updated for addon {$row['addon_id']}\n";
-            } else {
-                echo "Rating average update failed for addon {$row['addon_id']}\n";
-            }
-        }
+        $affected_rows = mysql_affected_rows();
 
     break;
 
@@ -360,6 +374,60 @@ switch ($action) {
 
 
     /**
+     * Update addon-collection download totals.
+     */
+    case 'addons_collections_total':
+        echo "Starting addon_collection totals update...\n";
+        $addons_collections_total = "
+            UPDATE
+                addons_collections AS ac
+            INNER JOIN (
+                SELECT
+                    stats.addon_id as addon_id,
+                    stats.collection_id as collection_id,
+                    SUM(stats.count) AS sum
+                FROM
+                    stats_addons_collections_counts AS stats
+                GROUP BY
+                    stats.addon_id, stats.collection_id
+            ) AS j ON (ac.addon_id = j.addon_id AND
+                       ac.collection_id = j.collection_id)
+            SET
+                ac.downloads = j.sum
+        ";
+        $db->query($addons_collections_sql);
+        $affected_rows = mysql_affected_rows();
+    break;
+
+
+
+    /**
+     * Update collection downloads total.
+     */
+    case 'collections_total':
+        echo "Starting collection totals update...\n";
+        $collections_sql = "
+            UPDATE
+                collections AS c
+            INNER JOIN (
+                SELECT
+                    stats.collection_id AS collection_id,
+                    SUM(stats.count) AS sum
+                FROM
+                    stats_collections_counts AS stats
+                GROUP BY
+                    stats.collection_id
+            ) AS j ON (c.id = j.collection_id)
+            SET
+                c.downloads = j.sum
+        ";
+        $db->query($collections_sql);
+        $affected_rows = mysql_affected_rows();
+    break;
+
+
+
+    /**
      * Unknown command.
      */
     default:
diff --git a/bin/parse_logs/count_downloads.class.php b/bin/parse_logs/count_downloads.class.php
index 9db7d61..f1e43f1 100644
--- a/bin/parse_logs/count_downloads.class.php
+++ b/bin/parse_logs/count_downloads.class.php
@@ -73,6 +73,7 @@ class Count_Downloads {
         if (isset($this->countedIPs[$details['ip']])) {
             $this->totalSkipped['blacklist']++;
             outputIfVerbose("[DownloadCounter] IP ({$details['ip']}) in blacklist; skipped");
+            return;
         }
 
         $_addon_ids = array();
diff --git a/site/app/app_controller.php b/site/app/app_controller.php
index e953cef..8eb6d90 100644
--- a/site/app/app_controller.php
+++ b/site/app/app_controller.php
@@ -65,6 +65,13 @@ class AppController extends Controller
     function __construct() {
         parent::__construct();
 
+        if (DEV) {
+            // Not using && to help with APC caching, but I don't know
+            // if it actually helps.  voodoo++
+            if (array_key_exists('X-Amo-Test', getallheaders())){
+                DATABASE_CONFIG::useTestConfig();
+            }
+        }
         $this->setSecurityLevel($this->securityLevel);
     }
 
diff --git a/site/app/config/database.php b/site/app/config/database.php
index e5f0815..a34d481 100644
--- a/site/app/config/database.php
+++ b/site/app/config/database.php
@@ -54,10 +54,42 @@
  *
  * Note:    Driver has been changed to amo_mysql to add support for fetching l10n data because of a problem
  *          caused by a CakePHP bug (https://trac.cakephp.org/ticket/1183) which as of 1.2 is not fixed. 
+ *
+ *
+ * How the database is configured:
+
+ * The ConnectionManager is a singleton object that manages loading database
+ * connections according to the named configurations in app/config/database.php.
+ * When it gets instantiated, it creates an instance of our DATABASE_CONFIG so
+ * it can access the configurations as member variables.  We have three
+ * configurations: $default, $test, and $shadow.
+ *
+ * cake/libs/model/connection_manager.php:ConnectionManager.__construct:
+ * $this->config = new DATABASE_CONFIG();
+ *
+ * Clients call ConnectionManager::getDataSource($name), which translates into
+ * <DATABASE_CONFIG instance>->$name.  All the calls are for 'default' or
+ * 'shadow', never 'test'.  Usually the $name comes from $this->useDbConfig.
+ *
+ * Once ConnectionManager has been instantiated, we're stuck with the
+ * configuration since it's bound to the instance.  The easiest way to point
+ * tests at the test database is to reconfigure DATABASE_CONFIG before any
+ * instances are created.
+ *
+ * The named configurations are static class variables so they can be
+ * manipulated by the class, but that means they can't be accessed as member
+ * variables.  The constructor manually binds each static var to the new
+ * instance so they're accessible on the object.
+ *
+ * AMO has two kinds of tests: unit tests and web tests.  Unit tests run in
+ * same process as the test manager so switching to the test config is easy.
+ * Web tests, however, invoke real requests through the server; we can't tell
+ * that tests are running.  We send an X-Amo-Test header during web testing to
+ * switch on the test database.
  */
 class DATABASE_CONFIG
 {
-    var $default = array(   'driver' => 'amo_mysql',
+    static $default = array('driver' => 'amo_mysql',
                             'connect' => 'mysql_connect',
                             'host' => DB_HOST,
                             'login' => DB_USER,
@@ -66,7 +98,7 @@ class DATABASE_CONFIG
                             'prefix' => ''
     );
 
-    var $test = array(      'driver' => 'amo_mysql',
+    static $test = array(   'driver' => 'amo_mysql',
                             'connect' => 'mysql_connect',
                             'host' => TEST_DB_HOST,
                             'login' => TEST_DB_USER,
@@ -75,7 +107,7 @@ class DATABASE_CONFIG
                             'prefix' => ''
     );
 
-    var $shadow = array(    'driver' => 'amo_mysql',
+    static $shadow = array( 'driver' => 'amo_mysql',
                             'connect' => 'mysql_connect',
                             'host' => SHADOW_DB_HOST,
                             'login' => SHADOW_DB_USER,
@@ -84,5 +116,15 @@ class DATABASE_CONFIG
                             'prefix' => '',
                             'shadow' => true
     );
+
+    function __construct() {
+        $this->default = self::$default;
+        $this->test = self::$test;
+        $this->shadow = self::$shadow;
+    }
+
+    function useTestConfig() {
+        self::$default = self::$test;
+    }
 }
 ?>
diff --git a/site/app/config/routes.php b/site/app/config/routes.php
index 4bcb15a..e629b76 100644
--- a/site/app/config/routes.php
+++ b/site/app/config/routes.php
@@ -88,6 +88,7 @@
         $Route->connect("/{$prefix}/browse/*", array('controller' => 'addons', 'action' => 'browse'));
         $Route->connect("/{$prefix}/recommended/*", array('controller' => 'addons', 'action' => 'recommended'));
         $Route->connect("/{$prefix}/user/*", array('controller' => 'users', 'action' => 'info'));
+        $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' => 'display'));
diff --git a/site/app/config/sql/remora.sql b/site/app/config/sql/remora.sql
index 5652308..e3f73d4 100644
--- a/site/app/config/sql/remora.sql
+++ b/site/app/config/sql/remora.sql
@@ -36,6 +36,7 @@ CREATE TABLE `addons` (
   `supportemail` int(11) unsigned DEFAULT NULL,
   `supporturl` int(11) unsigned DEFAULT NULL,
   `averagerating` varchar(255) default NULL,
+  `bayesianrating` float NOT NULL default '0',
   `totalreviews` int(11) unsigned NOT NULL default '0',
   `weeklydownloads` int(11) unsigned NOT NULL default '0',
   `totaldownloads` int(11) unsigned NOT NULL default '0',
@@ -71,6 +72,7 @@ CREATE TABLE `addons` (
   KEY `guid` (`guid`),
   KEY `inactive` (`inactive`),
   KEY `target_locale` (`target_locale`),
+  KEY `bayesianrating` (`bayesianrating`),
   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`),
@@ -180,6 +182,7 @@ DROP TABLE IF EXISTS `approvals`;
 CREATE TABLE `approvals` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
+  `reply_to` int(11) unsigned default NULL,
   `user_id` int(11) unsigned NOT NULL default '0',
   `reviewtype` varchar(10) NOT NULL default 'pending',
   `action` int(11) NOT NULL default '0',
@@ -192,9 +195,11 @@ CREATE TABLE `approvals` (
   KEY `user_id` (`user_id`),
   KEY `file_id` (`file_id`),
   KEY `addon_id` (`addon_id`),
+  KEY `reply_to` (`reply_to`),
   CONSTRAINT `approvals_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`),
   CONSTRAINT `approvals_ibfk_2` FOREIGN KEY (`file_id`) REFERENCES `files` (`id`),
-  CONSTRAINT `approvals_ibfk_3` FOREIGN KEY (`addon_id`) REFERENCES `addons` (`id`)
+  CONSTRAINT `approvals_ibfk_3` FOREIGN KEY (`addon_id`) REFERENCES `addons` (`id`),
+  CONSTRAINT `approvals_ibfk_4` FOREIGN KEY (`reply_to`) REFERENCES `approvals` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -409,6 +414,21 @@ CREATE TABLE `downloads_tmp` (
   KEY `addon_id` (`addon_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+-- 
+-- Table structure for table `editor_subscriptions`
+-- 
+
+DROP TABLE IF EXISTS `editor_subscriptions`;
+CREATE TABLE `editor_subscriptions` (
+  `user_id` int(11) unsigned NOT NULL,
+  `addon_id` int(11) unsigned NOT NULL,
+  PRIMARY KEY  (`user_id`,`addon_id`),
+  KEY `user_id` (`user_id`),
+  KEY `addon_id` (`addon_id`),
+  CONSTRAINT `editor_subscriptions_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `editor_subscriptions_ibfk_2` FOREIGN KEY (`addon_id`) REFERENCES `addons` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Editor subscriptions for add-on updates';
+
 --
 -- Table structure for table `eventlog`
 --
@@ -720,36 +740,22 @@ CREATE TABLE `reviews_moderation_flags` (
   CONSTRAINT `reviews_moderation_flags_ibfk_2` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-DROP TABLE IF EXISTS `stats_addons_collections_counts`;
-CREATE TABLE `stats_addons_collections_counts` (
-      `id` int(10) unsigned NOT NULL auto_increment,
-      `addon_id` int(10) unsigned NOT NULL default '0',
-      `collection_id` int(10) unsigned NOT NULL default '0',
-      `count` int(10) unsigned NOT NULL default '0',
-      `date` date NOT NULL default '0000-00-00',
-      PRIMARY KEY  (`id`),
-      KEY `addon_id` (`addon_id`),
-      KEY `collection_id` (`collection_id`),
-      KEY `count` (`count`),
-      KEY `date` (`date`),
-      CONSTRAINT `stats_addons_collections_counts_ibfk_1` FOREIGN KEY (`addon_id`)
-    REFERENCES `addons` (`id`),
-      CONSTRAINT `stats_addons_collections_counts_ibfk_2` FOREIGN KEY
-    (`collection_id`) REFERENCES `collections` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+--
+-- Table structure for table `stats_share_counts`
+--
 
-DROP TABLE IF EXISTS `stats_collections_counts`;
-CREATE TABLE `stats_collections_counts` (
-      `id` int(10) unsigned NOT NULL auto_increment,
-      `collection_id` int(10) unsigned NOT NULL default '0',
-      `count` int(10) unsigned NOT NULL default '0',
-      `date` date NOT NULL default '0000-00-00',
-      PRIMARY KEY  (`id`),
-      KEY `collection_id` (`collection_id`),
-      KEY `count` (`count`),
-      KEY `date` (`date`),
-      CONSTRAINT `stats_collections_counts_ibfk_1` FOREIGN KEY (`collection_id`)
-    REFERENCES `collections` (`id`)
+DROP TABLE IF EXISTS `stats_share_counts`;
+CREATE TABLE `stats_share_counts` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `addon_id` int(11) unsigned NOT NULL default '0',
+  `count` int(11) unsigned NOT NULL default '0',
+  `service` varchar(128),
+  `date` date NOT NULL default '0000-00-00',
+  PRIMARY KEY  (`id`),
+  KEY `addon_id` (`addon_id`),
+  KEY `count` (`count`),
+  KEY `date` (`date`),
+  UNIQUE KEY `one_count_per_addon_service_and_date` (`addon_id`,`service`,`date`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
diff --git a/site/app/controllers/addons_controller.php b/site/app/controllers/addons_controller.php
index d4ace7d..28caa85 100644
--- a/site/app/controllers/addons_controller.php
+++ b/site/app/controllers/addons_controller.php
@@ -56,6 +56,8 @@ class AddonsController extends AppController
 
     var $securityLevel = 'low';
 
+    var $link_sharing_services;
+
     function beforeFilter() {
         // Disable ACLs because this controller is entirely public.
         $this->SimpleAuth->enabled = false;
@@ -64,6 +66,96 @@ class AddonsController extends AppController
         if (array_key_exists('addons-author-addons-select', $this->params['url']) && ctype_digit($this->params['url']['addons-author-addons-select'])) {
             redirectWithNewLocaleAndExit(array('addon',$this->params['url']['addons-author-addons-select']));
         }
+
+        // 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( 
+
+            // see: http://digg.com/tools/integrate#3
+            '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'
+            ),
+
+            // see: http://www.facebook.com/share_options.php
+            'facebook' => array(
+                'label' => ___('addons_share_label_facebook', 'Post to Facebook'),
+                'url' => 'http://www.facebook.com/share.php?u={URL}&t={TITLE}'
+            ),
+
+            // see: http://delicious.com/help/savebuttons
+            'delicious' => array(
+                'label' => ___('addons_share_label_delicious', 'Add to Delicious'),
+                'url' => 'http://delicious.com/save?url={URL}&title={TITLE}&notes={DESCRIPTION}'
+            ),
+
+            // see: http://www.myspace.com/posttomyspace
+            'myspace' => array(
+                'label' => ___('addons_share_label_myspace', 'Post to MySpace'),
+                'url' => 'http://www.myspace.com/index.cfm?fuseaction=postto&t={TITLE}&c={DESCRIPTION}&u={URL}&l=1'
+            ),
+
+            // see: http://friendfeed.com/embed/link
+            'friendfeed' => array(
+                'label' => ___('addons_share_label_friendfeed', 'Share on FriendFeed'),
+                'url' => 'http://friendfeed.com/?url={URL}&title={TITLE}'
+            )
+
+        );
+
+    }
+
+    /**
+     * Share an addon with a link sharing service.
+     * @param int $id the id of the addon
+     */
+    function share($id = null) {
+        global $valid_status;
+        
+        $_conditions = array(
+            'Addon.id' => $id,
+            'Addon.inactive' => 0,
+            'Addon.addontype_id' => array(
+                ADDON_EXTENSION, ADDON_THEME, ADDON_DICT, 
+                ADDON_SEARCH, ADDON_LPAPP, ADDON_PLUGIN
+            ),
+            'Addon.status' => $valid_status
+        );
+        $addon = $this->Addon->find($_conditions, null , null , 1);
+
+        $service = @$this->link_sharing_services[$_GET['service']];
+
+        // Panic if either the addon or the sharing service is not found.
+        if (empty($addon) || empty($service)) {
+            $this->flash(_('error_addon_notfound'), '/', 3);
+            return;
+        }
+
+        $this->publish('addon_id', $id);
+
+        // Build a suitable link title based on the addon name, version, and 
+        // the site title.
+        $title = 
+            sprintf(
+                _('addons_display_pagetitle'), 
+                $addon['Translation']['name']['string'].' '.
+                $addon['Version'][0]['version']
+            ) . 
+            ' :: '.
+            sprintf(
+                _('addons_home_pagetitle'), 
+                APP_PRETTYNAME
+            );
+
+        $this->publish('share_title', $title);
+
+        // Come up with description text from the summary
+        $this->publish('description', $addon['Translation']['summary']['string']);
+
+        $this->publish('service_url', $service['url']);
+
+        $this->layout = 'ajax';
     }
     
     /**
@@ -101,6 +193,16 @@ class AddonsController extends AppController
             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, 
+        // localized strings with placeholders, or counts from the DB.
+        $this->set('link_sharing_services', $this->link_sharing_services);
+
         if($loggedIn) {
           $isauthor = $this->Amo->checkOwnership($id, $addon_data['Addon'], true);
           $this->publish('isAuthor', $isauthor);
@@ -119,7 +221,7 @@ class AddonsController extends AppController
             $_addoncriteria = array(
                 'Addon.id' => $_addonids,
                 'Addon.inactive' => 0,
-                'Addon.status' => $this->status
+                'Addon.status' => $valid_status
             );
             $authorAddons = $this->Addon->findAll($_addoncriteria, null, 'Translation.name');
         } else {
diff --git a/site/app/controllers/admin_controller.php b/site/app/controllers/admin_controller.php
index eb90afb..bea1f6c 100644
--- a/site/app/controllers/admin_controller.php
+++ b/site/app/controllers/admin_controller.php
@@ -1502,6 +1502,7 @@ class AdminController extends AppController
         $_constants = $_constants['user'];
         ksort($_constants);
 
+        $_constants['ANON_BIND_PW']          = '--removed--';
         $_constants['DB_USER']               = '--removed--';
         $_constants['DB_PASS']               = '--removed--';
         $_constants['SHADOW_DB_USER']        = '--removed--';
diff --git a/site/app/controllers/compatibility_controller.php b/site/app/controllers/compatibility_controller.php
index 014f2cb..9a9754f 100644
--- a/site/app/controllers/compatibility_controller.php
+++ b/site/app/controllers/compatibility_controller.php
@@ -88,7 +88,7 @@ class CompatibilityController extends AppController
         global $compatibility_versions;
         if (!in_array($version, $compatibility_versions)) $version = COMPAT_DEFAULT_VERSION;
         
-        $data = unserialize(file_get_contents(NETAPP_STORAGE.'/compatibility.serialized'));
+        $data = unserialize(file_get_contents(NETAPP_STORAGE.'/compatibility-fx-'.$version.'.serialized'));
         
         $this->publish('totals', $data['totals']);
         $this->publish('version', $version);
@@ -107,7 +107,7 @@ class CompatibilityController extends AppController
         global $compatibility_versions;
         if (!in_array($version, $compatibility_versions)) $version = COMPAT_DEFAULT_VERSION;
         
-        $data = unserialize(file_get_contents(NETAPP_STORAGE.'/compatibility.serialized'));
+        $data = unserialize(file_get_contents(NETAPP_STORAGE.'/compatibility-fx-'.$version.'.serialized'));
         
         $this->publish('addons', $data['addons']);
         $this->publish('totals', $data['totals']);
diff --git a/site/app/controllers/components/amo.php b/site/app/controllers/components/amo.php
index fa2cad1..a8b61b4 100644
--- a/site/app/controllers/components/amo.php
+++ b/site/app/controllers/components/amo.php
@@ -221,7 +221,7 @@ class AmoComponent extends Object {
      */
     function getStatusNames() {
         return array(
-            STATUS_NULL      => ___('Incomplete'),
+            STATUS_NULL      => ___('addons_status_incomplete', 'Incomplete'),
             STATUS_SANDBOX   => ___('addons_status_sandbox', 'In Sandbox'),
             STATUS_PENDING   => ___('addons_status_pending', 'In Sandbox; Pending Review'),
             STATUS_NOMINATED => ___('addons_status_nominated', 'In Sandbox; Public Nomination'),
diff --git a/site/app/controllers/components/developers.php b/site/app/controllers/components/developers.php
index 83b277c..7ccd263 100644
--- a/site/app/controllers/components/developers.php
+++ b/site/app/controllers/components/developers.php
@@ -659,9 +659,9 @@ class DevelopersComponent extends Object {
         
         // Move file
         if (file_exists($currentPath)) {
-            // Delete file if one already exists
+            // Bail if the file exists. See bug 470652 for a rough explanation
             if (file_exists($newPath)) {
-                unlink($newPath);
+                return sprintf(___('devcp_error_file_exists'), $filename);
             }
             // We must copy instead of rename now in case there are other platforms
             if (!copy($currentPath, $newPath)) {
diff --git a/site/app/controllers/components/editors.php b/site/app/controllers/components/editors.php
index 0abb343..4b9dd47 100644
--- a/site/app/controllers/components/editors.php
+++ b/site/app/controllers/components/editors.php
@@ -54,7 +54,7 @@ class EditorsComponent extends Object {
     function reviewNominatedAddon($addon, $data) {
         //Make sure add-on is actually nominated
         if ($addon['Addon']['status'] != STATUS_NOMINATED) {
-            $this->controller->Errors->addError(_('This add-on has not been nominated'));
+            $this->controller->Error->addError(___('editor_review_error_addon_not_nominated', 'This add-on has not been nominated'));
             return false;
         }
         
@@ -76,12 +76,12 @@ class EditorsComponent extends Object {
             $addonData['status'] = STATUS_NOMINATED;
         }
         else {
-            $this->controller->Error->addError(_('Please select a review action.'));
+            $this->controller->Error->addError(___('editor_review_error_no_action', 'Please select a review action.'));
             return false;
         }
         
         if (empty($data['Approval']['comments'])) {
-            $this->controller->Error->addError(_('Please enter review comments.'));
+            $this->controller->Error->addError(___('editor_review_error_no_comments', 'Please enter review comments.'));
             return false;
         }
         
@@ -158,7 +158,7 @@ class EditorsComponent extends Object {
     */
     function reviewPendingFiles($addon, $data) {
         if (empty($data['Approval']['File'])) {
-            $this->controller->addError(_('Please select at least one file to review.'));
+            $this->controller->addError(___('editor_review_error_no_files', 'Please select at least one file to review.'));
             return false;
         }
             
@@ -179,22 +179,22 @@ class EditorsComponent extends Object {
             $fileData['status'] = STATUS_PENDING;
         }
         else {
-            $this->controller->Error->addError(_('Please select a review action.'));
+            $this->controller->Error->addError(___('editor_review_error_no_action', 'Please select a review action.'));
             return false;
         }
         
         if (empty($data['Approval']['comments'])) {
-            $this->controller->Error->addError(_('Please enter review comments.'));
+            $this->controller->Error->addError(___('editor_review_error_no_comments', 'Please enter review comments.'));
             return false;
         }
 
         if (empty($data['Approval']['applications'])) {
-            $this->controller->Error->addError(_('Please enter the tested applications.'));
+            $this->controller->Error->addError(___('editor_review_error_no_applications', 'Please enter the tested applications.'));
             return false;
         }
         
         if (empty($data['Approval']['os'])) {
-            $this->controller->Error->addError(_('Please enter the tested operating systems.'));
+            $this->controller->Error->addError(___('editor_review_error_no_operating_system', 'Please enter the tested operating systems.'));
             return false;
         }
         
@@ -210,7 +210,7 @@ class EditorsComponent extends Object {
                 
                 // Make sure file is pending review
                 if ($file['File']['status'] != STATUS_PENDING) {
-                    $this->controller->Error->addError(_('File not pending review.'));
+                    $this->controller->Error->addError(___('editor_review_error_file_not_pending', 'File not pending review.'));
                     return false;
                 }
                 
@@ -262,13 +262,16 @@ class EditorsComponent extends Object {
                            'version' => !empty($version) ? $version['Version']['version'] : '',
                            'files' => $files
                            );
-        
         $this->controller->set('info', $emailInfo);
         
         if ($data['Approval']['ActionField'] != 'superreview') {
             $this->controller->Email->template = 'email/pending/'.$data['Approval']['ActionField'];
             $this->controller->Email->to = $emailInfo['email'];
+<<<<<<< HEAD:site/app/controllers/components/editors.php
             $this->controller->Email->subject = sprintf(_('Sugar Labs Activities: %s %s'), $emailInfo['name'], $emailInfo['version']);
+=======
+            $this->controller->Email->subject = sprintf('Mozilla Add-ons: %s %s', $emailInfo['name'], $emailInfo['version']);
+>>>>>>> svn:site/app/controllers/components/editors.php
         }
         else {
             $this->controller->Email->template = 'email/superreview';
@@ -282,6 +285,52 @@ class EditorsComponent extends Object {
     }
     
     /**
+     * Request more information from an author regarding an update/nomination
+     * request
+     */
+    function requestInformation($addon, $data) {
+        global $valid_status;
+        
+        // store information request
+        $session = $this->controller->Session->read('User');
+        foreach($data['Approval']['File'] as $_fid) {
+            if ($_fid > 0) {
+                $file_id = $_fid;
+                break;
+            }
+        }
+        $approvalData = array(
+            'user_id' => $session['id'],
+            'reviewtype' => 'info',
+            'action' => 0,
+            'addon_id' => $addon['Addon']['id'],
+            'comments' => $data['Approval']['comments']
+        );
+        $this->controller->Approval->save($approvalData);
+        $infoid = $this->controller->Approval->getLastInsertID();
+        
+        // send email to all authors
+        $authors = array();
+        foreach ($addon['User'] as &$user) $authors[] = $user['email'];
+        
+        $versionid = $this->controller->Version->getVersionByAddonId($addon['Addon']['id'], $valid_status);
+        $version = $this->controller->Version->findById($versionid, null, null, -1);
+        
+        $emailInfo = array(
+            'name' => $addon['Translation']['name']['string'],
+            'infoid' => $infoid,
+            'reviewer' => $session['firstname'].' '.$session['lastname'],
+            'comments' => $data['Approval']['comments'],
+            'version' => !empty($version) ? $version['Version']['version'] : ''
+        );
+        $this->controller->publish('info', $emailInfo, false);
+        $this->controller->Email->template = 'email/inforequest';
+        $this->controller->Email->to = implode(', ', $authors);
+        $this->controller->Email->subject = sprintf('Mozilla Add-ons: %s %s', $emailInfo['name'], $emailInfo['version']);
+        $this->controller->Email->send();
+    }
+    
+    /**
      * Jump to specific item in queue
      * redirects to review page if item was found, to queue otherwise
      * @param string $listtype 'nominated' or 'pending'
@@ -318,5 +367,39 @@ class EditorsComponent extends Object {
         // if we did not find anything, redirect to queue
         $this->controller->redirect("/editors/queue/{$listtype}");
     }
+    
+    /**
+     * Notify subscribed editors of an add-on's update
+     * @param int $addonid ID of add-on that was updated
+     * @param int $versionid ID of the add-on's new version
+     */
+    function updateNotify($addonid, $versionid) {
+        $_ids = $this->controller->EditorSubscription->getSubscribers($addonid);
+        if (empty($_ids)) return;
+        $subscribers = $this->controller->User->findAllById($_ids, null, null, null, null, -1);
+        
+        $addon = $this->controller->Addon->getAddon($addonid);
+        $version = $this->controller->Version->findById($versionid, null, null, null, null, -1);
+        
+        // send out notification email(s)
+        $emailInfo = array(
+            'id' => $addonid,
+            'name' => $addon['Translation']['name']['string'],
+            'versionid' => $versionid,
+            'version' => $version['Version']['version']
+        );
+        $this->controller->publish('info', $emailInfo, false);
+        
+        $this->controller->Email->template = '../editors/email/notify_update';
+        $this->controller->Email->subject = sprintf('Mozilla Add-ons: %s Updated', $emailInfo['name']);
+        
+        foreach ($subscribers as &$subscriber) {
+            $this->controller->Email->to = $subscriber['User']['email'];
+            $result = $this->controller->Email->send();
+            // unsubscribe user from further updates
+            $this->controller->EditorSubscription->cancelUpdates($subscriber['User']['id'], $addonid);
+        }
+        
+    }
 }
 ?>
diff --git a/site/app/controllers/developers_controller.php b/site/app/controllers/developers_controller.php
index b46bcd1..8ff0a4f 100644
--- a/site/app/controllers/developers_controller.php
+++ b/site/app/controllers/developers_controller.php
@@ -40,8 +40,11 @@ require_once('Archive/Zip.php');
 class DevelopersController extends AppController
 {
     var $name = 'Developers';
-    var $uses = array('Addon', 'Addontype', 'Application', 'Appversion', 'Eventlog', 'File', 'Platform', 'Preview', 'Review', 'Tag', 'Translation', 'User', 'Version');
-    var $components = array('Amo', 'Developers', 'Error', 'Image', 'Opensearch', 'Rdf', 'Src', 'Versioncompare');
+    var $uses = array('Addon', 'Addontype', 'Application', 'Approval', 'Appversion',
+        'EditorSubscription', 'Eventlog', 'File', 'Platform', 'Preview', 'Review',
+        'Tag', 'Translation', 'User', 'Version');
+    var $components = array('Amo', 'Developers', 'Editors', 'Email', 'Error',
+        'Image', 'Opensearch', 'Rdf', 'Src', 'Versioncompare');
     var $helpers = array('Html', 'Javascript', 'Ajax', 'Link', 'Listing', 'Localization', 'Form');
     var $addVars = array(); //variables accessible to all additem steps
 
@@ -226,7 +229,7 @@ class DevelopersController extends AppController
         if (!in_array($data['Addon']['addontype_id'], array(ADDON_SEARCH, ADDON_ACTIVITY))) {
             // Make sure GUID doesn't exist already
             if ($existing = $this->Addon->findAll("Addon.guid='{$data['Addon']['guid']}'")) {
-                return $this->Error->getJSONforError(sprintf('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>.', $data['Addon']['guid'], $this->url("/developers/versions/add/{$existing[0]['Addon']['id']}")));
+                return $this->Error->getJSONforError(sprintf(___('devcp_new_addon_error'), $data['Addon']['guid'], $this->url("/developers/versions/add/{$existing[0]['Addon']['id']}")));
             }
         }
         
@@ -296,7 +299,7 @@ class DevelopersController extends AppController
         // Make sure user has upload permissions
         $role = $this->Amo->getAuthorRole($addon_id);
         if (empty($role) || $role < AUTHOR_ROLE_DEV) {
-            return $this->Error->getJSONforError('You do not have sufficient privileges to update this add-on.');
+            return $this->Error->getJSONforError(___('devcp_update_addon_priv_error'));
         }
         
         $addon = $this->Addon->findById($addon_id);
@@ -305,7 +308,7 @@ class DevelopersController extends AppController
         if ($data['Addon']['addontype_id'] != ADDON_SEARCH) {
             // Make sure GUID matches add-on ID
             if ($addon['Addon']['guid'] != $data['Addon']['guid']) {
-                return $this->Error->getJSONforError(sprintf('The add-on GUID used in this file (%1$s) does not match the existing GUID for this add-on (%2$s).', $data['Addon']['guid'], $addon['Addon']['guid']));
+                return $this->Error->getJSONforError(sprintf(___('devcp_update_addon_guid_error'), $data['Addon']['guid'], $addon['Addon']['guid']));
             }
         }
         
@@ -313,7 +316,7 @@ class DevelopersController extends AppController
             // Make sure version doesn't exist already
             $vcheck = $this->Version->find("Version.addon_id={$addon_id} AND Version.version='{$data['Version']['version']}'");
             if (!empty($vcheck)) {
-                return $this->Error->getJSONforError(sprintf('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>.', $data['Version']['version'], $this->url('/developers/versions/addfile/'.$vcheck['Version']['id'])));
+                return $this->Error->getJSONforError(sprintf(___('devcp_update_addon_version_exists_error'), $data['Version']['version'], $this->url('/developers/versions/addfile/'.$vcheck['Version']['id'])));
             }
             
             
@@ -334,6 +337,9 @@ class DevelopersController extends AppController
                     $this->Version->addCompatibleApp($version_id, $appversion['application_id'], $appversion['min'], $appversion['max']);
                 }
             }
+            
+            // notify subscribed editors of update (if any)
+            $this->Editors->updateNotify($addon['Addon']['id'], $version_id);
         }
         elseif ($type == 'file') {
             $version_id = $this->data['Version']['id'];
@@ -341,12 +347,13 @@ class DevelopersController extends AppController
             // Make sure version id belongs to this add-on
             $vcheck = $this->Version->find("Version.id={$version_id} AND Version.addon_id={$addon_id}");
             if (empty($vcheck)) {
+                return $this->Error->getJSONforError(sprintf(___('devcp_update_addon_version_belong_error'), $version_id, $addon_id));
                 return $this->Error->getJSONforError(sprintf('The specified version (%1$s) does not belong to this add-on (%2$s).', $version_id, $addon_id));
             }
             
             // Make sure version number matches
             if ($vcheck['Version']['version'] != $data['Version']['version']) {
-                return $this->Error->getJSONforError(sprintf('The uploaded version number (%1$s) does not match the existing version number (%2$s).', $data['Version']['version'], $vcheck['Version']['version']));
+                return $this->Error->getJSONforError(sprintf(___('devcp_update_addon_version_match_error'), $data['Version']['version'], $vcheck['Version']['version']));
             }
         }
         $data['Version']['id'] = $version_id;
@@ -560,7 +567,7 @@ class DevelopersController extends AppController
             );
         }
         else {
-            return $this->Error->getJSONforError('No account found for that email address.');
+            return $this->Error->getJSONforError(___('devcp_verify_author_error'));
         }
     }
     
@@ -900,7 +907,7 @@ class DevelopersController extends AppController
     function _addonStatusAction($action) {
         $this->publish('subaction', $action);
         
-        $addon = $this->Addon->findById($this->viewVars['addon_id'], array('addontype_id', 'nominationmessage', 'status', 'higheststatus'), null, -1);
+        $addon = $this->Addon->findById($this->viewVars['addon_id'], array('id', 'addontype_id', 'nominationmessage', 'status', 'higheststatus'), null, -1);
         $this->publish('addon', $addon);
         
         // Complete an add-on
@@ -960,6 +967,11 @@ class DevelopersController extends AppController
                     $addonData = array('status' => STATUS_NOMINATED, 'nominationmessage' => $this->params['form']['data']['Addon']['nominationmessage']);
                     $this->Addon->save($addonData);
                     $this->publish('success', true);
+                    
+                    // notify subscribed editors of update
+                    global $valid_status;
+                    $version_id = $this->Version->getVersionByAddonId($addon['Addon']['id'], $valid_status);
+                    $this->Editors->updateNotify($addon['Addon']['id'], $version_id);
                 }
             }
             
@@ -1079,7 +1091,7 @@ class DevelopersController extends AppController
         
         // Make sure user has permission
         if ($this->viewVars['author_role'] < AUTHOR_ROLE_DEV) {
-            $this->flash('You do not have privileges to delete versions or files.', '/developers/versions/edit/'.$version_id, 6);
+            $this->flash(___('devcp_delete_version_priv_error'), '/developers/versions/edit/'.$version_id, 6);
             return;
         }
         
@@ -1290,7 +1302,7 @@ class DevelopersController extends AppController
             // flush cached add-on objects
             if (QUERY_CACHE) $this->Addon->Cache->markListForFlush("addon:{$addon_id}");
             
-            $messages['success'][] = 'Please note that some changes may take several hours to appear in all areas of the website.';
+            $messages['success'][] = ___('devcp_several_hours');
             $this->publish('messages', $messages);
         }
         
@@ -1335,7 +1347,7 @@ class DevelopersController extends AppController
             // Check for allowed file extensions
             $extension = strtolower(substr($name, strrpos($name, '.')));
             if (!in_array($extension, $this->Developers->imageExtensions)) {
-                $return['errors'][] = sprintf('File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s', $name, $extension, implode(', ', $this->Developers->imageExtensions));
+                $return['errors'][] = sprintf(___('devcp_add_previews_extension_error'), $name, $extension, implode(', ', $this->Developers->imageExtensions));
                 continue;
             }
             
@@ -1363,12 +1375,12 @@ class DevelopersController extends AppController
             // Save preview to db
             if ($this->Preview->save($previewData)) {
                 if (in_array($id, $existing))
-                    $return['success'][] = sprintf('Preview %1$s was replaced with file %2$s successfully.', $id, $name);
+                    $return['success'][] = sprintf(___('devcp_add_previews_success_replace'), $id, $name);
                 else
-                    $return['success'][] = sprintf('File %s was uploaded successfully. You can add a caption below.', $name);
+                    $return['success'][] = sprintf(___('devcp_add_previews_success_upload'), $name);
             }
             else
-                $return['errors'][] = sprintf('File %s could not be saved to the database. Please try again.', $name);
+                $return['errors'][] = sprintf(___('devcp_add_previews_save_error'), $name);
         }
         
         return $return;
@@ -1387,14 +1399,87 @@ class DevelopersController extends AppController
             // Delete the preview
             $this->Preview->id = $id;
             if ($this->Preview->delete())
-                $return['success'][] = sprintf('Preview %s has been deleted successfully.', $id);
+                $return['success'][] = sprintf(___('devcp_delete_previews_success'), $id);
             else
-                $return['errors'][] = sprintf('Preview %s could not be deleted from the database. Please try again.', $id);
+                $return['errors'][] = sprintf(___('devcp_delete_previews_error'), $id);
         }
         
         return $return;
     }
     
+    /**
+     * Discuss a review request with an editor
+     */
+    function discuss($infoid) {
+        global $valid_status;
+        
+        $inforequest = $this->Approval->findById($infoid);
+        if (empty($inforequest)) {
+            $this->flash(_('error_addon_notfound'), '/developers/index');
+            return;
+        }
+        // Make sure user has some permissions to view this add-on
+        $role = $this->Amo->getAuthorRole($inforequest['Approval']['addon_id']);
+        if (empty($role)) $this->Amo->accessDenied();
+        
+        $this->publish('inforequest', $inforequest);
+        
+        $addon = $this->Addon->getAddon($inforequest['Approval']['addon_id'], array('authors'));
+        $this->publish('addonName', $addon['Translation']['name']['string']);
+        
+        $versionid = $this->Version->getVersionByAddonId($addon['Addon']['id'], $valid_status);
+        $version = $this->Version->findById($versionid, null, null, -1);
+        $this->publish('versionno', $version['Version']['version']);
+        
+        // grab replies
+        $replies = $this->Approval->findAll(array('reply_to' => $infoid), null, 'Approval.created');
+        $this->publish('replies', $replies);
+        
+        if (!empty($this->data)) {
+            $session = $this->Session->read('User');
+            
+            // reply submitted
+            $approvalData = array(
+                'user_id' => $session['id'],
+                'reviewtype' => 'info',
+                'action' => 0,
+                'reply_to' => $infoid,
+                'addon_id' => $addon['Addon']['id'],
+                'comments' => $this->data['Approval']['comments']
+            );
+            if (true === $this->Approval->save($approvalData)) {
+                $this->set('success', true);
+                
+                // add this to the replies set
+                $replies[] = $this->Approval->findById($this->Approval->getLastInsertID());
+                $this->publish('replies', $replies);
+                
+                // send email to all authors and the editor, but not the current user
+                $recipients = array();
+                foreach ($addon['User'] as &$user) $recipients[] = $user['email'];
+                $recipients[] = $inforequest['User']['email'];
+                foreach ($replies as &$reply) $recipients[] = $reply['User']['email'];
+                $recipients = array_diff(array_unique($recipients), array($session['email'])); // remove current user
+                
+                $emailInfo = array(
+                    'name' => $addon['Translation']['name']['string'],
+                    'infoid' => $infoid,
+                    'sender' => $session['firstname'].' '.$session['lastname'],
+                    'comments' => $this->data['Approval']['comments'],
+                    'version' => !empty($version) ? $version['Version']['version'] : ''
+                );
+                $this->publish('info', $emailInfo, false);
+                $this->Email->template = '../editors/email/inforequest_reply';
+                $this->Email->subject = sprintf('Mozilla Add-ons: %s %s', $emailInfo['name'], $emailInfo['version']);
+                foreach ($recipients as &$recipient) {
+                    $this->Email->to = $recipient;
+                    $this->Email->send();
+                }
+            }
+        }
+        $this->render();
+    }
+    
    /**
     * Index
     */
@@ -2391,10 +2476,10 @@ class DevelopersController extends AppController
                 
                 //Update/insert icon
                 if (!empty($this->data['Addon']['icon']['name'])) {
-                    $fileErrors = array('1' => _('Exceeds maximum upload size'),
-                                        '2' => _('Exceeds maximum upload size'),
-                                        '3' => _('Incomplete transfer'),
-                                        '4' => _('No file uploaded')
+                    $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');
                     
diff --git a/site/app/controllers/editors_controller.php b/site/app/controllers/editors_controller.php
index 3770b91..03957bf 100644
--- a/site/app/controllers/editors_controller.php
+++ b/site/app/controllers/editors_controller.php
@@ -41,7 +41,10 @@
 class EditorsController extends AppController
 {
     var $name = 'Editors';
-    var $uses = array('Addon', 'AddonTag', 'Addontype', 'Application', 'Approval', 'Appversion', 'Cannedresponse', 'Eventlog', 'Favorite', 'File', 'Platform', 'Review', 'ReviewsModerationFlag', 'Tag', 'Translation', 'User', 'Version');
+    var $uses = array('Addon', 'AddonTag', 'Addontype', 'Application', 'Approval',
+        'Appversion', 'Cannedresponse', 'EditorSubscription', 'Eventlog', 'Favorite',
+        'File', 'Platform', 'Review', 'ReviewsModerationFlag', 'Tag', 'Translation',
+        'User', 'Version');
     var $components = array('Amo', 'Audit', 'Developers', 'Editors', 'Email', 'Error', 'Image', 'Pagination');
     var $helpers = array('Html', 'Javascript', 'Ajax', 'Listing', 'Localization', 'Pagination');
 
@@ -400,7 +403,11 @@ class EditorsController extends AppController
 
         if (!empty($this->data)) {
             //pr($this->data);
-            if ($this->data['Approval']['Type'] == 'nominated') {
+            if ($this->data['Approval']['ActionField'] == 'info') {
+                // request more information
+                $this->Editors->requestInformation($addon, $this->data);
+            }
+            elseif ($this->data['Approval']['Type'] == 'nominated') {
                 $this->Editors->reviewNominatedAddon($addon, $this->data);
             }
             else {
@@ -408,6 +415,10 @@ class EditorsController extends AppController
             }
             
             if ($this->Error->noErrors()) {
+                // if editor chose to be reminded of the next upcoming update, save this
+                if ($this->data['Approval']['subscribe'])
+                    $this->EditorSubscription->subscribeToUpdates($session['id'], $addon['Addon']['id']);
+                
                 $this->flash(_('editors_reviewed_successfully'), '/editors/queue/'.$this->data['Approval']['Type']);
                 return;
             }
@@ -462,10 +473,17 @@ class EditorsController extends AppController
                                     ));
                                     
         //Review History
-        if ($history = $this->Approval->findAllByAddon_id($addon['Addon']['id'])) {
-            foreach ($history as $k => $hist) {
-                $vLookup = $this->Version->findById($hist['File']['version_id'], array('Version.version'));
-                $history[$k] = array_merge_recursive($history[$k], $vLookup);
+        if ($history = $this->Approval->findAll(array('Approval.addon_id' => $addon['Addon']['id'], 'reply_to IS NULL'))) {
+            foreach ($history as $k => &$hist) {
+                if (!empty($hist['File']['id'])) {
+                    $vLookup = $this->Version->findById($hist['File']['version_id'], array('Version.version'));
+                    $history[$k] = array_merge_recursive($history[$k], $vLookup);
+                }
+                
+                // add replies to information requests
+                if ($hist['Approval']['reviewtype'] == 'info') {
+                    $hist['replies'] = $this->Approval->findAll(array('Approval.reply_to' => $hist['Approval']['id']), null, 'Approval.created');
+                }
             }
         }
         
@@ -489,6 +507,7 @@ class EditorsController extends AppController
         $this->publish('version', $version);
         $this->publish('platforms', $platforms);
         $this->publish('addontypes', $this->Addontype->getNames());
+        $this->publish('addontype', $addon['Addon']['addontype_id']);
         $this->publish('approval', $this->Amo->getApprovalStatus());  
         $this->publish('history', $history); 
         $this->publish('errors', $this->Error->errors);
diff --git a/site/app/controllers/files_controller.php b/site/app/controllers/files_controller.php
index 837779c..da78b3c 100644
--- a/site/app/controllers/files_controller.php
+++ b/site/app/controllers/files_controller.php
@@ -84,6 +84,8 @@ class FilesController extends AppController
             return;
         }
 
+        $addontype = $addon['Addon']['addontype_id'];
+        $startfile = 'install.rdf';
         $path = REPO_PATH.'/'.$this->Addon->id.'/'.$file['File']['filename'];
 
         if (!file_exists($path)) {
@@ -98,45 +100,53 @@ class FilesController extends AppController
 
         //If a specific file is requested, show it
         if (!empty($_GET['view'])) {
-            $this->_view($path, $_GET['view']);
+            $this->_view($path, $_GET['view'], $addontype);
             return;
         }
-        
-        $zip = new Archive_Zip($path);
-        $contents = $zip->listContent();
 
         $files = array();
-        foreach ($contents as $content) {
-            $isJar = false;
 
-            if (substr($content['filename'], strrpos($content['filename'], '.')) == '.jar') {
-                $content['folder'] = 1;
-                $isJar = true;
-            }
+        if ($addontype === ADDON_SEARCH) {
+            $startfile = $file['File']['filename'];
+            $this->Filebrowser->buildContentsArray($startfile, false, false, $files);
+        } else {
+            $zip = new Archive_Zip($path);
+            $contents = $zip->listContent();
 
-            $this->Filebrowser->buildContentsArray($content['filename'], $content['folder'], false, $files);
+            foreach ($contents as $content) {
+                $isJar = false;
 
-            if ($isJar == true) {
-                $filename = substr($content['filename'], strrpos($content['filename'], '/'));
-                $jarfile = $zip->extract(array('extract_as_string' => true, 'by_name' => array($content['filename'])));
+                if (substr($content['filename'], strrpos($content['filename'], '.')) == '.jar') {
+                    $content['folder'] = 1;
+                    $isJar = true;
+                }
 
-                //write a .jar file with the .jar contents to extract in a new Archive_Zip
-                //I spent a long time trying to figure out an easier way, but no such luck
-                $jarcontents = $this->Filebrowser->getJarContents(REPO_PATH.'/temp'.$filename, $jarfile[0]['content']);
+                $this->Filebrowser->buildContentsArray($content['filename'], $content['folder'], false, $files);
 
-                foreach ($jarcontents as $jarcontent) {
-                    $this->Filebrowser->buildContentsArray($content['filename'].'/'.$jarcontent['filename'], $jarcontent['folder'], false, $files);
-                }
+                if ($isJar == true) {
+                    $filename = substr($content['filename'], strrpos($content['filename'], '/'));
+                    $jarfile = $zip->extract(array('extract_as_string' => true, 'by_name' => array($content['filename'])));
+
+                    //write a .jar file with the .jar contents to extract in a new Archive_Zip
+                    //I spent a long time trying to figure out an easier way, but no such luck
+                    $jarcontents = $this->Filebrowser->getJarContents(REPO_PATH.'/temp'.$filename, $jarfile[0]['content']);
+
+                    foreach ($jarcontents as $jarcontent) {
+                        $this->Filebrowser->buildContentsArray($content['filename'].'/'.$jarcontent['filename'], $jarcontent['folder'], false, $files);
+                    }
 
+                }
             }
         }
 
         $this->publish('id', $file_id);
-        $this->publish('contents', $contents);
         $this->publish('files', $files);
         $this->publish('version', $file['Version']['id']);
         $this->publish('addon', $this->Addon->id);
+        $this->publish('addonname', $addon['Translation']['name']['string']);
         $this->publish('review', $review);
+        $this->publish('addontype', $addontype);
+        $this->publish('startfile', $startfile);
         $this->render('browse', 'ajax');
     }
     
@@ -145,9 +155,10 @@ class FilesController extends AppController
     * @param string $path the package
     * @param string $file the file
     */
-    function _view($path, $file) {
+    function _view($path, $file, $addontype) {
         $file = html_entity_decode(urldecode($file), ENT_QUOTES, 'UTF-8');
-        $contents = $this->_get_contents($path, $file);
+        $contents = $this->_get_contents($path, $file, $addontype);
+
         if (is_bool($contents) && $contents == false) {
             $this->flash(_('error_file_notfound'), '/');
             return;
@@ -186,6 +197,7 @@ class FilesController extends AppController
             return;
         }
 
+        $addontype = $addon['Addon']['addontype_id'];
         $path = REPO_PATH.'/'.$this->Addon->id.'/'.$file['File']['filename'];
 
         if (!file_exists($path)) {
@@ -196,7 +208,7 @@ class FilesController extends AppController
         if (!empty($_GET['compare'])) {
             $public_path = REPO_PATH.'/'.$this->Addon->id.'/'.$public_file['File'][0]['filename'];
             $sandbox_path = REPO_PATH.'/'.$this->Addon->id.'/'.$sandbox_file['File']['filename'];
-            $this->_compare($sandbox_path, $public_path, html_entity_decode($_GET['compare'], ENT_QUOTES, 'UTF-8'));
+            $this->_compare($sandbox_path, $public_path, html_entity_decode($_GET['compare'], ENT_QUOTES, 'UTF-8'), $addontype);
 
             return;
         }
@@ -269,12 +281,13 @@ class FilesController extends AppController
         $this->publish('addon', $this->Addon->id);
         $this->publish('review', 1);
         $this->publish('is_diff', true);
+        $this->publish('startfile', 'install.rdf');
         $this->render('browse', 'ajax');
     }
 
-    function _compare($sandbox_path, $public_path, $file) {
-        $sandbox_contents = $this->_get_contents($sandbox_path, $file);
-        $public_contents = $this->_get_contents($public_path, $file);
+    function _compare($sandbox_path, $public_path, $file, $addontype) {
+        $sandbox_contents = $this->_get_contents($sandbox_path, $file, $addontype);
+        $public_contents = $this->_get_contents($public_path, $file, $addontype);
         $diff = "";
 
         if ($sandbox_contents === false) {
@@ -387,9 +400,21 @@ class FilesController extends AppController
         $this->render('view', 'ajax');
     }
 
-    function _get_contents($path, $file) {
+    /* $path must refer to a file that exists */
+    function _get_contents($path, $file, $addontype) {
         $this->Amo->clean($path);
 
+        // Search engine. Safe to output directly
+        if ($addontype === ADDON_SEARCH) {
+            // We have to make sure that the file in $path and $file match.
+            // Otherwise we reproduce bug 461253
+            if (substr($path, -(strlen($file))) == $file) {
+                return file_get_contents($path);
+            } else {
+                return false;
+            }
+        }
+
         if (preg_match("/^(.+\.jar)\/(.+)$/is", $file, $matches)) {
             $file = $matches[1];
             $jarfile = $matches[2];
diff --git a/site/app/controllers/pages_controller.php b/site/app/controllers/pages_controller.php
index 458c892..c22cd47 100644
--- a/site/app/controllers/pages_controller.php
+++ b/site/app/controllers/pages_controller.php
@@ -67,7 +67,7 @@ class PagesController extends AppController{
         $path = func_get_args();
         $path_string = join('/', $path);
 
-        if (!count($path)) {
+        if (!count($path) || ($path[0] == 'home')) {
             $this->redirect('/');
         }
 
@@ -90,8 +90,6 @@ class PagesController extends AppController{
             $title = ___('page_title_appversions', _('pages_appversions_header')); break;
         case 'credits':
             $title = ___('page_title_credits', 'Credits'); break;
-        case 'experimental_addons':
-            $title = ___('page_title_experimental_addons', 'Experimental Add-ons'); break;
         case 'fashionyourfirefox_faq':
             $title = ___('page_title_fashionyourfirefox_faq', 'Fashion your Firefox FAQ');
             $this->set('cssAdd', array('collection-style'));
diff --git a/site/app/controllers/reviews_controller.php b/site/app/controllers/reviews_controller.php
index 4515479..f1dad56 100644
--- a/site/app/controllers/reviews_controller.php
+++ b/site/app/controllers/reviews_controller.php
@@ -283,6 +283,7 @@ class ReviewsController extends AppController
             }
             
             if ($this->Review->save($this->data)) {
+                $this->Review->updateBayesianRating(array($id));
                 $this->render('review_added');
                 return;
             } else {
@@ -441,6 +442,10 @@ class ReviewsController extends AppController
             
             $this->Review->delete();
             
+            // update average ratings
+            debug($review['Addon']['Addon']['id']);
+            $this->Review->updateBayesianRating(array($review['Addon']['Addon']['id']));
+            
             $this->flash(_('addon_review_deleted_successfully'), "/reviews/display/{$review['Version']['addon_id']}");
             return;
         }
diff --git a/site/app/controllers/statistics_controller.php b/site/app/controllers/statistics_controller.php
index 6f1b595..7acf45e 100644
--- a/site/app/controllers/statistics_controller.php
+++ b/site/app/controllers/statistics_controller.php
@@ -223,6 +223,7 @@ class StatisticsController extends AppController
                     'statistics_js_download_csv' => ___('statistics_js_download_csv', 'View this table in CSV format'),
                     'statistics_js_groupby_selector_date' => ___('statistics_js_groupby_selector_date', 'Group by: Day'),
                     'statistics_js_groupby_selector_week' => ___('statistics_js_groupby_selector_week', 'Group by: Week'),
+                    'statistics_js_groupby_selector_week_over_week' => ___('statistics_js_groupby_selector_week_over_week', 'Compare by: Week'),
                     'statistics_js_groupby_selector_month' => ___('statistics_js_groupby_selector_month', 'Group by: Month'),
                     'statistics_js_plotselection_selector_summary' => _('statistics_js_plotselection_selector_summary'),
                     'statistics_js_plotselection_selector_downloads' => _('statistics_js_plotselection_selector_downloads'),
diff --git a/site/app/controllers/tests_controller.php b/site/app/controllers/tests_controller.php
index 66cb659..a9a9c89 100644
--- a/site/app/controllers/tests_controller.php
+++ b/site/app/controllers/tests_controller.php
@@ -149,6 +149,9 @@ class TestsController extends AppController {
         elseif (!empty($_GET['group'])) {
             TestManager::runGroup($_GET['groups'][$_GET['group']], $reporter);
         }
+        elseif (!empty($_GET['discover'])) {
+            $this->render('discover', 'ajax');
+        }
         exit();
     }
 
diff --git a/site/app/controllers/users_controller.php b/site/app/controllers/users_controller.php
index 91f8fbc..0671eff 100644
--- a/site/app/controllers/users_controller.php
+++ b/site/app/controllers/users_controller.php
@@ -131,7 +131,7 @@ class UsersController extends AppController
                     $this->User->invalidate('nickname');
             }
             
-            // any errors? Get our of here.
+            // any errors? Get out of here.
             if (!$this->User->save()) {
                 $this->publish('errorMessage', true);
                 $this->render();
diff --git a/site/app/locale/af/LC_MESSAGES/messages.po b/site/app/locale/af/LC_MESSAGES/messages.po
index d06d5d7..f4b7d45 100644
--- a/site/app/locale/af/LC_MESSAGES/messages.po
+++ b/site/app/locale/af/LC_MESSAGES/messages.po
@@ -23,6 +23,10 @@ msgstr ""
 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. :(
 #: 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
@@ -55,42 +59,38 @@ msgstr "Public"
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, fuzzy, php-format
-msgid "added"
-msgstr "Added %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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
 #, fuzzy
 msgid "addon_detail_last_updated"
 msgstr "Updated %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, fuzzy, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 #, fuzzy
 msgid "addon_downloads_total"
 msgstr "total downloads"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, fuzzy, php-format
 msgid "addon_list_category_totalcount"
@@ -109,25 +109,25 @@ msgstr "per page"
 msgid "addon_list_sortby"
 msgstr "Sort by:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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: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: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
@@ -136,7 +136,7 @@ msgstr "%1$s is not available for %2$s."
 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, fuzzy, php-format
@@ -158,6 +158,7 @@ msgstr "Review:"
 msgid "addon_review_add_submit"
 msgstr "Submit your review"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, fuzzy, php-format
 msgid "addon_review_add_title"
@@ -198,25 +199,26 @@ msgstr "Yes"
 msgid "addon_review_delete_header"
 msgstr "Delete Review"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 #, fuzzy
 msgid "addon_review_deleted_successfully"
 msgstr "Review deleted successfully."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, fuzzy, 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.
-#: controllers/reviews_controller.php:534
+#. %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:49
 #, fuzzy
 msgid "addon_review_in_moderation"
@@ -229,7 +231,7 @@ msgstr ""
 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:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
@@ -237,16 +239,16 @@ 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 addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, fuzzy, php-format
 msgid "addon_review_pagetitle"
 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:164
 #, fuzzy, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -262,13 +264,13 @@ msgstr "Developer Reply:"
 msgid "addon_review_saved_successfully"
 msgstr "Your review was saved successfully. Thanks!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, fuzzy, php-format
@@ -294,12 +296,14 @@ msgstr "Previous Add-on"
 msgid "addon_version_permalink"
 msgstr "Permanent link to this version"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
+#. %1 is the current Application name (e.g. Firefox)
+#. %2 is the Application's version number
+#: views/addons/versions.thtml:118
 #, fuzzy
-msgid "addon_versions_getlatesttext"
-msgstr "The most recent version compatible with"
+msgid "addon_versions_getlatestversion"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 #, fuzzy
 msgid "addons_author_addons_submit"
 msgstr "Go"
@@ -309,20 +313,21 @@ msgstr "Go"
 msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
@@ -332,7 +337,7 @@ msgstr "Browse %1$s Themes :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "Add a review"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 #, fuzzy
 msgid "addons_display_advanced_details"
 msgstr "Advanced Details"
@@ -342,12 +347,12 @@ msgstr "Advanced Details"
 msgid "addons_display_categories"
 msgstr "Categories"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 #, fuzzy
 msgid "addons_display_detailed_review"
 msgstr "detailed review"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 #, fuzzy
 msgid "addons_display_dont_like_it"
@@ -358,104 +363,111 @@ msgstr "Don't like it"
 msgid "addons_display_edit_review"
 msgstr "Edit your review"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 #, fuzzy
 msgid "addons_display_has_privacy"
 msgstr "This add-on has a privacy policy."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 #, fuzzy
 msgid "addons_display_header_developer_comments"
 msgstr "Developer Comments"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 #, fuzzy
 msgid "addons_display_header_homepage"
 msgstr "Homepage"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 #, fuzzy
 msgid "addons_display_header_reviews"
 msgstr "Reviews"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 #, fuzzy
 msgid "addons_display_header_support"
 msgstr "Support"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 #, fuzzy
 msgid "addons_display_like_it"
 msgstr "Like it"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 #, fuzzy
 msgid "addons_display_long_description"
 msgstr "Long Description"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 #, fuzzy
 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.
-#: views/addons/display.thtml:421
+#. %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
 #, fuzzy
 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"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, fuzzy, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: 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"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "Support for this add-on is provided by the developer at %s or by sending an "
 "e-mail to %s"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 #, fuzzy
 msgid "addons_display_rate_it"
 msgstr "Rate It"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 #, fuzzy
 msgid "addons_display_review_etiquette"
 msgstr ""
@@ -463,57 +475,57 @@ msgstr ""
 "available to add-on developers and they may need to contact you to help "
 "resolve your issue."
 
-# %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %1 is the support section link
+#: 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:379
+#: views/addons/display.thtml:403
 #, fuzzy
 msgid "addons_display_review_submit"
 msgstr "Save"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, fuzzy, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "See all reviews (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 #, fuzzy
 msgid "addons_display_version_history"
 msgstr "Complete Version History"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 #, fuzzy
 msgid "addons_display_view_source"
 msgstr "View the source"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 #, fuzzy
 msgid "addons_display_view_stats"
 msgstr "View statistics"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 #, fuzzy
 msgid "addons_display_what_do_you_think"
 msgstr "What do you think?"
@@ -525,7 +537,7 @@ msgstr "Works with:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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"
@@ -538,10 +550,11 @@ msgstr "by"
 msgid "addons_home_feature_head"
 msgstr "We Recommend"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, fuzzy, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -558,7 +571,9 @@ msgstr "Newest:"
 msgid "addons_home_other_applications"
 msgstr "Other Applications"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -568,19 +583,20 @@ msgstr "Other Applications"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -692,6 +708,7 @@ msgstr "for Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "for Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, fuzzy, php-format
 msgid "addons_plugins_looking_for_more"
@@ -713,12 +730,13 @@ msgstr ""
 "graphic formats or playing multimedia files. Plugins are slightly different "
 "from extensions, which modify or add to existing functionality."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, fuzzy, php-format
 msgid "addons_plugins_main_header"
 msgstr "Common Plugins for %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 #, fuzzy
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
@@ -731,6 +749,7 @@ msgstr "Plugins"
 msgid "addons_plugins_support_documentation"
 msgstr "Support Documentation: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, fuzzy, php-format
 msgid "addons_policy_eula_require"
@@ -738,26 +757,26 @@ msgstr ""
 "%s requires that you accept the following End-User License Agreement before "
 "installation can proceed:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, fuzzy, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Previews for %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 #, 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 #, fuzzy
 msgid "addons_recommended_pagetitle"
 msgstr "Recommended Add-ons"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 #, fuzzy
 msgid "addons_recommended_title"
 msgstr "Recommended Add-ons"
@@ -767,7 +786,7 @@ msgstr "Recommended Add-ons"
 msgid "addons_searchengines_additional_resources"
 msgstr "Additional Resources"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 #, fuzzy
 msgid "addons_searchengines_devmo_link"
@@ -788,38 +807,38 @@ msgstr ""
 "disabled.  Please enable JavaScript before trying to install any of the "
 "search plugins below."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %1 is "make your own" link
+#. %2 is MDC link
 #: 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: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: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: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:149 views/addons/searchengines.thtml:166
 #, fuzzy
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 #, fuzzy
 msgid "addons_searchengines_pagetitle"
 msgstr "Search Engines"
@@ -836,7 +855,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Disabled"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 #, fuzzy
 msgid "addons_status_incomplete"
 msgstr "Incomplete Version"
@@ -883,12 +902,13 @@ msgstr ""
 "These versions are displayed for reference and testing purposes. You should "
 "always use the latest version of an add-on."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 #, fuzzy
 msgid "addons_versions_history"
 msgstr "Version History with Changelogs"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, fuzzy, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s Version History"
@@ -903,6 +923,7 @@ msgstr "Add Group"
 msgid "admin_group_delete_pagetitle"
 msgstr "Delete Group"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, fuzzy, php-format
 msgid "admin_group_deleted"
@@ -1058,6 +1079,7 @@ 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
 #: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
@@ -1065,11 +1087,14 @@ 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: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:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
@@ -1082,27 +1107,27 @@ msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Upgrade Firefox</a> to use this add-on"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 #, fuzzy
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 #, fuzzy
 msgid "browse_addons_newest"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 #, fuzzy
 msgid "browse_addons_popular"
 msgstr "Popular Add-ons"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 #, fuzzy
 msgid "browse_addons_rated"
 msgstr "Add-ons by Rating"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 #, fuzzy
 msgid "browse_addons_updated"
 msgstr "Recently Updated Add-ons"
@@ -1142,7 +1167,7 @@ msgstr "Last Updated First"
 msgid "category_extra_mostpopular"
 msgstr "Most Popular First"
 
-# %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"
@@ -1153,12 +1178,20 @@ msgstr "See All %1$s"
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
+#. %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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 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:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
@@ -1198,6 +1231,8 @@ 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
 #: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
@@ -1226,6 +1261,10 @@ 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)
 #: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
@@ -1243,6 +1282,8 @@ msgstr ""
 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:69
 #, fuzzy
 msgid "compatibility_report_intro"
@@ -1256,6 +1297,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
@@ -1266,6 +1308,7 @@ 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
 #: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
@@ -1276,6 +1319,7 @@ 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
 #: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
@@ -1286,6 +1330,7 @@ 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
 #: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
@@ -1307,12 +1352,13 @@ msgstr "Information for Add-on Users"
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, fuzzy, php-format
 msgid "credits_contributing"
 msgstr "For information on contributing, please see our %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 #, fuzzy
 msgid "credits_contributing_wikipage"
 msgstr "wiki page"
@@ -1363,18 +1409,25 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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
@@ -1382,8 +1435,10 @@ msgstr ""
 msgid "date"
 msgstr "%B %e, %Y"
 
-# date and time format string (strftime)
+#. 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
 #, fuzzy
 msgid "datetime"
@@ -1413,16 +1468,44 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 #, fuzzy
 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"
+#: 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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 #, fuzzy
 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"
@@ -1479,42 +1562,42 @@ msgstr "Step 5: Success"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Submission Help"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 #, fuzzy
 msgid "devcp_addon_disabled_successfully"
 msgstr "Add-on disabled successfully"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 #, fuzzy
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Edit Add-on"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 #, fuzzy
 msgid "devcp_addon_enabled_successfully"
 msgstr "Add-on enabled successfully"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: 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:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 #, fuzzy
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: 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:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 #, fuzzy
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Add-on Name"
@@ -1525,47 +1608,305 @@ msgstr "Add-on Name"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Preview Caption"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 #, fuzzy
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Privacy Policy"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: 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:2455
+#: controllers/developers_controller.php:2540
 #, fuzzy
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Support Email"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 #, fuzzy
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "Support URL"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 #, fuzzy
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Version Notes"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 #, fuzzy
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Nominate Add-on"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 #, fuzzy
 msgid "devcp_addon_nominated_successfully"
 msgstr "Add-on nominated successfully!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1591,7 +1932,7 @@ msgstr ""
 "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"
@@ -1602,7 +1943,7 @@ 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
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, fuzzy, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1628,18 +1969,18 @@ msgstr ""
 "Because your add-on is trusted, this version has automatically been approved "
 "for the public area."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 #, fuzzy
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Submit Add-on"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1650,7 +1991,7 @@ 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
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, fuzzy, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1684,11 +2025,103 @@ msgstr "Next"
 msgid "devcp_change_addontype"
 msgstr "Change add-on type:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 #, fuzzy
 msgid "devcp_comments_updated"
 msgstr "Developer Comments updated."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 #, fuzzy
 msgid "devcp_details_addpreview_link"
@@ -1804,6 +2237,7 @@ msgstr "No support url provided by developer."
 msgid "devcp_details_trusted"
 msgstr "Trusted"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, fuzzy, php-format
 msgid "devcp_details_version"
@@ -1838,6 +2272,7 @@ msgstr ""
 "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"
@@ -1861,11 +2296,65 @@ msgstr ""
 "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"
+msgstr "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 #, fuzzy
 msgid "devcp_edit_author_add"
@@ -1881,11 +2370,298 @@ msgstr "Author's Email Address"
 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:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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"
@@ -1966,6 +2742,206 @@ msgstr "Target Locale"
 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: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
 #, fuzzy
 msgid "devcp_edit_submit_update"
@@ -1978,12 +2954,67 @@ 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"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 #, fuzzy
 msgid "devcp_editorsqueue_featured"
 msgstr "Featured Add-ons"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, fuzzy, php-format
@@ -1992,7 +3023,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Moderated Reviews (%s)"
 msgstr[1] "Moderated Reviews (%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
 #, fuzzy, php-format
@@ -2001,7 +3032,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Nominated Add-ons (%s)"
 msgstr[1] "Nominated Add-ons (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, fuzzy, php-format
@@ -2015,8 +3046,8 @@ 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)
+#. %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"
@@ -2047,14 +3078,14 @@ msgstr "Notes to Reviewer"
 msgid "devcp_editversion_submit_update"
 msgstr "Update"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
@@ -2062,16 +3093,17 @@ msgstr "Update"
 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: controllers/developers_controller.php:1992
 #, fuzzy
 msgid "devcp_error_addonname_not_unique"
 msgstr ""
@@ -2080,21 +3112,35 @@ msgstr ""
 "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
 #, fuzzy, 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.
 #: controllers/components/developers.php:591
 #, fuzzy
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "this page"
 
-#: controllers/developers_controller.php:2013
+#: controllers/developers_controller.php:2098
 #, fuzzy
 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
+#, fuzzy, php-format
+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
 #, fuzzy, php-format
 msgid "devcp_error_file_extension"
@@ -2102,7 +3148,7 @@ 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:1654
+#: controllers/developers_controller.php:1739
 #, fuzzy
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Not all file GUIDs match"
@@ -2137,6 +3183,8 @@ 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
 #: controllers/components/developers.php:401
 #, fuzzy, php-format
 msgid "devcp_error_icon_extension"
@@ -2144,13 +3192,14 @@ msgstr ""
 "That file extension (%s) is not allowed for an icon. Please use one of the "
 "following: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 #, fuzzy
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No install.rdf present."
@@ -2160,22 +3209,27 @@ msgstr "No install.rdf present."
 msgid "devcp_error_install_manifest"
 msgstr "The following errors were found in install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 #, fuzzy
 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.
 #: controllers/components/developers.php:569
 #: controllers/components/developers.php:581
 #, fuzzy, php-format
 msgid "devcp_error_invalid_appversion"
 msgstr "%s is not a valid version for %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, fuzzy, 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.
 #: controllers/components/developers.php:572
 #, fuzzy, php-format
 msgid "devcp_error_invalid_minversion"
@@ -2193,6 +3247,7 @@ msgstr ""
 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.
 #: controllers/components/developers.php:501
 #, fuzzy, php-format
 msgid "devcp_error_manifest_parse"
@@ -2203,6 +3258,7 @@ 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
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -2228,17 +3284,17 @@ 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:2718
+#: controllers/developers_controller.php:2803
 #, fuzzy
 msgid "devcp_error_nominate_message"
 msgstr "You must supply the requested details for nomination."
 
-#: controllers/developers_controller.php:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 #, fuzzy
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "You can only nominate add-ons currently in the sandbox."
@@ -2253,6 +3309,8 @@ 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
 #: controllers/components/developers.php:1081
 #, fuzzy, php-format
 msgid "devcp_error_preview_extension"
@@ -2260,14 +3318,14 @@ msgstr ""
 "That file extension (%s) is not allowed for a preview. Please use one of the "
 "following: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 #, fuzzy
 msgid "devcp_error_update_access_denied"
 msgstr "You do not have permission to update this add-on."
@@ -2286,7 +3344,7 @@ msgstr ""
 "Add-ons cannot use an external updateURL. Please remove this from install."
 "rdf and try again."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 #, fuzzy
 msgid "devcp_error_upload_file"
@@ -2560,7 +3618,7 @@ msgstr "My Add-ons"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Localized Fields"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, fuzzy, php-format
 msgid "devcp_localebox_intro"
@@ -2611,24 +3669,59 @@ 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.
+#: 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
 #, 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"
 
-# %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: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
 #, fuzzy
 msgid "devcp_notice_cleardefault"
@@ -2636,10 +3729,10 @@ 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"
@@ -2656,9 +3749,14 @@ msgstr ""
 "Making this the default preview will remove default status from the current "
 "default preview."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2693,6 +3791,60 @@ msgstr "Edit Preview"
 msgid "devcp_preview_updated_successfully"
 msgstr "Preview updated successfully."
 
+#: 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
 #, fuzzy
 msgid "devcp_previews_filetype_info"
@@ -2706,11 +3858,21 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Add Preview"
 
+#: views/developers/previews.thtml:79
+#, fuzzy
+msgid "devcp_previews_header_caption"
+msgstr "Preview Caption"
+
 #: views/previews/edit.thtml:43
 #, fuzzy
 msgid "devcp_previews_header_edit"
 msgstr "Edit Preview"
 
+#: views/developers/previews.thtml:94
+#, fuzzy
+msgid "devcp_previews_label_default"
+msgstr "Default Preview"
+
 #: views/previews/add.thtml:54
 #, fuzzy
 msgid "devcp_previews_label_file"
@@ -2721,6 +3883,34 @@ msgstr "Preview File"
 msgid "devcp_previews_label_makedefault"
 msgstr "Make this the default preview image"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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
 #, fuzzy
 msgid "devcp_previews_submit_delete"
@@ -2741,48 +3931,163 @@ msgstr "Edit Preview"
 msgid "devcp_previews_submit_upload"
 msgstr "Upload Preview"
 
+#: 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
 #, fuzzy
 msgid "devcp_question_addontype_incorrect"
 msgstr "Incorrect?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 #, fuzzy
 msgid "devcp_question_delete_file"
 msgstr "Are you sure you want to delete this file?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 #, fuzzy
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Please review and accept the following Developer Agreement before proceeding."
 
+#: 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
 #, 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:76
+#: views/developers/dashboard.thtml:79
 #, fuzzy, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Active Daily Users"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, fuzzy, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> Total Downloads"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, fuzzy, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Weekly Downloads"
 
-#: controllers/developers_controller.php:1481
+#: 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
 #, fuzzy
 msgid "devcp_submissions_disabled"
 msgstr ""
@@ -2790,14 +4095,14 @@ msgstr ""
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 #, fuzzy
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "I Accept"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 #, fuzzy
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "I Decline"
@@ -2817,12 +4122,12 @@ msgstr "Disabled"
 msgid "devcp_summary_header_trusted"
 msgstr "Trusted"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2833,7 +4138,7 @@ 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
+#. %1 is the link to the preview upload page
 #: views/developers/add_step5.thtml:68
 #, fuzzy, php-format
 msgid "devcp_theme_upload_preview"
@@ -2844,34 +4149,678 @@ msgstr "Please be sure to %s for your theme."
 msgid "devcp_theme_upload_preview_link"
 msgstr "upload a preview"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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
 #, fuzzy, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Please see %s for reference."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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
 #, fuzzy
 msgid "devcp_valid_app_reference_linktext"
 msgstr "this page"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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
 #, fuzzy
 msgid "devcp_version_edit_pagetitle"
 msgstr "Edit Version"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 #, fuzzy
 msgid "devcp_version_updated_successfully"
 msgstr "Version updated successfully."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 #, fuzzy
 msgid "downloads_disable_warning"
 msgstr "This add-on is disabled"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 #, fuzzy
 msgid "editorcp_logs_button_filter"
@@ -2882,7 +4831,7 @@ msgstr "Filter"
 msgid "editorcp_logs_filter_by"
 msgstr "Filter by type/action"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 #, fuzzy
 msgid "editorcp_logs_page_heading"
 msgstr "Event Log"
@@ -2947,6 +4896,7 @@ msgstr "Hide Comments"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Show Comments"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, fuzzy, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2957,7 +4907,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 #, fuzzy
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Review Log"
@@ -2987,28 +4937,28 @@ msgstr "Recent Editor Activity"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total Reviews"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 #, fuzzy
 msgid "editors_addon_review_pagetitle"
 msgstr "Review Add-on"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 #, fuzzy
 msgid "editors_error_js-formerror"
 msgstr "Please complete the following fields:"
 
-#: controllers/editors_controller.php:461
+#: 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:395
+#: controllers/editors_controller.php:398
 #, fuzzy
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Self-reviews are not allowed."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 #, fuzzy
 msgid "editors_external_software"
 msgstr "External Software"
@@ -3023,46 +4973,46 @@ msgstr "Add feature"
 msgid "editors_featured_add_feature_submit"
 msgstr "Add"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 #, fuzzy
 msgid "editors_featured_addon_remove_success"
 msgstr "Successfully removed feature."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 #, fuzzy
 msgid "editors_featured_addons_pagetitle"
 msgstr "Featured Add-ons"
@@ -3102,45 +5052,46 @@ 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
+#. %1 is the queue mode
 #: 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:258
+#: controllers/editors_controller.php:261
 #, fuzzy
 msgid "editors_one_day"
 msgstr "1 day"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 #, fuzzy
 msgid "editors_one_hour"
 msgstr "1 hour"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 #, fuzzy
 msgid "editors_one_minute"
 msgstr "1 minute"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 #, fuzzy
 msgid "editors_pagetitle"
 msgstr "Editor Tools"
 
-#: controllers/editors_controller.php:286
+#. %s is a comma separated list of platforms.  Example:  Windows, OS X
 #: 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:301
+#: 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:78
 #, fuzzy, php-format
 msgid "editors_queue_app_compatibility"
@@ -3156,23 +5107,28 @@ msgstr "Clear"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 #, fuzzy
 msgid "editors_review_action"
 msgstr "Review Action"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 #, fuzzy
 msgid "editors_review_action_public"
 msgstr "Push to Public"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 #, fuzzy
 msgid "editors_review_action_request_superreview"
 msgstr "Request Super-Review"
@@ -3182,12 +5138,20 @@ msgstr "Request Super-Review"
 msgid "editors_review_action_sandbox"
 msgstr "Retain in Sandbox"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 #, fuzzy
 msgid "editors_review_comments"
 msgstr "Review Comments"
 
-#: views/editors/review.thtml:167
+#: 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
 #, fuzzy
 msgid "editors_review_details_nominated_public"
 msgstr ""
@@ -3195,26 +5159,26 @@ msgstr ""
 "Future versions will go into the sandbox until they are reviewed by an "
 "editor."
 
-#: views/editors/review.thtml:170
+#: 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:159
+#: 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:162
+#: 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:174
+#: views/editors/review.thtml:181
 #, fuzzy
 msgid "editors_review_details_superreview"
 msgstr ""
@@ -3247,17 +5211,17 @@ msgstr "Categories:"
 msgid "editors_review_header_compatibility"
 msgstr "Compatibility:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 #, fuzzy
 msgid "editors_review_header_description"
 msgstr "Description"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 #, fuzzy
 msgid "editors_review_header_devcomments"
 msgstr "Developer Comments"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 #, fuzzy
 msgid "editors_review_header_eula"
 msgstr "EULA"
@@ -3267,103 +5231,129 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Files:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 #, fuzzy
 msgid "editors_review_header_itemhistory"
 msgstr "Item History"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 #, fuzzy
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomination Message"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 #, fuzzy
 msgid "editors_review_header_previews"
 msgstr "Previews"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, fuzzy, php-format
 msgid "editors_review_header_review"
 msgstr "Review %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 #, fuzzy
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes to Reviewer"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 #, fuzzy
 msgid "editors_review_header_summary"
 msgstr "Summary"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 #, fuzzy
 msgid "editors_review_header_versionnotes"
 msgstr "Version Notes"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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
 #, fuzzy
 msgid "editors_review_history_nominated_adminreview"
 msgstr "Admin Review"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 #, fuzzy
 msgid "editors_review_history_nominated_approved"
 msgstr "Nomination Approved/Public"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 #, fuzzy
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomination Denied/Sandbox"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 #, fuzzy
 msgid "editors_review_history_nonefound"
 msgstr "No previous review entries could be found."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 #, fuzzy
 msgid "editors_review_history_pending_adminreview"
 msgstr "Admin Review"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 #, fuzzy
 msgid "editors_review_history_pending_approved"
 msgstr "Approved/Public"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 #, fuzzy
 msgid "editors_review_history_pending_denied"
 msgstr "Denied/Sandbox"
 
-#: views/editors/review.thtml:198
+#. 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
 #, fuzzy
 msgid "editors_review_label_applications"
 msgstr "Applications:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 #, fuzzy
 msgid "editors_review_label_cannedresponse"
 msgstr "or select a canned response:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 #, fuzzy
 msgid "editors_review_label_comments"
 msgstr "Comments:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 #, fuzzy
 msgid "editors_review_label_operating_systems"
 msgstr "Operating Systems:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 #, fuzzy
 msgid "editors_review_link_pagetop"
 msgstr "Top"
@@ -3373,7 +5363,7 @@ msgstr "Top"
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 #, fuzzy
 msgid "editors_review_previews_notfound"
 msgstr "No previews found."
@@ -3383,49 +5373,56 @@ msgstr "No previews found."
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 #, fuzzy
 msgid "editors_review_submit_process_action"
 msgstr "Process Action"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 #, fuzzy
 msgid "editors_review_th_action"
 msgstr "Action"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 #, fuzzy
 msgid "editors_review_th_comments"
 msgstr "Comments"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 #, fuzzy
 msgid "editors_review_th_date"
 msgstr "Date"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 #, fuzzy
 msgid "editors_review_th_reviewer"
 msgstr "Reviewer"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 #, fuzzy
 msgid "editors_review_th_version_file"
 msgstr "Version/File"
 
-#: controllers/editors_controller.php:411
+#: 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
 #, fuzzy
 msgid "editors_reviewed_successfully"
 msgstr "Review successfully processed."
@@ -3455,7 +5452,7 @@ msgstr "Action"
 msgid "editors_reviews_in_reply_to"
 msgstr "In reply to:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 #, fuzzy
 msgid "editors_reviews_processed"
 msgstr "Reviews processed successfully!"
@@ -3470,27 +5467,27 @@ msgstr "There are currently no reviews in moderation."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Process Reviews"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 #, fuzzy
 msgid "editors_site_specific"
 msgstr "Site Specific"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 #, fuzzy
 msgid "editors_submissiontype_new"
 msgstr "New"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 #, fuzzy
 msgid "editors_submissiontype_updated"
 msgstr "Updated"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 #, fuzzy
 msgid "editors_tested_app"
 msgstr "Tested Application"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 #, fuzzy
 msgid "editors_tested_os"
 msgstr "Tested Operating Systems"
@@ -3541,17 +5538,20 @@ msgstr "Platforms"
 msgid "editors_th_submissiontypes"
 msgstr "Submission Types"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, fuzzy, php-format
 msgid "editors_x_days"
 msgstr "%s days"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, fuzzy, php-format
 msgid "editors_x_hours"
 msgstr "%s hours"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, fuzzy, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutes"
@@ -3560,8 +5560,8 @@ msgstr "%s minutes"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 #, fuzzy
 msgid "error_access_denied"
 msgstr "Access Denied"
@@ -3571,12 +5571,13 @@ msgstr "Access Denied"
 msgid "error_access_denied_message"
 msgstr "You are not authorized to view this page."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3586,19 +5587,20 @@ msgstr "You are not authorized to view this page."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 #, fuzzy
 msgid "error_addon_notfound"
 msgstr "Add-on not found!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 #, fuzzy
 msgid "error_addon_notviewable"
 msgstr "This add-on is not viewable here."
@@ -3608,7 +5610,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:624
+#: controllers/addons_controller.php:753
 #, fuzzy
 msgid "error_browse_no_addons"
 msgstr "No add-ons in this category!"
@@ -3633,25 +5635,26 @@ msgstr "This is not a valid email address."
 msgid "error_field_required"
 msgstr "This field must not be empty."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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
 #, fuzzy
 msgid "error_file_notfound"
 msgstr "File not found!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, fuzzy, php-format
 msgid "error_file_x_notfound"
 msgstr "File error: %s does not exist."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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"
@@ -3671,16 +5674,18 @@ 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
 #: 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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, fuzzy, php-format
 msgid "error_missing_argument"
@@ -3701,7 +5706,7 @@ msgstr "Notice"
 msgid "error_preview_notfound"
 msgstr "Preview not found!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 #, fuzzy
 msgid "error_review_rating_required"
 msgstr "You must select a rating."
@@ -3763,8 +5768,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Wrong username or password!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 #, fuzzy
 msgid "error_version_notfound"
 msgstr "Version not found!"
@@ -3779,13 +5784,14 @@ msgstr "Wrong password entered!"
 msgid "feature_learnmore"
 msgstr "Learn more"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, fuzzy, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Learn more about %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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
 #, fuzzy, php-format
 msgid "feature_reviews"
@@ -3798,6 +5804,45 @@ 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
+#: views/files/browse.thtml:65
+#, fuzzy
+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)
+#: views/files/browse.thtml:67
+#, fuzzy
+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)
+#: views/files/browse.thtml:64
+#, fuzzy
+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)
+#: views/files/browse.thtml:46
+#, fuzzy
+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.
+#: views/files/browse.thtml:68
+#, fuzzy
+msgid "file_browser_toggle_expand_collapse"
+msgstr "+/-"
+
 #: views/elements/footer.thtml:67
 #, fuzzy
 msgid "footer_all_rights_reserved"
@@ -3842,7 +5887,7 @@ msgstr "Other languages:"
 msgid "footer_privacy_policy"
 msgstr "Privacy Policy"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 #, fuzzy
 msgid "forum_save"
 msgstr "Save"
@@ -3852,7 +5897,7 @@ msgstr "Save"
 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:110
 #, fuzzy
 msgid "general_addontype_dict_plural"
@@ -3863,7 +5908,7 @@ msgstr "Dictionaries"
 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:108
 #, fuzzy
 msgid "general_addontype_extension_plural"
@@ -3874,7 +5919,7 @@ msgstr "Extensions"
 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:113
 #, fuzzy
 msgid "general_addontype_lpaddon_plural"
@@ -3885,7 +5930,7 @@ msgstr "Language Packs (Add-on)"
 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:112
 #, fuzzy
 msgid "general_addontype_lpapp_plural"
@@ -3896,7 +5941,7 @@ msgstr "Language Packs (Application)"
 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:114
 #, fuzzy
 msgid "general_addontype_plugin_plural"
@@ -3907,7 +5952,7 @@ msgstr "Plugins"
 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:111
 #, fuzzy
 msgid "general_addontype_search_plural"
@@ -3918,12 +5963,13 @@ msgstr "Search Engines"
 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:109
 #, fuzzy
 msgid "general_addontype_theme_plural"
 msgstr "Themes"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, fuzzy, php-format
 msgid "header_home_tooltip"
@@ -3960,13 +6006,13 @@ msgid "header_navlink_addons"
 msgstr "Add-ons"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 #, fuzzy
 msgid "header_navlink_logout"
 msgstr "Log out"
@@ -3976,22 +6022,23 @@ msgstr "Log out"
 msgid "header_navlink_myaccount"
 msgstr "My Account"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 #, fuzzy
 msgid "header_navlink_register"
 msgstr "Register"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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.
+#. %1 is the login URL for the link tag
+#. %2 is the link to an explanatory page.
 #: views/elements/install.thtml:229
 #, fuzzy
 msgid "install_a_login_to_install"
@@ -3999,18 +6046,21 @@ 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)
 #: 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/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/install.thtml:158
 #, fuzzy, php-format
 msgid "install_download"
@@ -4037,7 +6087,7 @@ msgid "langtools_download_langpack"
 msgstr "Download Language Pack"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 #, fuzzy
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dictionaries & Language Packs"
@@ -4107,7 +6157,11 @@ msgstr "Firefox"
 #: config/bootstrap.php:277
 #, fuzzy
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -4146,7 +6200,7 @@ msgstr "Themes"
 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:214
 #, fuzzy
 msgid "other_users"
@@ -4162,42 +6216,41 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_experimental_addons"
 msgstr "Experimental Add-ons"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 #, fuzzy
 msgid "page_title_policy"
 msgstr "Add-ons Policy"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 #, fuzzy
 msgid "page_title_privacy"
 msgstr "Mozilla Privacy Policy"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 #, fuzzy
 msgid "page_title_review_guide"
 msgstr "Review Guidelines"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 #, fuzzy
 msgid "page_title_sandbox"
 msgstr "Sandbox Review System"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 #, fuzzy
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
@@ -4220,6 +6273,7 @@ msgstr ""
 "least one of the below applications supported. Only the versions listed "
 "below are allowed for these applications."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, fuzzy, php-format
 msgid "pages_appversions_required_files"
@@ -4227,6 +6281,8 @@ 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.
 #: views/pages/appversions.thtml:92
 #, fuzzy
 msgid "pages_appversions_required_files_link"
@@ -4237,7 +6293,6 @@ msgstr "here"
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/experimental_addons.thtml:56
 #, fuzzy
 msgid "pages_experimental_addons_backbutton"
 msgstr "Back to the previous page"
@@ -4252,7 +6307,7 @@ 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"
@@ -4280,8 +6335,8 @@ 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
+#. %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"
@@ -4289,8 +6344,8 @@ 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
+#. %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"
@@ -4308,7 +6363,7 @@ msgstr "Are you human?"
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 #, fuzzy
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
@@ -4339,7 +6394,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 #, fuzzy
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
@@ -4356,7 +6411,7 @@ 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
+#. %1 is the URL of the support section, %2 for the review guidelines
 #: views/reviews/add.thtml:48
 #, fuzzy
 msgid "review_guidelines_short"
@@ -4374,24 +6429,24 @@ msgstr ""
 "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 addon name
+#. %1 is the add-on name
 #: 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:261
+#: controllers/addons_controller.php:390
 #, fuzzy
 msgid "rss_featuredaddons"
 msgstr "Featured Add-ons"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 #, fuzzy
 msgid "rss_newestaddons"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 #, fuzzy
 msgid "rss_updatedaddons"
 msgstr "Updated Add-ons"
@@ -4437,6 +6492,7 @@ msgstr "All Search Engines"
 msgid "search_landing_browse_search_engines"
 msgstr "Browse Search Engines"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, fuzzy, php-format
 msgid "search_matching_addons_number"
@@ -4459,12 +6515,13 @@ msgstr "Search Add-ons"
 msgid "search_rss_description"
 msgstr "Search results feed"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, fuzzy, php-format
 msgid "search_rss_results_for"
 msgstr "Search results for: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 #, fuzzy
 msgid "sidebar_navlink_admin_tools"
 msgstr "Admin Tools"
@@ -4474,7 +6531,7 @@ msgstr "Admin Tools"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Developer Tools"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 #, fuzzy
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editor Tools"
@@ -4484,6 +6541,7 @@ msgstr "Editor Tools"
 msgid "sidebar_navlink_welcome"
 msgstr "Welcome"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, fuzzy, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -4529,6 +6587,7 @@ msgstr "Theme"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Add-ons"
 
+#. %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
@@ -4541,7 +6600,7 @@ msgstr "%1$s KB"
 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/stars.thtml:54
 #, fuzzy, php-format
 msgid "stars_rated_x_outof_5"
@@ -4562,27 +6621,35 @@ msgstr "Developer Tools"
 msgid "statistics_addon_switch"
 msgstr "Switch Add-on"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. This is a date format.
+#. http://php.net/strftime
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, fuzzy
 msgid "statistics_date_shortmonth"
 msgstr "%b. %e"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. This is a date format.
+#. http://php.net/strftime
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, fuzzy
 msgid "statistics_date_shortmonthwithyear"
 msgstr "%b. %e, %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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 #, fuzzy
 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: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:498
 #, fuzzy, php-format
 msgid "statistics_events_app_released"
@@ -4633,7 +6700,7 @@ msgstr "Statistics Dashboard"
 msgid "statistics_index_view_button"
 msgstr "View Statistics"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
@@ -4653,7 +6720,7 @@ msgstr "Remove this plot"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
@@ -4663,127 +6730,132 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 #, fuzzy
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s found in range"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 #, fuzzy
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Add Plot"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 #, fuzzy
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Add another plot to this graph"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Hide Total Count"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Show Total Count"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 #, fuzzy
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "View Data (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Hide %s Events"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Show %s Events"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Hide Firefox Events"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Show Firefox Events"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Collapse Graph"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expand Graph"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Resize the graph"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 #, fuzzy
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Active Daily Users"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 #, fuzzy
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 #, fuzzy
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Custom"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 #, fuzzy
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 #, fuzzy
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operating System"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 #, fuzzy
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Add-on Status"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 #, fuzzy
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Summary"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 #, fuzzy
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Add-on Version"
@@ -4813,13 +6885,13 @@ msgstr "Unknown"
 msgid "statistics_longnames_version"
 msgstr "Add-on Version"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 #, fuzzy
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "There is not yet enough data to display this graph. Please check back later."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 #, fuzzy
 msgid "statistics_notice_data_none"
 msgstr ""
@@ -4833,13 +6905,13 @@ msgstr ""
 "may be incomplete as our scripts work to update this information. Please "
 "check back in a few minutes."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 #, fuzzy
 msgid "statistics_notice_disabled"
 msgstr ""
 "The Statistics Dashboard is currently disabled. Please check back later."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 #, fuzzy
 msgid "statistics_notice_nojavascript"
 msgstr "JavaScript is required to view the Statistics Dashboard graphs."
@@ -4857,42 +6929,42 @@ msgstr "Your settings have been updated!"
 msgid "statistics_pagetitle"
 msgstr "Statistics Dashboard"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 #, fuzzy
 msgid "statistics_plot_legend_adu"
 msgstr "Active Daily Users"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 #, fuzzy
 msgid "statistics_plot_legend_downloads"
 msgstr "Daily Downloads"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 #, fuzzy
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Zoom In"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 #, fuzzy
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Zoom in one month"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 #, fuzzy
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Zoom Out"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 #, fuzzy
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out one month"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, fuzzy, php-format
 msgid "statistics_rss_description"
 msgstr "Daily summary of statistics for %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 #, fuzzy
 msgid "statistics_rss_icon_title"
 msgstr "RSS feed of summary data"
@@ -4940,27 +7012,27 @@ msgstr "Public"
 msgid "statistics_settings_access_public_description"
 msgstr "Anyone can view this add-on's statistics"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 #, fuzzy
 msgid "statistics_settings_change_link"
 msgstr "Change Settings"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 #, fuzzy
 msgid "statistics_settings_confidential"
 msgstr "Please treat this information as confidential."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 #, fuzzy
 msgid "statistics_settings_currently_private"
 msgstr "This dashboard is currently <b>private</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 #, fuzzy
 msgid "statistics_settings_currently_public"
 msgstr "This dashboard is currently <b>public</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 #, fuzzy
 msgid "statistics_settings_locked_alt"
 msgstr "Locked"
@@ -4980,7 +7052,7 @@ msgstr "Save Settings"
 msgid "statistics_settings_title"
 msgstr "Statistics Dashboard Settings for %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 #, fuzzy
 msgid "statistics_settings_unlocked_alt"
 msgstr "Unlocked"
@@ -5010,7 +7082,7 @@ msgstr "Uk"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 #, fuzzy
 msgid "statistics_summary_downloads_average"
 msgstr "Average Daily Downloads"
@@ -5020,43 +7092,43 @@ msgstr "Average Daily Downloads"
 msgid "statistics_summary_downloads_heading"
 msgstr "Downloads"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 #, fuzzy
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Last Day Count"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 #, fuzzy
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in the last 7 days"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 #, fuzzy
 msgid "statistics_summary_downloads_total"
 msgstr "Total Downloads"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, fuzzy, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Since %1$s"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 #, fuzzy
 msgid "statistics_summary_nodata"
 msgstr "No data yet"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 #, fuzzy
 msgid "statistics_summary_updatepings_average"
 msgstr "Average Daily Active Users"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 #, fuzzy
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Change from previous count"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, fuzzy, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s on %2$s"
@@ -5066,18 +7138,18 @@ msgstr "%1$s on %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Active Daily Users"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 #, fuzzy
 msgid "statistics_summary_updatepings_total"
 msgstr "Active Daily Users"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, fuzzy, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "On %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, fuzzy, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Statistics"
@@ -5107,7 +7179,7 @@ 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
+#. %1 is the email address, %2 is the URL of the user registration page
 #: views/users/delete.thtml:49
 #, fuzzy
 msgid "user_del_account_deleted"
@@ -5131,7 +7203,7 @@ msgstr "Confirm Password"
 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:62
 #, fuzzy
 msgid "user_del_error_addons"
@@ -5141,7 +7213,7 @@ msgstr ""
 "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:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
@@ -5159,7 +7231,7 @@ msgstr ""
 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:83
 #, fuzzy
 msgid "user_del_error_unknown"
@@ -5172,7 +7244,7 @@ msgstr ""
 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:93
 #, fuzzy
 msgid "user_del_header_delete_account"
@@ -5202,7 +7274,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
@@ -5221,7 +7293,7 @@ msgstr "I understand that this step cannot be undone."
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 #, fuzzy
 msgid "user_edit_confirm_email_sent"
@@ -5235,9 +7307,9 @@ msgstr ""
 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
+#. 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
 #, fuzzy, php-format
 msgid "user_email_confirm_account_nopass"
@@ -5257,7 +7329,7 @@ msgstr ""
 "Thanks for joining %2$s Add-ons\n"
 "-- %2$s Add-ons Staff"
 
-# %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, fuzzy, php-format
@@ -5281,8 +7353,8 @@ msgstr ""
 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
+#. This is the password reset email
+#. %1 is the pw reset URL, %2 is the application
 #: views/users/email/pwreset_plain.thtml:5
 #, fuzzy, php-format
 msgid "user_email_pwreset"
@@ -5310,7 +7382,7 @@ msgstr "Reset your %s Add-ons password"
 msgid "user_emailchange_error"
 msgstr "Error!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, fuzzy, php-format
 msgid "user_emailchange_subject"
@@ -5321,7 +7393,7 @@ msgstr "Please confirm your email address change at %1$s Add-ons"
 msgid "user_emailchange_success"
 msgstr "Success!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, fuzzy, php-format
 msgid "user_emailchange_successful_description"
@@ -5521,7 +7593,7 @@ msgstr "Send password reset link"
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
 
-# %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
 #, fuzzy, php-format
 msgid "user_register_click_confirm_link"
@@ -5529,7 +7601,7 @@ 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
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, fuzzy, php-format
 msgid "user_register_confirm_email_sent"
@@ -5548,7 +7620,7 @@ 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
+#. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, fuzzy, php-format
 msgid "user_register_resend_confirmation_link"
@@ -5557,7 +7629,7 @@ msgstr ""
 "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
+#. %1 is the link to the Mozilla Add-ons front page
 #: views/users/register_complete.thtml:52
 #, fuzzy, php-format
 msgid "user_register_welcome"
@@ -5628,7 +7700,7 @@ msgstr "Nickname"
 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:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
@@ -5639,8 +7711,8 @@ 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
+#. %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
 #, fuzzy, php-format
 msgid "users_login_sandbox_display_warning"
@@ -5649,8 +7721,8 @@ msgstr ""
 "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
+#. %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
 #, fuzzy, php-format
 msgid "users_login_sandbox_page_warning"
@@ -5670,94 +7742,34 @@ msgid "users_register_pagetitle"
 msgstr "New User Registration"
 
 #, fuzzy
-#~ msgid "addon_recommended"
-#~ msgstr "This add-on is recommended by Mozilla"
-
-#, fuzzy
-#~ msgid "blog_breadcrumb"
-#~ msgstr "Blog"
-
-#, fuzzy
-#~ msgid "blog_description"
-#~ msgstr ""
-#~ "News and information regarding add-ons and the addons.mozilla.org website."
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
 
 #, fuzzy
-#~ msgid "blog_link_title"
-#~ msgstr "Link"
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
 
 #, fuzzy
-#~ msgid "blog_no_posts_found"
-#~ msgstr "No posts could be found."
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
 
 #, fuzzy
-#~ msgid "blog_posted_by"
-#~ msgstr "Posted by %s on %s"
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
 
 #, fuzzy
-#~ msgid "blog_previous_entries"
-#~ msgstr "Previous Entries"
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
 
 #, fuzzy
-#~ msgid "blog_sidebar_other_blogs"
-#~ msgstr "Other Mozilla Blogs"
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
 
-#, fuzzy
-#~ msgid "blog_subpage_title"
-#~ msgstr "Blog"
-
-#, fuzzy
-#~ msgid "blog_subscribe_heading"
-#~ msgstr "Subscribe"
-
-#, fuzzy
-#~ msgid "blog_title"
-#~ msgstr "Mozilla Add-ons Blog"
-
-#, fuzzy
-#~ msgid "devcp_actionbar_link_disable"
-#~ msgstr "Disable Add-on"
-
-#, fuzzy
-#~ msgid "devcp_actionbar_link_enable"
-#~ msgstr "Enable Add-on"
-
-#, fuzzy
-#~ msgid "devcp_actionbar_link_nominate"
-#~ msgstr "Nominate Add-on"
-
-#, fuzzy
-#~ msgid "devcp_actionbar_link_viewpublic"
-#~ msgstr "View Public Page"
-
-#, fuzzy
-#~ msgid "devcp_statsbar_rating"
-#~ msgstr "Rated <em>%1$.2f</em> / %2$d"
-
-#, fuzzy
-#~ msgid "editors_reviews_action_approve"
-#~ msgstr "Approve"
-
-#, fuzzy
-#~ msgid "editors_reviews_action_delete"
-#~ msgstr "Delete"
-
-#, fuzzy
-#~ msgid "recaptcha_enter_numbers"
-#~ msgstr "Please enter the <strong>numbers</strong> you are hearing below."
-
-# %1 is the link switching refreshing the captcha
-# %2 is the link switching to a text captcha
-#, fuzzy
-#~ msgid "recaptcha_hardtohear"
-#~ msgstr ""
-#~ "If this is hard to understand, you can <a href=\"%1$s\">try different "
-#~ "numbers</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
-#, fuzzy
 #~ msgid "recaptcha_hardtoread"
 #~ msgstr ""
 #~ "If this is hard to read, you can <a href=\"%1$s\">try different words</a> "
 #~ "or <a href=\"%2$s\">listen to numbers</a> instead."
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
diff --git a/site/app/locale/ar/LC_MESSAGES/messages.po b/site/app/locale/ar/LC_MESSAGES/messages.po
index d0ba40e..9212358 100644
--- a/site/app/locale/ar/LC_MESSAGES/messages.po
+++ b/site/app/locale/ar/LC_MESSAGES/messages.po
@@ -11,98 +11,81 @@ 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-02-16 10:40+0200\n"
+"PO-Revision-Date: 2009-03-10 09:25+0200\n"
 "Last-Translator: Anas Husseini <linux.anas@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "ألغ� التثبيت"
 
-#: 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
+#. 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 "نزّل الآن %s"
 
-#: views/addons/policy.thtml:78
-#: views/addons/policy.thtml:79
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "اقبل ونزّل"
 
-#: views/addons/policy.thtml:81
-#: views/addons/policy.thtml:83
+#: 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/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
 msgid "a_header_sandbox"
 msgstr "ساحة اللعب"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "أضي�ت %s"
-
-#: views/elements/addon_listitem.thtml:145
-#: views/elements/feature.thtml:111
-#: views/addons/display.thtml:103
-#: views/addons/browse_thumbs.thtml:87
+#. %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 "ح�دّثت �ي %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "الإصدارة %s"
 
-#: views/elements/addon_listitem.thtml:136
-#: views/elements/feature.thtml:103
-#: views/addons/display.thtml:115
-#: views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "مجموع التنزيلات"
 
-#: views/elements/addon_listitem.thtml:136
-#: views/elements/feature.thtml:103
-#: views/addons/display.thtml:114
-#: views/addons/display.thtml:118
+#: 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:118
-#: views/addons/browse.thtml:75
+#. %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"
@@ -122,39 +105,32 @@ msgstr "�ي الص�حة"
 msgid "addon_list_sortby"
 msgstr "ترتيب حسب:"
 
-#: views/elements/addon_listitem.thtml:69
-#: views/elements/feature.thtml:89
-#: views/addons/display.thtml:51
-#: views/addons/browse_thumbs.thtml:67
+#: 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/elements/addon_listitem.thtml:72
-#: views/addons/browse_thumbs.thtml:70
+#: 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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s غير متاحة ل� %2$s."
 
-# %1 is the addon 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
+#. %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 "عودة إلى %1$s..."
 
-# %1 is the addon name
-#: views/reviews/flag.thtml:58
-#: views/reviews/add.thtml:127
+#. %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"
@@ -172,6 +148,7 @@ msgstr "المراجعة:"
 msgid "addon_review_add_submit"
 msgstr "أرسل مراجعتك"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -181,8 +158,7 @@ msgstr "أض� مراجعة ل� %s"
 msgid "addon_review_add_title_field"
 msgstr "العنوان/الملخص:"
 
-#: views/reviews/display.thtml:81
-#: views/reviews/display.thtml:165
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "احذ�"
 
@@ -206,21 +182,24 @@ msgstr "نعم"
 msgid "addon_review_delete_header"
 msgstr "حذ� المراجعة"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "ح�ذ�ت المراجعة بنجاح."
 
+#. %s is the name of the add-on
 #: 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:534
+#. %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
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr "ي�رجى ملاحظة أنّ مراجعتك سيشر� عليها أحد المحررين قبل أن ت�نشر على الملأ."
@@ -229,7 +208,7 @@ msgstr "ي�رجى ملاحظة أنّ مراجعتك سيشر� عليها أح
 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:135
 #, php-format
 msgid "addon_review_others_by_user"
@@ -241,16 +220,16 @@ msgstr[3] "انظر إلى %1$s مراجعات سابقة كتبها %2$s عن Ù
 msgstr[4] "انظر إلى %1$s مراجعة سابقة كتبها %2$s عن هذه الإضا�ة."
 msgstr[5] "انظر إلى %1$s مراجعة سابقة كتبها %2$s عن هذه الإضا�ة."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -264,33 +243,27 @@ msgstr "ردّ المطوّر:"
 msgid "addon_review_saved_successfully"
 msgstr "ح��ظت مراجعتك بنجاح. شكرًا!"
 
-#: views/addons/display.thtml:285
-#: views/addons/display.thtml:288
-#: views/reviews/display.thtml:72
-#: views/reviews/display.thtml:75
+#: 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:77
-#: views/reviews/delete.thtml:49
+#. %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 "من %1$s �ي %2$s (بتقييم %3$s)"
 
 #: views/addons/category_landing.thtml:138
-#: views/addons/category_landing.thtml:139
-#: views/addons/home.thtml:113
+#: 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/category_landing.thtml:129 views/addons/home.thtml:103
 #: views/addons/home.thtml:104
 msgid "addon_slider_tooltip_previous"
 msgstr "الإضا�ة السابقة"
@@ -299,33 +272,34 @@ msgstr "الإضا�ة السابقة"
 msgid "addon_version_permalink"
 msgstr "رابط دائم لهذه الإصدارة"
 
-#: views/addons/versions.thtml:123
-#: views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "أحدث إصدارة متوا�قة مع"
+#. %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 "أحدث نسخة متوا�قة مع %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "اذهب"
 
-#: views/elements/fyf_promotion.thtml:51
-#: 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:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "استعرض كل السمات :: إضا�ات %1$s"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "استعرض سمات %1$s :: إضا�ات %2$s"
 
@@ -333,7 +307,7 @@ msgstr "استعرض سمات %1$s :: إضا�ات %2$s"
 msgid "addons_display_add_review"
 msgstr "أض�� مراجعة"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "ت�اصيل متقدمة"
 
@@ -341,12 +315,11 @@ msgstr "ت�اصيل متقدمة"
 msgid "addons_display_categories"
 msgstr "التصني�ات"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "مراجعة م�صلة"
 
-#: views/addons/display.thtml:368
-#: views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "لا تعجبني"
@@ -355,58 +328,53 @@ msgstr "لا تعجبني"
 msgid "addons_display_edit_review"
 msgstr "حرّر مراجعتك"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "لهذه الإضا�ة سياسة خصوصية."
 
-#: views/addons/display.thtml:367
-#: views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "تعليقات المطوّر"
 
-#: views/addons/display.thtml:208
-#: views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "ص�حة البداية"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "المراجعات"
 
-#: views/addons/display.thtml:225
-#: views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "الدعم"
 
-#: views/addons/display.thtml:369
-#: views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "تعجبني"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "الوص� المطوّل"
 
-#: views/addons/display.thtml:371
-#: views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 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:421
+#. %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] "إضا�ات أخرى أعدّها %1$s"
@@ -416,88 +384,94 @@ msgstr[3] "إضا�ات أخرى أعدّها المؤل�ون %1$s"
 msgstr[4] "إضا�ات أخرى أعدّها المؤل�ون %1$s"
 msgstr[5] "إضا�ات أخرى أعدّها المؤل�ون %1$s"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "يقدّم المطوّر دعمًا لهذه الإضا�ة بمراسلة البريد الإلكتروني %s"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr "يقدّم المطوّر دعمًا لهذه الإضا�ة �ي %s أو بمراسلة البريد الإلكتروني %s"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "يقدّم المطوّر دعمًا لهذه الإضا�ة �ي %s"
 
-#: views/addons/display.thtml:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "قيّمها"
 
-#: views/addons/display.thtml:370
-#: views/reviews/add.thtml:107
+#: 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:387
-#: views/addons/display.thtml:390
+#: 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:405
+#. %1 is the review guidelines link
+#: 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:396
-#: views/addons/display.thtml:400
+#. %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 "انظر <a href=\"%1$s\">قسم الدعم</a> لمعر�ة أين يمكنك الحصول على مساعدة بشأن هذه الإضا�ة."
+msgstr ""
+"انظر <a href=\"%1$s\">قسم الدعم</a> لمعر�ة أين يمكنك الحصول على مساعدة بشأن "
+"هذه الإضا�ة."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "اح�ظ"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "شاهد كل المراجعات (%1$s)"
 
-#: views/addons/display.thtml:195
-#: views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "شاهد كل الإصدارات"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "تاريخ الإصدارات الكامل"
 
-#: views/addons/display.thtml:335
-#: views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "شاهد المصدر"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "شاهد الإحصائيات"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "ما رأيك؟"
 
@@ -507,32 +481,27 @@ msgstr "تعمل مع:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129
-#: views/elements/feature.thtml:95
-#: views/addons/policy.thtml:62
-#: views/addons/display.thtml:68
+#: 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/searchengines.thtml:54
-#: views/addons/category_landing.thtml:79
+#: 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
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "ننصح ب�"
 
-#: controllers/search_controller.php:211
-#: controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254
-#: controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528
-#: controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897
-#: controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
-msgstr "تزيد الإضا�ات قدرات %1$s، متيحة لك تطويع تص�حك للوب. خذ جولة �ي المكان واجعل من %1$s شيئًا ينتمي إليك."
+msgstr ""
+"تزيد الإضا�ات قدرات %1$s، متيحة لك تطويع تص�حك للوب. خذ جولة �ي المكان واجعل "
+"من %1$s شيئًا ينتمي إليك."
 
 #: views/addons/home.thtml:201
 msgid "addons_home_newest_header"
@@ -542,44 +511,34 @@ msgstr "الأحدث:"
 msgid "addons_home_other_applications"
 msgstr "تطبيقات أخرى"
 
-#: controllers/developers_controller.php:64
+#. %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:610
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:610
 #: 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/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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214
-#: controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530
-#: controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689
-#: controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776
-#: controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58
-#: controllers/pages_controller.php:123
-#: controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -600,10 +559,8 @@ msgstr "ننصح ب�:"
 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
+#: 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 "شاهد الكل"
 
@@ -625,7 +582,10 @@ msgstr "شاهد كل الإضا�ات المحدّثة مؤخرًا"
 
 #: 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/install.thtml:107
 msgid "addons_install_in_sunbird_title"
@@ -633,7 +593,11 @@ msgstr "كي�ية التثبيت �ي صَنْب�رْد"
 
 #: 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/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
@@ -647,12 +611,9 @@ msgstr "أظه�ر الإضا�ات التجريبية"
 msgid "addons_options_submit"
 msgstr "اذهب"
 
-#: 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: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 "من"
@@ -661,20 +622,21 @@ msgstr "من"
 msgid "addons_plugins_for_linux"
 msgstr "للينكس"
 
-#: views/addons/plugins.thtml:113
-#: views/addons/plugins.thtml:145
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "لماك أو إس"
 
-#: views/addons/plugins.thtml:109
-#: views/addons/plugins.thtml:141
+#: 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:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
-msgstr "تسرد هذه الص�حة �قط بعض الملحقات الأكثر شعبية. للمزيد من المعلومات عن الملحقات الأخرى المتاحة للمتص�حات المرتكزة على موزيلا، ي�رجى زيارة %1$s"
+msgstr ""
+"تسرد هذه الص�حة �قط بعض الملحقات الأكثر شعبية. للمزيد من المعلومات عن "
+"الملحقات الأخرى المتاحة للمتص�حات المرتكزة على موزيلا، ي�رجى زيارة %1$s"
 
 #: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
@@ -682,61 +644,62 @@ msgstr "أتبحث عن ملحق غير موجود هنا؟"
 
 #: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
-msgstr "تساعد الملحقات متص�حك على القيام بوظائ� معينة، كمشاهدة تنسيقات رسومية معينة أو تشغيل مل�ات الوسائط المتعددة. تختل� الملحقات عن الامتدادات قليلًا لأنّ الأخير تضي� أو تعدّل على الوظي�ة الموجودة."
+msgstr ""
+"تساعد الملحقات متص�حك على القيام بوظائ� معينة، كمشاهدة تنسيقات رسومية معينة "
+"أو تشغيل مل�ات الوسائط المتعددة. تختل� الملحقات عن الامتدادات قليلًا لأنّ "
+"الأخير تضي� أو تعدّل على الوظي�ة الموجودة."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "الملحقات الشائعة ل� %1$s"
 
-#: controllers/components/amo.php:724
-#: controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "الملحقات"
 
-#: 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: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:68
 #, php-format
 msgid "addons_policy_eula_require"
-msgstr "يتطلب %s منك أن تقبل ات�اقية ترخيص المستخدم التالية قبل متابعة التثبيت:"
+msgstr ""
+"يتطلب %s منك أن تقبل ات�اقية ترخيص المستخدم التالية قبل متابعة التثبيت:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "معاينات %s"
 
-#: views/addons/recommended.thtml:50
-#: controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 msgid "addons_recommended_introduction"
-msgstr "مع كل هذا العدد من الإضا�ات العظيمة، هناك شيء ما لكل شخص. كبداية، هذه قائمة من الإضا�ات الأكثر شعبية. استمتع!"
+msgstr ""
+"مع كل هذا العدد من الإضا�ات العظيمة، هناك شيء ما لكل شخص. كبداية، هذه قائمة "
+"من الإضا�ات الأكثر شعبية. استمتع!"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "الإضا�ات المنصوح بها"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "الإضا�ات التي ننصح بها"
 
-#: views/addons/searchengines.thtml:147
-#: views/addons/searchengines.thtml:164
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "موارد إضا�ية"
 
-# link text devmo
-#: views/addons/searchengines.thtml:153
-#: views/addons/searchengines.thtml:169
+#. link text devmo
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "مركز مطوّري موزيلا"
 
@@ -746,77 +709,67 @@ 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:150
-#: views/addons/searchengines.thtml:167
+#. %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 "تعلم كي� %1$s �ي %2$s."
 
-# link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:152
-#: views/addons/searchengines.thtml:168
+#. 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 "/ar/docs/Creating_OpenSearch_plugins_for_Firefox"
 
-# link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:151
-#: views/addons/searchengines.thtml:168
+#. link text for "make your own" (opensearch engine)
+#: 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:148
-#: views/addons/searchengines.thtml:166
+#. %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 "تص�ح من خلال المزيد من محركات البحث �ي %1$s"
 
-# link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:149
-#: views/addons/searchengines.thtml:166
+#. 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:755
-#: controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "محركات البحث"
 
-#: views/addons/searchengines.thtml:154
-#: views/addons/searchengines.thtml:171
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr "شكر خاص لمشروع مايكرو�ت على عملهم �ي محركات بحث �َيَر��كس."
 
-#: 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: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 "�ي ساحة اللعب؛ ترشيح عام"
 
-#: controllers/components/amo.php:195
-#: controllers/components/amo.php:226
+#: controllers/components/amo.php:195 controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "�ي ساحة اللعب؛ بانتظار المراجعات"
 
-#: controllers/components/amo.php:199
-#: controllers/components/amo.php:228
+#: controllers/components/amo.php:199 controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "عام"
 
-#: controllers/components/amo.php:193
-#: controllers/components/amo.php:225
+#: controllers/components/amo.php:193 controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "�ي ساحة اللعب"
 
@@ -824,8 +777,7 @@ msgstr "�ي ساحة اللعب"
 msgid "addons_status_unknown"
 msgstr "مجهول"
 
-#: views/elements/fyf_promotion.thtml:50
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "اعر� المزيد عن هذه الإضا�ة"
 
@@ -835,14 +787,16 @@ msgstr "كن حذرًا مع الإصدارات القديمة"
 
 #: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
-msgstr "هذه الإصدارات معروضة لتكون مرجعًا ومن أجل أغراض اختبارية. ينبغي عليك دائمًا أن تستخدم أحدث إصدارة من الإضا�ة."
+msgstr ""
+"هذه الإصدارات معروضة لتكون مرجعًا ومن أجل أغراض اختبارية. ينبغي عليك دائمًا أن "
+"تستخدم أحدث إصدارة من الإضا�ة."
 
-#: views/addons/versions.thtml:50
-#: controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "تاريخ الإصدارات مع سجل التغييرات"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "تاريخ إصدارات %1$s"
@@ -855,6 +809,7 @@ msgstr "إضا�ة مجموعة"
 msgid "admin_group_delete_pagetitle"
 msgstr "حذ� مجموعة"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -864,8 +819,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 "معرّ� المجموعة غير صالح"
 
@@ -873,8 +827,7 @@ 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 "ح��ظت المجموعة"
 
@@ -886,8 +839,7 @@ msgstr "متقدم"
 msgid "advanced_search_form_any_time"
 msgstr "أي وقت"
 
-#: views/elements/search.thtml:95
-#: views/elements/search.thtml:108
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "أي نوع"
 
@@ -983,44 +935,51 @@ msgstr "تجاهل �حص الإصدارة"
 msgid "app_compat_older_firefox_only"
 msgstr "هذه الإضا�ة هي من أجل إصدارات أقدم من �َيَر��كس"
 
+#. %1$s and %2$s are URLs
 #: 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: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: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:61
 msgid "app_compat_update_firefox"
-msgstr "<a href=\"http://getfirefox.com\">قم بترقية �َيَر��كس</a> لاستخدام هذه الإضا�ة"
+msgstr ""
+"<a href=\"http://getfirefox.com\">قم بترقية �َيَر��كس</a> لاستخدام هذه الإضا�ة"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "الإضا�ات حسب الاسم"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "الإضا�ات الأحدث"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "الإضا�ات الأكثر شعبية"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "الإضا�ات حسب التقييم"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 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 "التصني� الحالي"
 
@@ -1048,9 +1007,8 @@ msgstr "المحدّثة مؤخرًا أولًا"
 msgid "category_extra_mostpopular"
 msgstr "الأكثر شعبية أولًا"
 
-# %1 is the category name
-#: views/addons/searchengines.thtml:135
-#: views/addons/category_landing.thtml:51
+#. %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"
@@ -1059,14 +1017,24 @@ msgstr "شاهد كل %1$s"
 msgid "collection_not_found"
 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"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
-msgstr "كن مستعدًا لإصدار %1$s مع الأدوات والمعلومات المتاحة لمجتمع إضا�ات %2$s الموجودة أدناه."
+msgstr ""
+"كن مستعدًا لإصدار %1$s مع الأدوات والمعلومات المتاحة لمجتمع إضا�ات %2$s "
+"الموجودة أدناه."
 
 #: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
@@ -1076,8 +1044,7 @@ msgstr "يجري تحميل البيانات..."
 msgid "compatibility_dashboard_main_link"
 msgstr "عودة إلى الرئيسية"
 
-#: views/compatibility/dashboard.thtml:104
-#: views/compatibility/report.thtml:41
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "تقرير توا�قية الإضا�ة"
 
@@ -1095,9 +1062,13 @@ msgstr "صحّح الإصدارة القصوى دون أن تعيد الر�ع"
 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:130
 msgid "compatibility_developers_login_first"
-msgstr "إن كان لديك إضا�ات مستضا�ة �ي موقع إضا�ات موزيلا، <a href=\"%1$s\">سجّل دخولك رجاءً</a> لتحليل حالة إضا�اتك ل� %2$s."
+msgstr ""
+"إن كان لديك إضا�ات مستضا�ة �ي موقع إضا�ات موزيلا، <a href=\"%1$s\">سجّل دخولك "
+"رجاءً</a> لتحليل حالة إضا�اتك ل� %2$s."
 
 #: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
@@ -1116,26 +1087,37 @@ msgstr "نتائج التحقق من حالة الإضا�ات"
 msgid "compatibility_developers_retrieving"
 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:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s مستخدمًا ل� %2$s (%3$s&#37; من الكل)"
 
 #: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
-msgstr "الإضا�ات أدناه تشكّل 95% من استخدام الإضا�ات المعرو� لموزيلا، وهي مرتبة حسب مقدار الاستخدام."
+msgstr ""
+"الإضا�ات أدناه تشكّل 95% من استخدام الإضا�ات المعرو� لموزيلا، وهي مرتبة حسب "
+"مقدار الاستخدام."
 
 #: 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:69
 msgid "compatibility_report_intro"
-msgstr "من بين %1$s إضا�ة تشكّل 95% من استخدام الإضا�ات المعرو� لموزيلا، ت�عتبر <b>%2$s&#37;</b> منها متوا�قة حاليًا مع آخر إصدارات %3$s."
+msgstr ""
+"من بين %1$s إضا�ة تشكّل 95% من استخدام الإضا�ات المعرو� لموزيلا، ت�عتبر <b>%2"
+"$s&#37;</b> منها متوا�قة حاليًا مع آخر إصدارات %3$s."
 
 #: 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:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "الإضا�ات المتوا�قة مع إصدارة أل�ا من %1$s"
@@ -1144,6 +1126,7 @@ msgstr "الإضا�ات المتوا�قة مع إصدارة أل�ا من %1$s
 msgid "compatibility_report_legend_beta"
 msgstr "إصدارات بيتا"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "الإضا�ات المتوا�قة مع إصدارة بيتا أو إصدارة مرشحة من %1$s"
@@ -1152,6 +1135,7 @@ msgstr "الإضا�ات المتوا�قة مع إصدارة بيتا أو إص
 msgid "compatibility_report_legend_latest"
 msgstr "آخر إصدارة"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "الإضا�ات المحدّثة لآخر إصدارات %1$s"
@@ -1160,6 +1144,7 @@ msgstr "الإضا�ات المحدّثة لآخر إصدارات %1$s"
 msgid "compatibility_report_legend_other"
 msgstr "إصدارات أخرى"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "الإضا�ات غير المتوا�قة مع أي إصدارات من %1$s"
@@ -1169,8 +1154,7 @@ msgid "compatibility_report_title"
 msgstr "تقرير توا�قية الإضا�ة"
 
 #: views/compatibility/dashboard.thtml:50
-#: views/compatibility/dashboard.thtml:148
-#: views/compatibility/users.thtml:40
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "معلومات لمستخدمي الإضا�ة"
 
@@ -1178,18 +1162,21 @@ msgstr "معلومات لمستخدمي الإضا�ة"
 msgid "compatibility_view_report"
 msgstr "شاهد تقرير التوا�قية"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "لمعر�ة معلومات عن المشاركة، انظر %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "ص�حة الويكي"
 
 #: views/pages/credits.thtml:97
 msgid "credits_intro"
-msgstr "تودّ موزيلا أن تشكر الأشخاص التالية أسماؤهم لمساهمتهم �ي مشروع addons.mozilla.org project خلال هذه السنوات:"
+msgstr ""
+"تودّ موزيلا أن تشكر الأشخاص التالية أسماؤهم لمساهمتهم �ي مشروع addons.mozilla."
+"org project خلال هذه السنوات:"
 
 #: views/pages/credits.thtml:101
 msgid "credits_section_developers"
@@ -1217,38 +1204,41 @@ msgstr "البرنامج والصور"
 
 #: 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/\">Creative Commons Attribution 2.5 License</a>."
+msgstr ""
+"بعض الأيقونات المستخدمة مأخوذة من <a href=\"http://www.famfamfam.com/lab/"
+"icons/silk/\">مجموعة أيقونات famfamfam Silk</a>، والمرخصة و�ق <a href="
+"\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution "
+"2.5 License</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147
-#: 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:104
-#: views/addons/display.thtml:286
-#: views/addons/display.thtml:290
-#: 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
+#: 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)
+#. 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، %I:%M %p"
@@ -1274,18 +1264,50 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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>. هذا مجرد إخطار، وتستطيع مواصلة إرسال هذه النسخة إلى addons.mozilla.org."
+msgstr ""
+"لا تعلن هذه الإصدارة من إضا�تك تو�قيتها مع �ير�كس %1$s. تتوقع موزيلا صدور "
+"النسخة القادمة من �ير�كس قريبا، �من �ضلك اختبر إضا�تك مع النسخة الجديدة ثم "
+"حدّث معلومات التوا�قية. طالع المزيد عن هذا <a href=\"%2$s\">هنا</a>. هذا مجرد "
+"إخطار، وتستطيع مواصلة إرسال هذه النسخة إلى addons.mozilla.org."
 
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
@@ -1323,36 +1345,36 @@ msgstr "الخطوة الخامسة: نجاح"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "مساعدة الإرسال"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "ع�طّلت الإضا�ة بنجاح"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "تحرير الإضا�ة"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "��عّ�لت الإضا�ة بنجاح"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "وص� الإضا�ة"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "ات�اقية ترخيص المستخدم"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "ص�حة بداية الإضا�ة"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "اسم الإضا�ة"
 
@@ -1361,44 +1383,304 @@ msgstr "اسم الإضا�ة"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "معاينة العنوان"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "سياسة الخصوصية"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "ملخص الإضا�ة"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "بريد الدعم"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "موقع الدعم"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "ملاحظات الإصدارة"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "ترشيح الإصدارة"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "ر�شّحت الإصدارة!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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 للعودة إلى أدوات المطوّرين."
+msgstr ""
+"ز�ر ص�حة %1$s للقيام بتعديلات على ما أرسلته، أو %2$s للعودة إلى أدوات "
+"المطوّرين."
 
 #: views/developers/add_step5.thtml:76
 msgid "devcp_addon_submission_makechanges_devcp_link"
@@ -1410,9 +1692,11 @@ msgstr "حرّر الإضا�ة"
 
 #: views/developers/add_step5.thtml:57
 msgid "devcp_addon_submission_pending"
-msgstr "هذه النسخة و�ضعت �ي ساحة اللعب ريثما تنتظر المراجعة من المختبرين �ي ساحة اللعب و محرّر إضا�ات موزيلا. سو� ت�نبّه بريديًا عند حصول أي حدث."
+msgstr ""
+"هذه النسخة و�ضعت �ي ساحة اللعب ريثما تنتظر المراجعة من المختبرين �ي ساحة "
+"اللعب و محرّر إضا�ات موزيلا. سو� ت�نبّه بريديًا عند حصول أي حدث."
 
-# %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"
@@ -1422,11 +1706,13 @@ msgstr "يمكنك قراءة المزيد عن نظام ساحة اللعب %s.
 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 إضا�تك وأن تخضع للمراجعة، لتنشر �ي الموقع العام."
+msgstr ""
+"و�ض�عت هذه النسخة �ي ساحة اللعب ليستخدمها المستخدمين الخبراء. يجب عليك أن %s "
+"إضا�تك وأن تخضع للمراجعة، لتنشر �ي الموقع العام."
 
 #: views/developers/add_step5.thtml:60
 msgid "devcp_addon_submission_sandboxed_nominate_link"
@@ -1440,16 +1726,16 @@ msgstr "إرسالك للإضا�ة قد اكتمل بنجاح."
 msgid "devcp_addon_submission_trusted_public"
 msgstr "لأن إضا�تك موثوق بها، سو� ي�وا�َق على نشر هذه الإصدارة آليًا على الملأ."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "إرسال الإضا�ة"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1459,7 +1745,7 @@ msgstr "قد ترغب بâ€� %s من أجل زيادة الاهتمام بإضاÙ
 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"
@@ -1469,24 +1755,18 @@ msgstr "تعذر إيجاد المؤل� [%s]"
 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
+#: 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
+#: 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
+#: 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 "التالي"
 
@@ -1494,10 +1774,102 @@ msgstr "التالي"
 msgid "devcp_change_addontype"
 msgstr "غيّر نوع الإضا�ة:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "ح�دّثت تعليقات المطوّر."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "أض�� معاينة"
@@ -1590,8 +1962,8 @@ msgstr "لم يزوّد المطوّر موقعًا للدعم."
 msgid "devcp_details_trusted"
 msgstr "موثوق بها"
 
-#: views/developers/details.thtml:84
-#: views/developers/versions.thtml:65
+#. %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 "الإصدارة %s"
@@ -1614,8 +1986,12 @@ msgstr "أمتأكد أنك تريد أن تعطّل الإضا�ة؟"
 
 #: views/developers/disable.thtml:56
 msgid "devcp_disable_disable_description"
-msgstr "تعطيل هذه الإضا�ة سيخ�يها عن البحث ومن القوائم، ولن يعود بالإمكان تنزيلها من موقع الوب كما لن تظهر �ي التماسات التحديثات عند العميل. عمليًا، ستصبح الإضا�ة �ي حكم المحذو�ة، غير أنه بإمكانك العودة إلى هنا وإعادة تمكينها وقتما تشاء."
+msgstr ""
+"تعطيل هذه الإضا�ة سيخ�يها عن البحث ومن القوائم، ولن يعود بالإمكان تنزيلها من "
+"موقع الوب كما لن تظهر �ي التماسات التحديثات عند العميل. عمليًا، ستصبح الإضا�ة "
+"�ي حكم المحذو�ة، غير أنه بإمكانك العودة إلى هنا وإعادة تمكينها وقتما تشاء."
 
+#. %s is the name of an add-on
 #: views/developers/disable.thtml:55
 #, php-format
 msgid "devcp_disable_disable_title"
@@ -1631,15 +2007,59 @@ msgstr "أمتأكد أنك تريد تمكين هذه الإضا�ة؟"
 
 #: views/developers/disable.thtml:49
 msgid "devcp_disable_enable_description"
-msgstr "تمكين هذه الإضا�ة سيعيد إظهارها عند البحث و�ي القوائم. سيصبح تنزيلها ممكنًا من موقع الوب أو عن طريق التماس التحديث من ق�بَل العميل."
+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/edit.thtml:65
-#: views/developers/edit.thtml:71
+#: views/developers/discuss.thtml:68
+msgid "devcp_discuss_addreply_header"
+msgstr "إضا�ة ردّ"
+
+#: views/developers/discuss.thtml:57
+msgid "devcp_discuss_allreplies_header"
+msgstr "الردود"
+
+#. 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 "حصل خطأ عند ح�ظ ردّك. تواصل رجاءً مع %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."
+
+#. %1 is the add-on name
+#: views/developers/discuss.thtml:43
+msgid "devcp_discuss_pagetitle"
+msgstr "قدّم المزيد من المعلومات �ي مراجعة الإضا�ة %1$s"
+
+#. submit button text
+#: views/developers/discuss.thtml:79
+msgid "devcp_discuss_submit_reply"
+msgstr "أرس�ل الردّ"
+
+#: views/developers/discuss.thtml:72
+msgid "devcp_discuss_success_message"
+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
+msgid "devcp_discuss_writtenby"
+msgstr "كتبه %1$s �ي %2$s"
+
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "أض� المؤل�"
 
@@ -1651,10 +2071,297 @@ msgstr "بريد المؤل� الإلكتروني"
 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 "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+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 "المؤل�ون"
@@ -1720,19 +2427,276 @@ msgstr "اللغة الهد�"
 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: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 "حدّث"
 
 #: views/developers/edit.thtml:121
 msgid "devcp_edit_target_locale_explanation"
-msgstr "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">الاسم المختصر للغة</a>، مثل 'ar'"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">الاسم المختصر "
+"للغة</a>، مثل 'ar'"
+
+#: views/elements/developers/editbox.thtml:46
+#, fuzzy
+msgid "devcp_editbox_authors"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+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
 #, php-format
@@ -1745,7 +2709,7 @@ msgstr[3] "%s مراجعات تحت الإشرا�"
 msgstr[4] "%s مراجعة تحت الإشرا�"
 msgstr[5] "%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
 #, php-format
@@ -1758,7 +2722,7 @@ msgstr[3] "%s إضا�ات مرشحة"
 msgstr[4] "%s إضا�ة مرشحة"
 msgstr[5] "%s إضا�ة مرشحة"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1775,8 +2739,8 @@ msgstr[5] "%s تحديث ينتظر"
 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"
@@ -1802,51 +2766,72 @@ msgstr "ملاحظات إلى المراجع"
 msgid "devcp_editversion_submit_update"
 msgstr "حدّث"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: controllers/developers_controller.php:1992
 msgid "devcp_error_addonname_not_unique"
-msgstr "اسم الإضا�ة موجود مسبقًا �ي قاعدة البيانات. رجاءً تأكد أن: <br /><li>المعرّ�ات ال�ريدة متطابقة، إذ أن السبب الشائع لهذا الخطأ هو عدم تطابق المعرّ�ات ال�ريدة.</li><li>ليس لديك إدخال آخر بن�س الاسم �ي قاعدة البيانات. إن كان لديك واحد، �عليك تحديثه، أو حذ�ه والمحاولة من جديد.</li>"
+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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "رجاءً انظر إلى %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 "هذه الص�حة"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+msgid "devcp_error_file_exists"
+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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "ليست كل معرّ�ات المل�ات ال�ريدة متطابقة"
 
@@ -1875,18 +2860,21 @@ msgstr "تجاوز الحد الأقصى لحجم الر�ع"
 msgid "devcp_error_http_nofile"
 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:401
 #, php-format
 msgid "devcp_error_icon_extension"
 msgstr "امتداد المل� (%s) غير مسموح للأيقونات. اختر رجاءً أحد هذه الأنواع: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "مل� install.rdf م�قود."
 
@@ -1894,21 +2882,26 @@ msgstr "مل� install.rdf م�قود."
 msgid "devcp_error_install_manifest"
 msgstr "و�جدت الأخطاء التالية �ي مل� install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "اختر رجاءً نوع إضا�ة صالح."
 
+#. %$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 "%s ليست إصدارة صالحة ل� %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "معرّ� هذه الإضا�ة غير صالح: %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"
@@ -1916,12 +2909,15 @@ 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"
 msgstr "إصدارة هذه الإضا�ة غير صالحة: الإصدارات لا يمكن أن تحوي على �راغات."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1931,6 +2927,7 @@ msgstr "حصل الخطأ التالي أثناء تحليل install.rdf: %s"
 msgid "devcp_error_move_file"
 msgstr "تعذر نقل المل�"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1953,15 +2950,15 @@ msgstr "تعذر إيجاد معرّ� لهذه الإضا�ة �ي install.rdf.
 msgid "devcp_error_no_platform"
 msgstr "لم تحدّد منصة التشغيل"
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "يجب أن تزوّد الت�اصيل المطلوبة من أجل الترشيح."
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "لا يمكنك ترشيح إضا�ة �ي مرحلة ما قبل الإصدار."
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "يمكنك ترشيح الإضا�ات التي �ي ساحة اللعب �قط."
 
@@ -1973,30 +2970,37 @@ msgstr "اختر رجاءً تصني�ًا واحدًا على الأقل."
 msgid "devcp_error_one_user"
 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:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
 msgid "devcp_error_saving"
 msgstr "حصل خطأ عند محاولة ح�ظ بياناتك."
 
-#: controllers/developers_controller.php:1696
+#: 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "رجاءً ار�ع مل�ًا."
@@ -2005,8 +3009,7 @@ msgstr "رجاءً ار�ع مل�ًا."
 msgid "devcp_file_addanother"
 msgstr "أض�� مل� منصة تشغيل آخر"
 
-#: views/developers/add_step2.thtml:93
-#: views/developers/add_step2.thtml:99
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
 msgid "devcp_form_author_add"
 msgstr "أض�� مؤل�ًا"
 
@@ -2066,8 +3069,7 @@ msgstr "بريد المؤل� الإلكتروني"
 msgid "devcp_form_label_authors"
 msgstr "المؤل�ون"
 
-#: views/developers/add_step2.thtml:103
-#: views/developers/add_step3.thtml:107
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
 msgid "devcp_form_label_categories"
 msgstr "التصني�ات"
 
@@ -2085,7 +3087,7 @@ msgstr "ات�اقية ترخيص المستخدم (EULA)"
 
 #: views/developers/add_step2.thtml:157
 msgid "devcp_form_label_externalsoftware"
-msgstr "This add-on requires external software"
+msgstr "هذه الإضا�ة تتطلب برنامجًا خارجيًا"
 
 #: views/developers/add_step3.thtml:70
 msgid "devcp_form_label_files"
@@ -2103,8 +3105,7 @@ msgstr "مل� الأيقونة"
 msgid "devcp_form_label_name"
 msgstr "الاسم"
 
-#: views/developers/add_step1.thtml:75
-#: views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
 #: views/developers/add_step1.thtml:92
 msgid "devcp_form_label_platforms"
 msgstr "منصات التشغيل المدعومة"
@@ -2155,7 +3156,8 @@ msgstr "ملاحظات للم�راجع"
 
 #: views/developers/add_step3.thtml:114
 msgid "devcp_form_trustedaddon_destination"
-msgstr "لأنّ إضا�تك موثوق بها، ي�رجى منك اختيار المكان الذي ستذهب إليه هذه الإصدارة:"
+msgstr ""
+"لأنّ إضا�تك موثوق بها، ي�رجى منك اختيار المكان الذي ستذهب إليه هذه الإصدارة:"
 
 #: views/developers/add_step3.thtml:119
 msgid "devcp_form_trustedaddon_destination_public"
@@ -2218,11 +3220,14 @@ msgstr "إضا�اتي"
 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)."
+msgstr ""
+"بعض الحقول �ي هذه الص�حة ت�رجمت لتظهر بلغة المستخدم الأصلية. اختر لغة من "
+"الأس�ل لتحرير ت�اصيل الإضا�ة بهذه اللغة. إن لم تكن الترجمة إلى إحدى اللغات "
+"متاحة، سيظهر النص باللغة المبدئية (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
 #: views/elements/developers/myaddons.thtml:68
@@ -2258,45 +3263,90 @@ msgstr "أرس�ل الإضا�ة"
 msgid "devcp_myaddons_title"
 msgstr "أدوات المطوّر"
 
+#. %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 "ع�د إلى ت�اصيل الإضا�ة"
 
-# %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"
 
-# %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: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 "إزالة هذه المعاينة المبدئية سيؤدي آليًا إلى أن تصبح معاينة أخرى هي المعاينة المبدئية."
-
-# %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
+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."
+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:69
+#, fuzzy
+msgid "devcp_notice_unsaved_changes"
+msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2325,27 +3375,120 @@ msgstr "تحرير المعاينة"
 msgid "devcp_preview_updated_successfully"
 msgstr "ح�دّثت المعاينة بنجاح."
 
+#: 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 "استخدم النموذج أدناه لر�ع لقطات صور لإضا�تك من نوع 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:79
+#, fuzzy
+msgid "devcp_previews_header_caption"
+msgstr "Preview Caption"
+
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "حرّر المعاينة"
 
+#: 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 "مل� المعاينة"
 
-#: 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:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "احذ� المعاينة"
@@ -2362,58 +3505,170 @@ msgstr "حرّر المعاينة"
 msgid "devcp_previews_submit_upload"
 msgstr "ار�ع المعاينة"
 
+#: 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 "غير صحيح؟"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "أمتأكد أنك تريد حذ� هذا المل�؟"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78
-#: views/developers/add_step0.thtml:52
+#: 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."
+
+#: 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 "تغاضَ عن تحديث معلوماتي الحالية عن الإضا�ة"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> مستخدمًا نشطًا يوميًا"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "عدد التنزيلات الكامل <em>%s</em>"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "التنزيلات الأسبوعية <em>%s</em>"
 
-#: controllers/developers_controller.php:1481
+#: 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 "إرسال الإضا�ات معطل حاليًا. ي�رجى إعادة المحاولة لاحقًا."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83
-#: views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "أوا�ق"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82
-#: views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "أر�ض"
 
@@ -2429,12 +3684,11 @@ msgstr "معطّلة"
 msgid "devcp_summary_header_trusted"
 msgstr "موثوق بها"
 
-#: views/developers/dashboard.thtml:82
-#: views/developers/index.thtml:82
+#: 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"
@@ -2444,7 +3698,7 @@ msgstr "أنت لا تملك أي إضاÙ�ات. انقر %s لإرسال واحØ
 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"
@@ -2454,30 +3708,667 @@ msgstr "تأكّد رجاءً من %s ل�س�مَت�ك."
 msgid "devcp_theme_upload_preview_link"
 msgstr "ر�ع معاينة"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "ي�رجى الاطلاع على %s كمرجع."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "هذه الص�حة"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "تحرير الإصدارة"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "ح�دّثت الإصدارة بنجاح."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "هذه الإضا�ة معطّلة"
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "ر�شّحت الإضا�ة."
+
+#: controllers/components/editors.php:213
+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
+msgid "editor_review_error_no_action"
+msgstr "اختر إجراء مراجعة رجاءً."
+
+#: controllers/components/editors.php:192
+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
+msgid "editor_review_error_no_comments"
+msgstr "أدخ�ل رجاءً تعليقات المراجعة."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "اختر رجاءً مل�ًا واحدًا على الأقل لمراجعته."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "أدخ�ل رجاءً أنظمة التشغيل التي اختبرت عليها."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "تص�ية"
@@ -2486,8 +4377,7 @@ msgstr "تص�ية"
 msgid "editorcp_logs_filter_by"
 msgstr "تص�ية حسب النوع/الإجراء"
 
-#: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "سجلّ الأحداث"
 
@@ -2539,6 +4429,7 @@ msgstr "أخ�� التعليقات"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "أظه�ر التعليقات"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2548,8 +4439,7 @@ msgstr "اعرض الإدخالات بين %s و %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "لا يوجد مراجعات �ي هذه ال�ترة."
 
-#: views/editors/reviewlog.thtml:42
-#: controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "سجلّ المراجعات"
 
@@ -2573,29 +4463,28 @@ msgstr "نشاط المحرّر مؤخرًا"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "كل المراجعات"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "مراجعة الإضا�ة"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "أكم�ل رجاءً الحقول التالية:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "اختر رجاءً مل�ًا واحدًا على الأقل لمراجعته."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "مراجعاتك لإضا�تك غير مسموحة."
 
-#: controllers/editors_controller.php:305
+#: 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 "أض�� ميزة"
 
@@ -2603,54 +4492,47 @@ msgstr "أض�� ميزة"
 msgid "editors_featured_add_feature_submit"
 msgstr "أض��"
 
-#: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "أضي�ت الميزة بنجاح."
 
-#: views/editors/featured.thtml:50
-#: controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "�شلت إزالة الميزة."
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "أزيلت الميزة بنجاح."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: 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 "أز�ل الميزة"
 
@@ -2674,41 +4556,40 @@ msgstr "سياسة الإضا�ة"
 msgid "editors_notice_filter_session"
 msgstr "ستبقى هذه المص�ّيات طوال هذه الجلسة أو حتى مسحها."
 
-# %1 is the queue mode
-#: views/editors/queue.thtml:108
-#: views/admin/flagged_queue.thtml:75
+#. %1 is the queue mode
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "لا يوجد إضا�ات من هذا النوع حاليًا لمراجعتها."
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "يوم واحد"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "ساعة واحدة"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "دقيقة واحدة"
 
-#: controllers/editors_controller.php:58
-#: controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "أدوات المحرّر"
 
-#: controllers/editors_controller.php:286
+#. %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 "%s �قط"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "ما-قبل-الإصدارة"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2722,19 +4603,23 @@ msgstr "امسح"
 msgid "editors_queue_submit_filter"
 msgstr "صَ�ّ�"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "جميع طوابير المراجعات معطلة حاليًا. ي�رجى إعادة المحاولة لاحقًا."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "إجراء المراجعة"
 
+#: views/editors/review.thtml:153
+msgid "editors_review_action_info"
+msgstr "اطلب المزيد من المعلومات"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "انشر على العموم"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "اطلب مراجعة ممتازة"
 
@@ -2742,29 +4627,41 @@ msgstr "اطلب مراجعة ممتازة"
 msgid "editors_review_action_sandbox"
 msgstr "أبْق�ها �ي ساحة اللعب"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "تعليقات المراجعة"
 
-#: views/editors/review.thtml:167
+#: views/editors/review.thtml:176
+msgid "editors_review_details_info_request"
+msgstr ""
+"استخدم هذا النموذج لطلب المزيد من المعلومات من المؤل�. سيستلم المؤل� رسالة "
+"ليتمكن من الإجابة هنا، وستستلم إشعارًا بريديًا عندما يجيب."
+
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
-msgstr "هذا سيضي� علامة النشر للعموم على الإضا�ة وإصدارتها الأخيرة ومل�اتها. ستوضع الإصدارات المستقبلية �ي ساحة اللعب حتى يراجعها أحد المحرّرين."
+msgstr ""
+"هذا سيضي� علامة النشر للعموم على الإضا�ة وإصدارتها الأخيرة ومل�اتها. ستوضع "
+"الإصدارات المستقبلية �ي ساحة اللعب حتى يراجعها أحد المحرّرين."
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "هذا سيبقي الإضا�ة �ي ساحة اللعب."
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
-msgstr "هذا سيعطي الإذن لنسخة ساحة لعب من إضا�ة عامة بأن ت�نشر �ي الساحة العامة."
+msgstr ""
+"هذا سيعطي الإذن لنسخة ساحة لعب من إضا�ة عامة بأن ت�نشر �ي الساحة العامة."
 
-#: views/editors/review.thtml:162
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "هذا سيجبر نسخة ساحة لعب من إضا�ة عامة على البقاء �ي ساحة اللعب."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
-msgstr "إن كنتَ مهتمًا بخصوص أمن هذه الإضا�ة أو شؤون حقوق نسخها أو أي أمور أخرى ينبغي للمدير أن يطلع عليها، أدخ�ل تعليقاتك �ي المساحة أدناه، وست�رسل إلى المدراء لا إلى المؤل�."
+msgstr ""
+"إن كنتَ مهتمًا بخصوص أمن هذه الإضا�ة أو شؤون حقوق نسخها أو أي أمور أخرى ينبغي "
+"للمدير أن يطلع عليها، أدخ�ل تعليقاتك �ي المساحة أدناه، وست�رسل إلى المدراء لا "
+"إلى المؤل�."
 
 #: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
@@ -2786,15 +4683,15 @@ msgstr "التصني�ات:"
 msgid "editors_review_header_compatibility"
 msgstr "التوا�قية:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "الوص�"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "تعليقات المطوّر"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "ات�اقية ترخيص المستخدم"
 
@@ -2802,92 +4699,112 @@ msgstr "ات�اقية ترخيص المستخدم"
 msgid "editors_review_header_files"
 msgstr "المل�ات:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "تاريخ العناصر"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "رسالة الترشيح"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "المعاينات"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "راجع %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "ملاحظات للمراجع"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "الملخص"
 
-#: views/editors/review.thtml:240
+#: 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
+msgid "editors_review_history_info_reply"
+msgstr "ردّ"
+
+#: views/elements/developers/editors_review_history_item.thtml:78
+msgid "editors_review_history_info_request"
+msgstr "طلب معلومات"
+
+#: views/elements/developers/editors_review_history_item.thtml:62
 #: views/editors/reviewlog.thtml:77
-#: views/editors/review.thtml:295
 msgid "editors_review_history_nominated_adminreview"
 msgstr "مراجعة للمدير"
 
+#: views/elements/developers/editors_review_history_item.thtml:56
 #: views/editors/reviewlog.thtml:71
-#: views/editors/review.thtml:289
 msgid "editors_review_history_nominated_approved"
 msgstr "الترشيح مقبول/الساحة العامة"
 
+#: views/elements/developers/editors_review_history_item.thtml:59
 #: views/editors/reviewlog.thtml:74
-#: views/editors/review.thtml:292
 msgid "editors_review_history_nominated_denied"
 msgstr "الترشيح مر�وض/ساحة اللعب"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "تعذر إيجاد إدخالات مراجعات سابقة."
 
+#: views/elements/developers/editors_review_history_item.thtml:73
 #: views/editors/reviewlog.thtml:88
-#: views/editors/review.thtml:306
 msgid "editors_review_history_pending_adminreview"
 msgstr "مراجعة للمدير"
 
+#: views/elements/developers/editors_review_history_item.thtml:67
 #: views/editors/reviewlog.thtml:82
-#: views/editors/review.thtml:300
 msgid "editors_review_history_pending_approved"
 msgstr "مقبولة/الساحة العامة"
 
+#: views/elements/developers/editors_review_history_item.thtml:70
 #: views/editors/reviewlog.thtml:85
-#: views/editors/review.thtml:303
 msgid "editors_review_history_pending_denied"
 msgstr "مر�وضة/ساحة اللعب"
 
-#: views/editors/review.thtml:198
+#. 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] "أظه�ر/أخ�� الردود (%1$s)"
+msgstr[1] "أظه�ر/أخ�� الردّ (%1$s)"
+msgstr[2] "أظه�ر/أخ�� الردّين (%1$s)"
+msgstr[3] "أظه�ر/أخ�� الردود (%1$s)"
+msgstr[4] "أظه�ر/أخ�� الردود (%1$s)"
+msgstr[5] "أظه�ر/أخ�� الردود (%1$s)"
+
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "التطبيقات:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "أو اختر ردًا معلبًا:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "التعليقات:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "أنظمة التشغيل:"
 
-#: views/editors/review.thtml:268
-#: views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "�وق"
 
@@ -2895,7 +4812,7 @@ msgstr "�وق"
 msgid "editors_review_next_link"
 msgstr "تالي &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "لا معاينات موجودة."
 
@@ -2903,41 +4820,46 @@ msgstr "لا معاينات موجودة."
 msgid "editors_review_previous_link"
 msgstr "&laquo; سابق"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> من أصل %2$s �ي الطابور"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "ق�م بالإجراء"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "الإجراء"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "التعليقات"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "التاريخ"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "الم�راجع"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "إصدارة/مل�"
 
-#: controllers/editors_controller.php:411
+#: views/editors/review.thtml:213
+msgid "editors_review_update_notify_once"
+msgstr ""
+"نبّهني عند وجود تحديث لهذه الإضا�ة (التحديثات اللاحقة لن تتسبب بإرسال رسالة)."
+
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "عولجت المراجعة بنجاح."
 
@@ -2961,7 +4883,7 @@ msgstr "الإجراء"
 msgid "editors_reviews_in_reply_to"
 msgstr "ردًا على:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "عولجت المراجعات بنجاح!"
 
@@ -2973,23 +4895,23 @@ msgstr "لا يوجد مراجعات تحت الإشرا� حاليًا."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "عالج المراجعات"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "مختص بموقع معيّن"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "جديد"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "م�حدَّث"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "تطبيق مجرَّب"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "أنظمة تشغيل مجرَّبة"
 
@@ -2997,8 +4919,7 @@ msgstr "أنظمة تشغيل مجرَّبة"
 msgid "editors_th_additional_info"
 msgstr "معلومات إضا�ية"
 
-#: views/editors/featured.thtml:63
-#: views/editors/queue.thtml:73
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "الإضا�ة"
@@ -3031,30 +4952,30 @@ msgstr "المنصات"
 msgid "editors_th_submissiontypes"
 msgstr "أنواع الإرسال"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s يومًا"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ساعة"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: 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:610
-#: controllers/components/amo.php:611
-#: controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
+#: controllers/components/amo.php:611 controllers/components/amo.php:612
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "الوصول ممنوع"
 
@@ -3062,12 +4983,13 @@ msgstr "الوصول ممنوع"
 msgid "error_access_denied_message"
 msgstr "غير مسموح لك بمشاهدة هذه الص�حة."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3077,22 +4999,19 @@ msgstr "غير مسموح لك بمشاهدة هذه الص�حة."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339
-#: controllers/api_controller.php:123
-#: controllers/api_controller.php:759
-#: controllers/api_controller.php:894
-#: controllers/api_controller.php:925
-#: controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
+#: controllers/api_controller.php:759 controllers/api_controller.php:894
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "الإضا�ة غير موجودة!"
 
-#: controllers/files_controller.php:83
-#: controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "لا يمكن مشاهدة هذه الإضا�ة هنا."
 
@@ -3100,7 +5019,7 @@ msgstr "لا يمكن مشاهدة هذه الإضا�ة هنا."
 msgid "error_addon_selfreview"
 msgstr "لا يمكنك أن تضع مراجعة لإضا�تك الشخصية."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "لا يوجد إضا�ات �ي هذا التصني�!"
 
@@ -3108,53 +5027,40 @@ msgstr "لا يوجد إضا�ات �ي هذا التصني�!"
 msgid "error_collection_feed_notfound"
 msgstr "تلقيم الإضا�ة غير موجود"
 
-#: views/users/register.thtml:60
-#: views/users/edit.thtml:176
-#: views/developers/add_step2.thtml:117
-#: controllers/api_controller.php:907
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117 controllers/api_controller.php:907
 msgid "error_email_invalid"
 msgstr "هذا ليس بريدًا إلكترونيًا صالحًا."
 
-#: 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/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:91
-#: controllers/files_controller.php:94
-#: controllers/files_controller.php:152
-#: controllers/files_controller.php:165
-#: controllers/files_controller.php:174
-#: controllers/files_controller.php:192
-#: controllers/editors_controller.php:509
+#: 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 "المل� غير موجود!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "خطا �ي المل�: %s غير موجود."
 
-#: views/users/register.thtml:49
-#: views/users/edit.thtml:84
-#: views/reviews/add.thtml:84
-#: controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
-#: 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 "هناك أخطاء �ي هذا النموذج. ي�رجى تصحيح الأخطاء ثم إعادة الإرسال."
 
@@ -3162,40 +5068,36 @@ msgstr "هناك أخطاء �ي هذا النموذج. ي�رجى تصحيح ا
 msgid "error_invalid_captcha"
 msgstr "الكابتشا غير صالحة، ي�رجى المحاولة ثانية!"
 
-#: views/users/register.thtml:95
-#: views/users/edit.thtml:128
-#: views/developers/add_step2.thtml:112
-#: views/developers/add_step2.thtml:122
+#: 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:254
-#: controllers/users_controller.php:542
-#: controllers/users_controller.php:642
+#: 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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470
-#: controllers/api_controller.php:900
-#: controllers/addons_controller.php:87
-#: controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "المعامل ناقص: %s"
 
-#: controllers/components/amo.php:506
-#: controllers/components/amo.php:531
+#: 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
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
 msgid "error_notice"
 msgstr "ملاحظة"
 
@@ -3203,8 +5105,7 @@ msgstr "ملاحظة"
 msgid "error_preview_notfound"
 msgstr "المعاينة غير موجودة!"
 
-#: views/addons/display.thtml:373
-#: views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "يجب عليك اختيار تقييم."
 
@@ -3212,62 +5113,55 @@ msgstr "يجب عليك اختيار تقييم."
 msgid "error_user_already_confirmed"
 msgstr "حساب المستخدم هذا قد أكّ�د مسبقًا."
 
-#: 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: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:70
+#: 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:60
-#: views/users/edit.thtml:172
+#: 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:580
-#: controllers/users_controller.php:581
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
-msgstr "انتهت مهلة تغيير البريد الإلكتروني. ي�رجى تغيير البريد الإلكتروني مجددًا �ي مل� المستخدم الشخصي والنقر على الوصلة �ي رسالة التأكيد حالما تستلمها."
+msgstr ""
+"انتهت مهلة تغيير البريد الإلكتروني. ي�رجى تغيير البريد الإلكتروني مجددًا �ي "
+"مل� المستخدم الشخصي والنقر على الوصلة �ي رسالة التأكيد حالما تستلمها."
 
-#: views/users/register.thtml:86
-#: views/users/edit.thtml:119
+#: 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:260
-#: controllers/users_controller.php:592
+#: 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:68
 msgid "error_username_or_pw_wrong"
 msgstr "اسم المستخدم أو كلمة السر خطأ!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "الإصدارة غير موجودة!"
 
-#: views/users/delete.thtml:118
-#: views/users/edit.thtml:152
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "كلمة السر التي أدخلتها خطأ!"
 
@@ -3275,16 +5169,15 @@ msgstr "كلمة السر التي أدخلتها خطأ!"
 msgid "feature_learnmore"
 msgstr "اعر� المزيد"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "اعر� المزيد عن %1$s"
 
-#: views/elements/addon_listitem.thtml:132
-#: views/elements/feature.thtml:99
-#: views/addons/display.thtml:98
-#: views/addons/browse_thumbs.thtml:100
+#. %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"
@@ -3299,6 +5192,40 @@ msgstr[5] "%1$s مراجعة"
 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
+msgid "file_browser_link_addon"
+msgstr "عودة إلى الإضا�ة"
+
+#. 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 "وسّع الكل"
+
+#. 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 "عودة إلى المراجعة"
+
+#. 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 :: مستعرض المل�ات :: إضا�ات %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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "جميع الحقوق مح�وظة."
@@ -3313,7 +5240,10 @@ msgstr "المساهمون"
 
 #: views/elements/footer.thtml:73
 msgid "footer_disclaimer"
-msgstr "تزوّد موزيلا وصلات لهذه التطبيقات من باب المجاملة، ولكنها لا تقدّم أيّ تعري�ات بهذه التطبيقات ولا معلومات متعلقة بها. يجب توجيه أي أسئلة أو شكاوى أو احتجاجات بخصوص هذه التطبيقات إلى بائع البرنامج."
+msgstr ""
+"تزوّد موزيلا وصلات لهذه التطبيقات من باب المجاملة، ولكنها لا تقدّم أيّ تعري�ات "
+"بهذه التطبيقات ولا معلومات متعلقة بها. يجب توجيه أي أسئلة أو شكاوى أو "
+"احتجاجات بخصوص هذه التطبيقات إلى بائع البرنامج."
 
 #: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
@@ -3331,7 +5261,7 @@ msgstr "لغات أخرى:"
 msgid "footer_privacy_policy"
 msgstr "سياسة الخصوصية"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "اح�ظ"
 
@@ -3339,7 +5269,7 @@ msgstr "اح�ظ"
 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:110
 msgid "general_addontype_dict_plural"
 msgstr "قواميس"
@@ -3348,7 +5278,7 @@ msgstr "قواميس"
 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:108
 msgid "general_addontype_extension_plural"
 msgstr "امتدادات"
@@ -3357,7 +5287,7 @@ msgstr "امتدادات"
 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "حزمات لغات (إضا�ة)"
@@ -3366,7 +5296,7 @@ msgstr "حزمات لغات (إضا�ة)"
 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "حزمات لغات (تطبيق)"
@@ -3375,7 +5305,7 @@ msgstr "حزمات لغات (تطبيق)"
 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "ملحقات"
@@ -3384,7 +5314,7 @@ msgstr "ملحقات"
 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:111
 msgid "general_addontype_search_plural"
 msgstr "محركات بحث"
@@ -3393,13 +5323,13 @@ msgstr "محركات بحث"
 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:109
 msgid "general_addontype_theme_plural"
 msgstr "سمات"
 
-#: views/elements/header.thtml:111
-#: views/elements/header.thtml:122
+#. %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 "ع�د إلى ص�حة بداية إضا�ات %1$s"
@@ -3429,13 +5359,12 @@ msgid "header_navlink_addons"
 msgstr "الإضا�ات"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72
-#: views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "خروج"
 
@@ -3443,40 +5372,43 @@ msgstr "خروج"
 msgid "header_navlink_myaccount"
 msgstr "حسابي"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "تسجيل"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81
-#: views/elements/feature.thtml:84
+#: 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/install.thtml:229
 msgid "install_a_login_to_install"
-msgstr "<a href=\"%1$s\">سجّل دخولك</a> لتثبيت هذه الإضا�ة التجريبية. <a href=\"%2$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/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/install.thtml:146
-#: views/elements/install.thtml:164
-#: views/elements/install.thtml:197
-#: views/elements/install.thtml:220
+#. %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 "أض�� %1$s إلى %2$s"
 
+#. %1$s is the add-on name
 #: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3498,10 +5430,8 @@ msgstr "نزّل القاموس"
 msgid "langtools_download_langpack"
 msgstr "نزّل حزمة اللغة"
 
-#: views/elements/addon_categories.thtml:54
-#: views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701
-#: controllers/addons_controller.php:894
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "القواميس وحزمات اللغات"
 
@@ -3525,12 +5455,9 @@ msgstr "حزمة اللغة"
 msgid "langtools_tableheader_language"
 msgstr "اللغة"
 
-#: 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
+#: 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 "انقر هنا للعودة إلى ص�حة الواجهة."
 
@@ -3552,7 +5479,7 @@ msgstr "التقييم"
 
 #: config/bootstrap.php:278
 msgid "main_prettyname_fennec"
-msgstr "Fennec"
+msgstr "��نّ�ك"
 
 #: config/bootstrap.php:274
 msgid "main_prettyname_firefox"
@@ -3575,20 +5502,17 @@ msgid "main_prettyname_thunderbird"
 msgstr "ثندر�ب�رد"
 
 #: views/elements/addon_categories.thtml:53
-#: views/elements/addon_categories.thtml:54
-#: controllers/components/amo.php:680
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:680
 #: controllers/components/amo.php:682
 msgid "nav_category_dicts_langpacks"
 msgstr "القواميس وحزمات اللغات"
 
-#: controllers/components/amo.php:715
-#: controllers/components/amo.php:717
+#: controllers/components/amo.php:715 controllers/components/amo.php:717
 msgid "nav_category_plugins"
 msgstr "الملحقات"
 
 #: views/elements/addon_categories.thtml:57
-#: views/elements/addon_categories.thtml:58
-#: controllers/components/amo.php:686
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:686
 msgid "nav_category_themes"
 msgstr "السمات"
 
@@ -3596,7 +5520,7 @@ msgstr "السمات"
 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:214
 msgid "other_users"
 msgstr "أخرى"
@@ -3609,35 +5533,34 @@ msgstr "إصدارات التطبيقات"
 msgid "page_title_credits"
 msgstr "المساهمون"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "الإضا�ات التجريبية"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
 msgstr "الأسئلة الأكثر تكرارًا"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "الأسئلة الأكثر شيوعًا عن جعل �َيَر��كس عصريًا"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "سياسة الإضا�ات"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "سياسة خصوصية موزيلا"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "إرشادات المراجعات"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "نظام مراجعات ساحة اللعب"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "مساعدة الإرسال"
 
@@ -3645,20 +5568,27 @@ msgstr "مساعدة الإرسال"
 msgid "pages_appversions_guid"
 msgstr "المعرّ� ال�ريد"
 
-#: views/pages/appversions.thtml:78
-#: controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "إصدارات التطبيقات الصالحة"
 
 #: 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: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:92
 msgid "pages_appversions_required_files_link"
 msgstr "هنا"
@@ -3667,7 +5597,6 @@ msgstr "هنا"
 msgid "pages_appversions_versions"
 msgstr "الإصدارات"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "عودة إلى الص�حة السابقة"
 
@@ -3679,7 +5608,7 @@ 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"
@@ -3691,7 +5620,9 @@ 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"
@@ -3701,17 +5632,21 @@ 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>."
+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
+#. %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:100
 msgid "recaptcha_label"
@@ -3721,7 +5656,7 @@ msgstr "هل أنت إنسان؟"
 msgid "recaptcha_whatsthis"
 msgstr "ما هذا؟"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "حصل خطأ عند تعليم هذه المراجعة!"
 
@@ -3729,8 +5664,7 @@ msgstr "حصل خطأ عند تعليم هذه المراجعة!"
 msgid "review_flag_reason_bug_support"
 msgstr "التبليغ عن العلة أو طلب الدعم موضوع �ي غير مكانه"
 
-#: views/reviews/display.thtml:107
-#: views/reviews/display.thtml:190
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "بلّغ عن هذه المراجعة (اختر سببًا)"
 
@@ -3746,9 +5680,8 @@ msgstr "سبب آخر (ي�رجى التحديد)"
 msgid "review_flag_reason_spam"
 msgstr "س�خام أو محتوى غير متعلق بالمراجعات"
 
-#: views/reviews/display.thtml:95
-#: views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "شكرًا؛ لقد ع�لّمتْ هذه المراجعة انتظارًا لموا�قة المحرّر."
 
@@ -3758,30 +5691,41 @@ 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: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>"
-
-# %1 is the addon name
-#: views/reviews/flag.thtml:54
-#: views/reviews/display.thtml:54
+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:54 views/reviews/display.thtml:54
 #: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "مراجعات ل� %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "الإضا�ات المميزة"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "الإضا�ات الأحدث"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "الإضا�ات المحدّثة"
 
@@ -3793,8 +5737,7 @@ msgstr "البحث معطل حاليًا، ÙŠÙ�رجى إعادة المحاولØ
 msgid "search_form_all_addons"
 msgstr "كل الإضا�ات"
 
-#: views/elements/search.thtml:170
-#: views/elements/search.thtml:182
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
 #: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "ابحث عن الإضا�ات"
@@ -3819,6 +5762,7 @@ msgstr "كل محركات البحث"
 msgid "search_landing_browse_search_engines"
 msgstr "استعرض محركات البحث"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3842,21 +5786,21 @@ msgstr "بحث عن الإضا�ات"
 msgid "search_rss_description"
 msgstr "تلقيم نتائج البحث"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "نتائج البحث ل�: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "أدوات المدير"
 
-#: views/elements/header.thtml:146
-#: views/addons/home.thtml:164
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "أدوات المطوّر"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "أدوات المحرّر"
 
@@ -3864,13 +5808,13 @@ msgstr "أدوات المحرّر"
 msgid "sidebar_navlink_welcome"
 msgstr "أهلًا وسهلًا"
 
+#. %s is the user's name
 #: 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 "القاموس"
 
@@ -3894,8 +5838,7 @@ msgstr "ابحث عن ملحق"
 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 "السمة"
 
@@ -3903,10 +5846,9 @@ msgstr "السمة"
 msgid "sidebar_pitch_updated_addons"
 msgstr "الإضا�ات المحدّثة"
 
-#: views/helpers/localization.php:65
-#: views/developers/editversion.thtml:58
-#: views/developers/versions_edit.thtml:94
-#: views/developers/add_step3.thtml:74
+#. %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"
@@ -3916,7 +5858,7 @@ msgstr "%1$s ك.بايت"
 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3934,28 +5876,32 @@ msgstr "أدوات المطوّر"
 msgid "statistics_addon_switch"
 msgstr "بدّل الإضا�ة"
 
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:167
+#. 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"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:138
+#. 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"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:147
-#: views/statistics/addon.thtml:158
+#. 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 "أنش�ئت %1$s"
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3979,7 +5925,9 @@ msgstr "أو اختر إضا�ة لها إحصائيات عامة"
 
 #: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
-msgstr "اختر واحدة من إضا�اتك لعرض إحصائياتهاSelect one of your add-ons to view its statistics"
+msgstr ""
+"اختر واحدة من إضا�اتك لعرض إحصائياتهاSelect one of your add-ons to view its "
+"statistics"
 
 #: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
@@ -3997,8 +5945,7 @@ msgstr "لوحة الإحصائيات"
 msgid "statistics_index_view_button"
 msgstr "اعرض الإحصائيات"
 
-#: views/statistics/addon.thtml:210
-#: controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "اعرض هذا الجدول �ي تنسيق CSV"
 
@@ -4014,7 +5961,7 @@ msgstr "أز�ل هذا المخطّط"
 msgid "statistics_js_groupby_selector_date"
 msgstr "تجميع حسب: اليوم"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "تجميع حسب: الشهر"
 
@@ -4022,103 +5969,107 @@ msgstr "تجميع حسب: الشهر"
 msgid "statistics_js_groupby_selector_week"
 msgstr "تجميع حسب: الأسبوع"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "قار�ن حسب: الأسبوع"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "و�جد %s �ي المجال"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "أض�� مخططًا"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "أض�� مخططًا آخر لهذا الرسم البياني"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "أخ�� المجموع الكامل"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "أظه�ر المجموع الكامل"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "أض�� المجموع الكامل �ي هذا الرسم البياني"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "شاهد البيانات (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "احصل على مل� من هذه البيانات ق�يَم�ه� م�صولة ب�اصلة"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "أخ�� أحداث %s"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "أظه�ر أحداث %s"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "أظه�ر تواريخ إصدار الإضا�ة على المخططات"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "أخ�� أحداث �َيَر��كس"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "أظه�ر أحداث �َيَر��كس"
 
-#: controllers/statistics_controller.php:241
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "عيّن تواريخ إصدار �َيَر��كس على المخططات"
 
-#: controllers/statistics_controller.php:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "قلّص الرسم البياني"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "وسّع الرسم البياني"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "غيّر حجم الرسم البياني"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "المستخدمون النشطون يوميًا"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "التطبيق"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "مخصص"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "التنزيلات"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "نظام التشغيل"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "حالة الإضا�ة"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "الملخص"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "إصدارة الإضا�ة"
 
@@ -4142,23 +6093,27 @@ msgstr "مجهول"
 msgid "statistics_longnames_version"
 msgstr "إصدارة الإضا�ة"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
-msgstr "لا يوجد بيانات كا�ية حاليًا لعرض هذا الرسم البياني. ي�رجى إعادة المحاولة لاحقًا."
+msgstr ""
+"لا يوجد بيانات كا�ية حاليًا لعرض هذا الرسم البياني. ي�رجى إعادة المحاولة لاحقًا."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr "نحن لا نملك أي بيانات عن إضا�تك بعد. ي�رجى إعادة التحقق بعد عدة أيام."
 
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
-msgstr "يتمّ تحديث إحصائيات الإضا�ة �ي الوقت الحالي. المعلومات الأخيرة قد تكون غير مكتملة لأن نصوصنا البرمجية تعمل على تحديث هذه المعلومات. يرجى إعادة المحاولة بعد دقائق."
+msgstr ""
+"يتمّ تحديث إحصائيات الإضا�ة �ي الوقت الحالي. المعلومات الأخيرة قد تكون غير "
+"مكتملة لأن نصوصنا البرمجية تعمل على تحديث هذه المعلومات. يرجى إعادة المحاولة "
+"بعد دقائق."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "لوحة الإحصائيات معطلة حاليًا. ي�رجى معاودة المحاولة لاحقًا."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "جا�اسكربت مطلوبة لمشاهدة الرسوم البيانية للوحة الإحصائيات."
 
@@ -4173,36 +6128,36 @@ msgstr "لقد ح�دّثت إعداداتك!"
 msgid "statistics_pagetitle"
 msgstr "لوحة الإحصائيات"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "المستخدمون النشطون يوميًا"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "التنزيلات اليومية"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "رؤية أقرب"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "رؤية أقرب بشهر واحد"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "رؤية أبعد"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "رؤية أبعد بشهر واحد"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "ملخص الإحصاءات اليومية ل� %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "تلقيم RSS لبيانات الملخص"
 
@@ -4217,7 +6172,9 @@ msgstr "إحصائيات %1$s"
 
 #: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
-msgstr "بشكل ا�تراضي، لا ي�سمح إلا لك ولموزيلا �قط بالوصول إلى المعلومات التي �ي لوحة قيادتك. غير أنه بإمكانك �تح ذلك للعموم ليتمكّن أي شخص من مشاهدة بيانات إضا�تك."
+msgstr ""
+"بشكل ا�تراضي، لا ي�سمح إلا لك ولموزيلا �قط بالوصول إلى المعلومات التي �ي لوحة "
+"قيادتك. غير أنه بإمكانك �تح ذلك للعموم ليتمكّن أي شخص من مشاهدة بيانات إضا�تك."
 
 #: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
@@ -4239,23 +6196,23 @@ msgstr "عام"
 msgid "statistics_settings_access_public_description"
 msgstr "أيّ شخص يمكنه مشاهدة إحصائيات هذه الإضا�ة"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "غيّر الإعدادات"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "تعامل رجاءً مع هذه المعلومات على أنها سرّية."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "لوحة القيادة هذه <b>خاصة</b> حاليًا."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "لوحة القيادة هذه <b>عامة</b> حاليًا."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "مق�لة"
 
@@ -4272,7 +6229,7 @@ msgstr "اح�ظ الإعدادات"
 msgid "statistics_settings_title"
 msgstr "إعدادات لوحة الإحصائيات ل� %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "غير مق�لة"
 
@@ -4296,8 +6253,7 @@ msgstr "مجهول"
 msgid "statistics_shortnames_version"
 msgstr "إصدارة"
 
-#: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "متوسط التنزيلات اليومية"
 
@@ -4305,46 +6261,37 @@ msgstr "متوسط التنزيلات اليومية"
 msgid "statistics_summary_downloads_heading"
 msgstr "التنزيلات"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149
-#: views/statistics/addon.thtml:169
+#: 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:70
-#: views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s �ي %2$s"
@@ -4353,20 +6300,17 @@ msgstr "%1$s �ي %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "المستخدمون النشطون يوميًا"
 
-#: views/statistics/rss/summary.thtml:46
-#: views/statistics/addon.thtml:143
+#: 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:147
+#: 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:257
+#: 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"
@@ -4379,13 +6323,11 @@ msgstr "كل السمات"
 msgid "themes_landing_browse_themes"
 msgstr "استعرض السمات"
 
-#: views/users/edit.thtml:99
-#: views/users/edit.thtml:167
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "غيّر البريد الإلكتروني"
 
-#: views/users/edit.thtml:98
-#: views/users/edit.thtml:148
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "غيّر كلمة السر"
 
@@ -4393,10 +6335,12 @@ msgstr "غيّر كلمة السر"
 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: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:95
 msgid "user_del_community_sad"
@@ -4410,12 +6354,15 @@ msgstr "أكّد كلمة السر"
 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: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:69
 msgid "user_del_error_addons_more_questions"
 msgstr "إن كان لديك أسئلة إضا�ية، تواصل مع %1$s للحصول على المساعدة."
@@ -4428,16 +6375,18 @@ msgstr "عليك أن تؤشّر على الصندوق \"أ�هم ذلك...\" ل
 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:83
 msgid "user_del_error_unknown"
-msgstr "حصل خطأ غير معرو� أثناء حذ� حسابك. تواصل رجاءً مع %1$s وبلّغه عن المشكلة وسو� نحذ�ه من أجلك. نعتذر عن هذا الخطأ."
+msgstr ""
+"حصل خطأ غير معرو� أثناء حذ� حسابك. تواصل رجاءً مع %1$s وبلّغه عن المشكلة وسو� "
+"نحذ�ه من أجلك. نعتذر عن هذا الخطأ."
 
 #: 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:93
 msgid "user_del_header_delete_account"
 msgstr "حذ� حساب المستخدم %1$s"
@@ -4452,16 +6401,19 @@ msgstr "لن يعود باستطاعتك تسجيل دخولك إلى إضا�ا
 
 #: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
-msgstr "عند النقر على \"احذ�\"، <strong>سي�حذ� حسابك نهائيًا</strong>، وهذا يعني:"
+msgstr ""
+"عند النقر على \"احذ�\"، <strong>سي�حذ� حسابك نهائيًا</strong>، وهذا يعني:"
 
 #: 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:97
 msgid "user_del_specific_problem_editors"
-msgstr "إن كان لديك مشكلة ميّنة �قد نستطيع المساعدة. رجاءً لا تحذ� حسابك الآم، ولكن تواصل معنا �ي %1$s وسنبذل جهدنا لمساعدتك �ي حل مشكلتك."
+msgstr ""
+"إن كان لديك مشكلة ميّنة �قد نستطيع المساعدة. رجاءً لا تحذ� حسابك الآم، ولكن "
+"تواصل معنا �ي %1$s وسنبذل جهدنا لمساعدتك �ي حل مشكلتك."
 
 #: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
@@ -4471,27 +6423,31 @@ msgstr "أنا أ�هم أنه لا يمكن التراجع عن هذه الخط
 msgid "user_deleted_nickname"
 msgstr "مستخدم محذو�"
 
-# %1 is the new email address
-#: views/users/edit.thtml:58
-#: views/users/edit.thtml:59
+#. %1 is the new email address
+#: 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: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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
 msgstr ""
 "مرحبًا �ي إضا�ات %2$s.\n"
 "\n"
-"قبل أن يمكنك استخدام حسابك، عليك أن ت�عّله - ذلك يضمن أن بريدك الإلكتروني الذي تستخدمه صالح وتعود ملكيته إليك.\n"
-"لت�عيل حسابك، انقر على الرابط أدناه أو انسخه إلى شريط تحديد الموقع �ي متص�حك:\n"
+"قبل أن يمكنك استخدام حسابك، عليك أن ت�عّله - ذلك يضمن أن بريدك الإلكتروني "
+"الذي تستخدمه صالح وتعود ملكيته إليك.\n"
+"لت�عيل حسابك، انقر على الرابط أدناه أو انسخه إلى شريط تحديد الموقع �ي "
+"متص�حك:\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -4500,7 +6456,7 @@ msgstr ""
 "شكرًا لانضمامك إلى إضا�ات %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4508,11 +6464,13 @@ msgid "user_email_confirm_emailchange"
 msgstr ""
 "لقد طلبت تغيير بريدك الإلكتروني �ي إضا�ات %2$s.\n"
 "\n"
-"من أجل التأكيد على البريد الإلكتروني الجديد، انقر على الرابط أدناه أو انسخه إلى شريط تحديد الموقع �ي متص�حك:\n"
+"من أجل التأكيد على البريد الإلكتروني الجديد، انقر على الرابط أدناه أو انسخه "
+"إلى شريط تحديد الموقع �ي متص�حك:\n"
 "\n"
 "%1$s\n"
 "\n"
-"أمامك 24 ساعة حتى تؤكّد البريد الجديد. إن لم تعد تريد تغيير البريد الإلكتروني، بإمكانك تجاهل هذه الرسالة حينها.\n"
+"أمامك 24 ساعة حتى تؤكّد البريد الجديد. إن لم تعد تريد تغيير البريد "
+"الإلكتروني، بإمكانك تجاهل هذه الرسالة حينها.\n"
 "\n"
 "شكرًا!\n"
 "-- �ريق عمل إضا�ات %2$s"
@@ -4522,15 +6480,17 @@ 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
 #, php-format
 msgid "user_email_pwreset"
 msgstr ""
 "%2$s Add-ons Password Reset\n"
 "\n"
-"استلمنا طلبًا منك لإعادة تعيين كلمة السر لهذا الحساب �ي addons.mozilla.org. لتغيير كلمة السر، انقر على الرابط أدناه أو انسخه إلى شريط تحديد الموقع �ي متص�حك:\n"
+"استلمنا طلبًا منك لإعادة تعيين كلمة السر لهذا الحساب �ي addons.mozilla.org. "
+"لتغيير كلمة السر، انقر على الرابط أدناه أو انسخه إلى شريط تحديد الموقع �ي "
+"متص�حك:\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -4548,26 +6508,24 @@ msgstr "إعادة تعيين كلمة السر لإضا�ات %s"
 msgid "user_emailchange_error"
 msgstr "خطأ!"
 
-# %1 is the application name
-#: controllers/users_controller.php:513
-#: controllers/users_controller.php:514
+#. %1 is the application name
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
 msgstr "ي�رجى منك تأكيد تغييرك للبريد الإلكتروني �ي إضا�ات %1$s"
 
-#: views/users/emailchange.thtml:49
-#: views/users/emailchange.thtml:50
+#: 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:52
 #, php-format
 msgid "user_emailchange_successful_description"
-msgstr "لقد غيّرت بريدك الإلكتروني بنجاح. استخدم %1$s من الآن �صاعدًا لتسجيل دخولك."
+msgstr ""
+"لقد غيّرت بريدك الإلكتروني بنجاح. استخدم %1$s من الآن �صاعدًا لتسجيل دخولك."
 
-#: views/users/pwreset.thtml:77
-#: views/users/register.thtml:68
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
 #: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "أكّد كلمة السرّ"
@@ -4577,33 +6535,27 @@ msgstr "أكّد كلمة السرّ"
 msgid "user_form_editprofile"
 msgstr "حرّر مل� المستخدم الشخصي ل� %s"
 
-#: views/users/pwreset.thtml:52
-#: views/users/login.thtml:81
-#: views/users/register.thtml:58
-#: views/users/edit.thtml:169
+#: 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:73
-#: views/users/edit.thtml:106
+#: 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:89
-#: views/users/edit.thtml:122
+#: 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:93
-#: views/users/edit.thtml:126
+#: 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:79
-#: views/users/edit.thtml:112
+#: views/users/register.thtml:79 views/users/edit.thtml:112
 #: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "الاسم الأخير"
@@ -4612,13 +6564,11 @@ msgstr "الاسم الأخير"
 msgid "user_form_login"
 msgstr "تسجيل دخول المستخدم"
 
-#: views/users/pwreset.thtml:72
-#: views/users/edit.thtml:155
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "كلمة السر الجديدة"
 
-#: views/users/register.thtml:84
-#: views/users/edit.thtml:117
+#: views/users/register.thtml:84 views/users/edit.thtml:117
 #: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "الاسم المستعار"
@@ -4627,13 +6577,11 @@ msgstr "الاسم المستعار"
 msgid "user_form_oldpassword"
 msgstr "كلمة السر القديمة"
 
-#: views/users/edit.thtml:100
-#: views/users/edit.thtml:182
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "إجراءات أخرى"
 
-#: views/users/login.thtml:85
-#: views/users/register.thtml:63
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "كلمة السر"
 
@@ -4684,11 +6632,15 @@ msgstr "لا يوجد حاليًا تنبيهات متاحة لك لإعداده
 
 #: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
-msgstr "قد ترسل لك موزيلا، من وقت لآخر، رسالة تتكلم عن الإصدارات القادمة وأحداث الإضا�ات. اختر رجاءً المواضيع التي تهتم بها مما يلي:"
+msgstr ""
+"قد ترسل لك موزيلا، من وقت لآخر، رسالة تتكلم عن الإصدارات القادمة وأحداث "
+"الإضا�ات. اختر رجاءً المواضيع التي تهتم بها مما يلي:"
 
 #: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
-msgstr "تحت�ظ موزيلا بحقها �ي التواصل معك شخصيًا بخصوص أمور معينة تتعلق بإضا�اتك الم�ستضا�ة عندها."
+msgstr ""
+"تحت�ظ موزيلا بحقها �ي التواصل معك شخصيًا بخصوص أمور معينة تتعلق بإضا�اتك "
+"الم�ستضا�ة عندها."
 
 #: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
@@ -4732,17 +6684,21 @@ msgstr "أرس�ل وصلة إعادة تعيين كلمة السر"
 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 "أرس�لت وصلة لت�عيل حساب مستخدمك إلى بريدك الإلكتروني %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: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"
@@ -4752,30 +6708,30 @@ msgstr "نعيد إرسال رسالة التأكيد"
 msgid "user_register_congratulations"
 msgstr "تهانينا! لقد أنشئ حساب مستخدمك بنجاح."
 
-# %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 "إن لم تستلم رسالة التأكيد، تأكّد أن خدمة بريدك لم تعتبر الرسالة \"س�خامًا\" أو \"بريدًا مزعجًا\". إن دعت الحاجة، يمكننا أن %1$s إلى بريدك الإلكتروني المذكور �ي الأعلى."
+msgstr ""
+"إن لم تستلم رسالة التأكيد، تأكّد أن خدمة بريدك لم تعتبر الرسالة \"س�خامًا\" أو "
+"\"بريدًا مزعجًا\". إن دعت الحاجة، يمكننا أن %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:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "شكرًا على تسجيلك معنا ومرحبًا بك �ي %1$s!"
 
-#: views/users/register.thtml:76
-#: views/users/edit.thtml:109
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "مطلوب منك أن ت�دخل اسمك الأول أو الأخير أو الاسم المستعار."
 
-#: views/users/edit.thtml:97
-#: views/users/edit.thtml:133
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "التنبيهات"
 
-#: views/users/edit.thtml:96
-#: views/users/edit.thtml:104
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "مل� المستخدم الشخصي"
 
@@ -4821,37 +6777,70 @@ msgstr "الاسم المستعار"
 msgid "users_info_pagetitle"
 msgstr "معلومات المستخدم ل� %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "مراجعات ل� %s"
 
-#: controllers/users_controller.php:319
-#: controllers/users_controller.php:321
+#: 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
 #, 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
+#. %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 "تسجيل المستخدم الجديد"
 
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "أحدث إصدارة متوا�قة مع"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
diff --git a/site/app/locale/ar/pages/experimental_addons.thtml b/site/app/locale/ar/pages/experimental_addons.thtml
deleted file mode 100644
index 0a0f434..0000000
--- a/site/app/locale/ar/pages/experimental_addons.thtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<h1>الإضا�ات التجريبية</h1>
-
-
-<h2>ما هي الإضا�ة التجريبية؟</h2>
-
-<p>الإضا�ات التجريبية موجهة للمستخدمين المتقدمين ليختبروها قبل أن تصبح متاحة وت�راجَع للاستخدام العام. قد تكون العديد من الإضا�ات ما تزال عبارة عن نموذج �حسب. قد تكون الإضا�ات التجريبية �ي طور الأل�ا أو البيتا أو ما-قبل-الإنتاج، وذلك �يما يتعلق بالجودة والأداء والميزات.</p>
-
-<p>عليك أن تحذر عند تثبيت الإضا�ات التجريبية، إذ لم يسبق أن اختبرها أحد المحرّرين وقد تعرّض إعدادات حاسوبك لبعض الضرر.</p>
-
-
-<h2>كي� أميّز الإضا�ات التجريبية عن غيرها �ي الموقع؟</h2>
-
-<p>توجد كلمة "تجريبية" على كل الإضا�ات التجريبية، كما يتطلب منك تثبيتها أن تسجّل دخولك.</p>
-
-
-<h2>لماذا أحتاج إلى تسجيل دخولي إن أردت� تثبيت إضا�ة تجريبية؟</h2>
-
-<p>موقع الإضا�ات هذا يطلب من المستخدمين تسجيل دخولهم ليستطيعوا تثبيت الإضا�ات التجريبية، ليكون ذلك تذكيرًا لهم أنهم على وشك القيام بخطوة �يها مجاز�ة.</p>
-
-
-<h2>هل عليّ أن أسجّل دخولي أو أحتاج حسابًا لتثبيت إضا�ة عامة؟</h2>
-
-<p>لا، لا يتطلب منك موقع الإضا�ات أن تملك حساب مستخدم أو أن تسجّل دخولك إن أردت تثبيت إضا�ة عامة.</p>
-
diff --git a/site/app/locale/ca/LC_MESSAGES/messages.po b/site/app/locale/ca/LC_MESSAGES/messages.po
index 1d9a476..cacce32 100644
--- a/site/app/locale/ca/LC_MESSAGES/messages.po
+++ b/site/app/locale/ca/LC_MESSAGES/messages.po
@@ -1,31 +1,36 @@
 # translation of c.po to Catalan
-# Wil Clouser <clouserw@mozilla.com>, 2006.
-# Joaquim Pérez Noguer <noguer@gmail.com>, 2007,2008.
-# Toni Hermoso Pulido <toniher@softcatala.org>, 2007.
-# Quim Perez i Noguer <noguer@gmail.com>, 2008.
 # Remora Preliminary Language File
 # Copyright (C) 2006 Mozilla Corporation
 # This file is distributed under the same license as the REMORA package.
 # Catalan translators:
+# Wil Clouser <clouserw@mozilla.com>, 2006.
+# Joaquim Pérez Noguer <noguer@gmail.com>, 2007,2008.
+# Toni Hermoso Pulido <toniher@softcatala.org>, 2007.
+# Quim Perez i Noguer <noguer@gmail.com>, 2008.
+# Joaquim Perez Noguer <noguer@gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2008-11-27 15:48-0700\n"
-"Last-Translator: Toni Hermoso <toniher@softcatala.org>\n"
-"Language-Team: Catalan <gimp a llistes.softcatala.org>\n"
+"PO-Revision-Date: 2009-02-24 23:08+0100\n"
+"Last-Translator: Joaquim Perez Noguer <noguer@gmail.com>\n"
+"Language-Team: Catalan <gnome@lists.softcatala.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Pootle 1.2.0-rc1\n"
+"X-Generator: Lokalize 0.2\n"
 
 #: 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 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
@@ -54,38 +59,34 @@ msgstr "Públic"
 msgid "a_header_sandbox"
 msgstr "Entorn de proves"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "S'ha afegit %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Actualitza %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versió %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "baixades en total"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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
+#. %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"
@@ -102,22 +103,22 @@ msgstr "per pàgina"
 msgid "addon_list_sortby"
 msgstr "Ordenat per:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "recomanat"
 
-# %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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s no està disponible per al %2$s."
 
-# %1 is the addon name
+#. %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
@@ -126,7 +127,7 @@ msgstr "%1$s no està disponible per al %2$s."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Torna a %1$s..."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -145,6 +146,7 @@ msgstr "Comentari:"
 msgid "addon_review_add_submit"
 msgstr "Envieu el vostre comentari"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -158,7 +160,6 @@ msgstr "Títol/resum:"
 msgid "addon_review_admin_delete"
 msgstr "Suprimeix"
 
-# %1 is the addon name
 #: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Respon"
@@ -179,23 +180,24 @@ msgstr "Sí"
 msgid "addon_review_delete_header"
 msgstr "Suprimeix la revisió"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 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:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Edita una revisió per a %s"
 
-# %1 is the addon name
-#: controllers/reviews_controller.php:534
+#. %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 ""
 "S'ha produït un problema marcant la revisió: les notes de les revisions "
 "estan limitades entre 10 i 100 caràcters; la vostra en té %1$s."
 
-# Removing an extra comma
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -206,7 +208,7 @@ msgstr ""
 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.
+#. %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"
@@ -215,23 +217,21 @@ 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."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Revisions de %s"
 
-# %1 is the user, %2 is the (localized) date
-# %1 is the user, %2 is the (localized) date, %3 is the rating
+#. %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 "resposta per en/nla %1$s el %2$s"
 
-# %1 is the addon name
 #: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Resposta del desenvolupador:"
@@ -240,13 +240,13 @@ msgstr "Resposta del desenvolupador:"
 msgid "addon_review_saved_successfully"
 msgstr "La vostra revisió s'ha desat satisfactòriament. Gràcies."
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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
+#. %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
@@ -269,11 +269,13 @@ msgstr "Complement anterior"
 msgid "addon_version_permalink"
 msgstr "Enllaç permanent a aquesta versió"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "La versió més nova compatible amb"
+#. %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 "La versió més recent compatible amb el %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Accepta"
 
@@ -281,19 +283,20 @@ msgstr "Accepta"
 msgid "addons_author_tooltip"
 msgstr "Mostra el perfil de l'autor"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "Mostra tots els temes :: Complements del %1$s"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "Mostra %1$s temes :: Complements del %2$s"
 
@@ -301,7 +304,7 @@ msgstr "Mostra %1$s temes :: Complements del %2$s"
 msgid "addons_display_add_review"
 msgstr "Afegeix una revisió"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Detalls avançats"
 
@@ -309,11 +312,11 @@ msgstr "Detalls avançats"
 msgid "addons_display_categories"
 msgstr "Categories"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "revisió detallada"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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"
@@ -322,92 +325,98 @@ msgstr "No ha agradat"
 msgid "addons_display_edit_review"
 msgstr "Editeu la vostra revisió"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Aquest complement té una política de privadesa."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Comentaris del desenvolupador"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Pàgina web"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Revisions"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Ajuda"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Ha agradat"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Descripció llarga"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Més imatges"
 
-# %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:421
-#, fuzzy
+#. %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] "Altres complements fets per %1$s"
-msgstr[1] "Other add-ons by these authors"
+msgstr[1] "Altres complements fets pels autors següents: %1$s"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "El desenvolupador ofereix ajuda per a aquesta extensió a %s"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "El desenvolupador ofereix ajuda per a aquesta extensió a %s, o bé enviant-li "
 "un missatge a %s"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Valoreu-lo"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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 "
@@ -415,51 +424,51 @@ msgstr ""
 "canvi els hi farà falta per a posar-se en contacte amb vostè per a "
 "solucionar el vostre problema."
 
-# %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "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:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Desa"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Mostra totes les revisions (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Historial de versions complet"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Visualitza el codi font"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Mostra les estadístiques"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Què en penseu?"
 
@@ -469,7 +478,7 @@ msgstr "Funciona amb:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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"
@@ -480,10 +489,11 @@ msgstr "per"
 msgid "addons_home_feature_head"
 msgstr "Recomanem"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -499,7 +509,9 @@ msgstr "El més nou:"
 msgid "addons_home_other_applications"
 msgstr "Altres aplicacions"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -509,19 +521,20 @@ msgstr "Altres aplicacions"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -617,6 +630,7 @@ msgstr "per a Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "per a Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -638,12 +652,13 @@ msgstr ""
 "extensions, les quals modifiquen o s'afegeixen a les funcionalitats "
 "existents."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Connectors típics per al %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Connectors"
 
@@ -654,6 +669,7 @@ msgstr "Connectors"
 msgid "addons_plugins_support_documentation"
 msgstr "Documentació d'ajuda: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -661,24 +677,24 @@ msgstr ""
 "El %s requereix que accepteu la següent Acord de llicència d'usuari final "
 "abans de procedir amb la instal·lació:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Previsualitzacions del %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Complements recomanats"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Complements recomanats"
 
@@ -686,7 +702,7 @@ msgstr "Complements recomanats"
 msgid "addons_searchengines_additional_resources"
 msgstr "Recursos addicionals"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Centre de desenvolupament de Mozilla"
@@ -704,35 +720,35 @@ msgstr ""
 "ho tingueu habilitat. Heu d'habilitar el Javascript abans d'intentar "
 "d'instal·lar cap dels connectors de cerca següents."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %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 "Apreneu com  %1$s al %2$s."
 
-# link path to search plugins instructions, relative to devmo
+#. 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 "/ca/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: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
+#. %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 "Cerqueu més motors de cerca a %1$s"
 
-# link text to mycroft.mozdev.org
+#. 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:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Motors de cerca"
 
@@ -746,7 +762,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Deshabilitat"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Versió incompleta"
 
@@ -762,7 +778,6 @@ msgstr "A l'entorn de proves; pendent de revisió"
 msgid "addons_status_public"
 msgstr "Públic"
 
-# %1 is the "nominate" link
 #: controllers/components/amo.php:193 controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "A l'entorn de proves"
@@ -785,11 +800,12 @@ 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."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Historial de versions amb el registre de canvis"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Historial de versions del %1$s"
@@ -802,6 +818,7 @@ msgstr "Afegeix un grup"
 msgid "admin_group_delete_pagetitle"
 msgstr "Suprimeix el grup"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -927,16 +944,20 @@ msgstr "Ignora la comprovació de versions"
 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: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: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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -949,23 +970,23 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Actualitzeu el Firefox</a> per a utilitzar "
 "aquest complement"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Complements per nom"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Els complements més nous"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Els complements més famosos"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Complements per valoració"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Complements actualitzats recentment"
 
@@ -997,7 +1018,7 @@ msgstr "Mostra el més nou primer"
 msgid "category_extra_mostpopular"
 msgstr "El més famós primer"
 
-# %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"
@@ -1007,11 +1028,19 @@ msgstr "Categoria %1$s"
 msgid "collection_not_found"
 msgstr "No s'ha trobat l'agrupació."
 
+#. %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"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
@@ -1045,6 +1074,8 @@ msgstr "Ajusta el maxVersion sense pujar el fitxer"
 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:130
 msgid "compatibility_developers_login_first"
 msgstr ""
@@ -1069,6 +1100,10 @@ msgstr "Resultats de la comprovació del complement"
 msgid "compatibility_developers_retrieving"
 msgstr "S'està recuperant l'estat dels complements hostatjats..."
 
+#. %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 %2$s usuaris (%3$s&#37; del total)"
@@ -1083,6 +1118,8 @@ msgstr ""
 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:69
 msgid "compatibility_report_intro"
 msgstr ""
@@ -1094,6 +1131,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Versions Alfa"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Complements compatibles amb una versió alfa del %1$s"
@@ -1102,6 +1140,7 @@ msgstr "Complements compatibles amb una versió alfa del %1$s"
 msgid "compatibility_report_legend_beta"
 msgstr "Versions Beta"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
@@ -1112,6 +1151,7 @@ msgstr ""
 msgid "compatibility_report_legend_latest"
 msgstr "Última versió"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Complements actualitzats per a l'última versió del %1$s"
@@ -1120,6 +1160,7 @@ msgstr "Complements actualitzats per a l'última versió del %1$s"
 msgid "compatibility_report_legend_other"
 msgstr "Altres versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: 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"
@@ -1137,16 +1178,16 @@ msgstr "Informació per als usuaris del complement"
 msgid "compatibility_view_report"
 msgstr "Mostra l'informe de compatibilitat"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: 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:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "pàgina wiki"
 
-# %1 is app name
 #: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
@@ -1185,26 +1226,35 @@ msgstr ""
 "<a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons "
 "Attribution 2.5 License</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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)
+#. 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"
@@ -1230,14 +1280,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1285,36 +1363,36 @@ msgstr "Pas 5: Fi"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ajuda a la publicació"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "S'ha deshabilitat el complement correctament"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Edita el complement"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "S'ha habilitat el complement correctament"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Descripció del complement"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "ALUF (EULA)"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: 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:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Nom del complement"
 
@@ -1323,40 +1401,298 @@ msgstr "Nom del complement"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Text de la previsualització"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: 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:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Resum del complement"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Correu per a problemes"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL per a problemes"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: 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:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Nomina el complement"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "S'ha nominat el complement correctament"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1379,7 +1715,7 @@ msgstr ""
 "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
+#. %1 is the link to the sandbox information page
 #: views/developers/add_step5.thtml:63
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1391,7 +1727,7 @@ msgstr ""
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "ací"
 
-# %1 is the "nominate" link
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1414,16 +1750,16 @@ 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:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Envia el complement"
 
-#: controllers/developers_controller.php:2375
+#: 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
+#. %1 is the link to the preview upload page
 #: views/developers/add_step5.thtml:71
 #, php-format
 msgid "devcp_addon_upload_preview"
@@ -1434,7 +1770,7 @@ msgstr ""
 msgid "devcp_addon_upload_preview_link"
 msgstr "Envia una previsualització"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1463,10 +1799,102 @@ msgstr "Següent"
 msgid "devcp_change_addontype"
 msgstr "Canvia el tipus de complement:"
 
-#: controllers/developers_controller.php:1402
+#: 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 "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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Afegeix una previsualització"
@@ -1559,6 +1987,7 @@ msgstr "El desenvolupador no ha donat cap URL per a problemes."
 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"
@@ -1588,6 +2017,7 @@ msgstr ""
 "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"
@@ -1608,11 +2038,65 @@ msgstr ""
 "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 "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Afegeix un autor"
@@ -1625,10 +2109,297 @@ msgstr "Adreça de correu de l'autor"
 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 "Add New Author"
+
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+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"
@@ -1694,6 +2465,206 @@ msgstr "Idioma"
 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 "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 "Actualitza"
@@ -1704,11 +2675,66 @@ 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 "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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Complements destacats"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1717,7 +2743,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Revisions moderades (%s)"
 msgstr[1] "Revisions moderades (%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
 #, php-format
@@ -1726,7 +2752,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Complements nominats (%s)"
 msgstr[1] "Complements nominats (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1739,8 +2765,8 @@ msgstr[1] "Actualitzacions pendents (%s)"
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "Els fitxers marcats se suprimiran."
 
-# %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"
@@ -1766,29 +2792,30 @@ msgstr "Notes per al revisor"
 msgid "devcp_editversion_submit_update"
 msgstr "Actualitza"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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 "
@@ -1797,20 +2824,34 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Consulteu %s com a referència."
 
+#. 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 "aquesta pàgina"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+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"
@@ -1818,7 +2859,7 @@ 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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "No tots els GUID dels fitxers són correctes"
 
@@ -1847,6 +2888,8 @@ msgstr "Supera la mida màxima d'enviament."
 msgid "devcp_error_http_nofile"
 msgstr "No s'ha enviat cap fitxer"
 
+#. %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"
@@ -1854,14 +2897,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:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No s'ha trobat install.rdf."
 
@@ -1869,21 +2913,26 @@ 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:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Heu de seleccionar un tipus de complement vàlid."
 
+#. %$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 "%s no és una versió vàlida per a %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "L'ID d'aquest complement no és vàlid: %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"
@@ -1903,6 +2952,7 @@ msgstr ""
 "La versió d'aquest complement no és vàlida: les versions no poden tenir "
 "espais."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1913,6 +2963,7 @@ msgstr ""
 msgid "devcp_error_move_file"
 msgstr "No s'ha pogut moure el fitxer"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1935,15 +2986,15 @@ 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:2718
+#: 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:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr ""
 "Només podeu nominar complements que actualment estiguin en l'entorn de "
@@ -1957,6 +3008,8 @@ msgstr "Heu de seleccionar com a mínim una categoria."
 msgid "devcp_error_one_user"
 msgstr "Com a mínim cal un autor per aquest complement."
 
+#. %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"
@@ -1964,13 +3017,13 @@ 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:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "No teniu permisos per actualitzar aquest complement."
 
@@ -1986,7 +3039,7 @@ 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Cal enviar un fitxer"
@@ -2209,7 +3262,7 @@ msgstr "Els meus complements"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Camps localitzats"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2254,33 +3307,68 @@ msgstr "Envia el complement"
 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: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 "Torna als detalls del complement"
 
-# %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 "Nomina %s"
 
-# %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 "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: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 ""
 "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)
+#. %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"
@@ -2296,9 +3384,14 @@ msgstr ""
 "Si feu que aquesta previsualització sigui la per defecte, la "
 "previsualització per defecte actual ho deixarà de ser."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2327,6 +3420,60 @@ msgstr "Edita la previsualització"
 msgid "devcp_preview_updated_successfully"
 msgstr "S'ha modificat la previsualització satisfactòriament."
 
+#: 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 ""
@@ -2338,10 +3485,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Afegeix una previsualització"
 
+#: 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 "Edita la previsualització"
 
+#: 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 "Fitxer de previsualització"
@@ -2350,6 +3507,34 @@ msgstr "Fitxer de previsualització"
 msgid "devcp_previews_label_makedefault"
 msgstr "Fes que aquesta sigui la previsualització per defecte"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Suprimeix la previsualització"
@@ -2366,44 +3551,159 @@ msgstr "Edita la previsualització"
 msgid "devcp_previews_submit_upload"
 msgstr "Envia la previsualització"
 
+#: 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 "Incorrecta?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Esteu segur que voleu suprimir aquest fitxer?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "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>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 "Omet l'actualització de la informació del meu complement actual"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> usuaris actius diàriament"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> baixades en total"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> baixades setmanals"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "Els enviaments de complements estan inhabilitats actualment. Torneu-ho a "
@@ -2411,13 +3711,13 @@ msgstr ""
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Ho accepto"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Ho refuso"
 
@@ -2433,11 +3733,11 @@ msgstr "Inhabilitat"
 msgid "devcp_summary_header_trusted"
 msgstr "De confiança"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Darrera versió:"
 
-# %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"
@@ -2447,7 +3747,7 @@ msgstr "No teniu cap complement. Feu clic a %s per a enviar-ne un."
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "ací"
 
-# %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"
@@ -2457,30 +3757,667 @@ msgstr "Assegureu-vos de %s el vostre tema."
 msgid "devcp_theme_upload_preview_link"
 msgstr "Envia una previsualització"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Llegiu %s com a referència."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "aquesta pàgina"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Edita la versió"
 
-#: controllers/developers_controller.php:2572
+#: 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"
+
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "S'ha inhabilitat el complement"
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "Aquest complement no ha estat nominat."
+
+#: controllers/components/editors.php:213
+msgid "editor_review_error_file_not_pending"
+msgstr "Aquest fitxer no està pendent de revisió."
+
+#. Actions are, for example: approving or rejecting
+#: controllers/components/editors.php:79
+#: controllers/components/editors.php:182
+msgid "editor_review_error_no_action"
+msgstr "Cal que seleccioneu una acció de revisió."
+
+#: controllers/components/editors.php:192
+msgid "editor_review_error_no_applications"
+msgstr "Cal que indiqueu les aplicacions que heu provat."
+
+#. 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 "Cal que escriviu algun comentari de la revisió."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Cal que seleccioneu com a mínim un fitxer per a revisar."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "Cal que indiqueu els sistemes operatius que heu provat."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filtra"
@@ -2489,7 +4426,7 @@ msgstr "Filtra"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtra per tipus/acció"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Registre d'esdeveniments"
 
@@ -2541,6 +4478,7 @@ msgstr "Oculta els comentaris"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Mostra els comentaris"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2550,7 +4488,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Registre de revisions"
 
@@ -2574,24 +4512,24 @@ msgstr "Activitat recent de l'editor"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Revisions totals"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Revisa el complement"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Completeu els següents camps:"
 
-#: controllers/editors_controller.php:461
+#: 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:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "No es permeten les revisions pròpies."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Programari extern"
 
@@ -2603,39 +4541,39 @@ msgstr "Afegeix una característica"
 msgid "editors_featured_add_feature_submit"
 msgstr "Afegeix"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "S'ha suprimit la característica correctament."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Característiques del complement"
 
@@ -2669,39 +4607,40 @@ msgstr ""
 "Els filtres romandran al mateix lloc durant aquesta sessió o fins que es "
 "netegin."
 
-# %1 is the queue mode
+#. %1 is the queue mode
 #: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 dia"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hora"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minut"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Tauler de control d'edició"
 
-#: controllers/editors_controller.php:286
+#. %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 "només %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Versió candidata"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2715,21 +4654,26 @@ msgstr "Neteja"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Acció de revisió"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Porta a la part pública"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Sol·licita una revisió suprema"
 
@@ -2737,34 +4681,42 @@ msgstr "Sol·licita una revisió suprema"
 msgid "editors_review_action_sandbox"
 msgstr "Retén en l'entorn de proves"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Revisa els comentaris"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "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:170
+#: 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:159
+#: 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:162
+#: 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:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Si patiu pel que fa a la seguretat del complement, aspectes de drets "
@@ -2792,15 +4744,15 @@ msgstr "Categories:"
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilitat:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Descripció"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Comentaris del desenvolupador"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "ALUF (EULA)"
 
@@ -2808,85 +4760,111 @@ msgstr "ALUF (EULA)"
 msgid "editors_review_header_files"
 msgstr "Fitxers"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Historial d'elements"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Missatge de nominació"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Previsualitzacions"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Política de privadesa"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Revisa %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes al revisor"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Resum"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Notes de la versió"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "Revisió de l'administrador"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Nominació aprovada/públic"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Nominació denegada/entorn de proves"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "No s'han trobat revisions anteriors."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Revisió de l'administrador"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Aprovat/públic"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Denegat / entorn de proves"
 
-#: views/editors/review.thtml:198
+#. 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 "Aplicacions:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "o selecciona una resposta predeterminada:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Comentaris:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistema operatiu:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Inici"
 
@@ -2894,7 +4872,7 @@ msgstr "Inici"
 msgid "editors_review_next_link"
 msgstr "següent &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "No hi ha previsualitzacions."
 
@@ -2902,41 +4880,47 @@ msgstr "No hi ha previsualitzacions."
 msgid "editors_review_previous_link"
 msgstr "&laquo; anterior"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %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> de %2$s a la cua"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Processa l'acció"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Acció"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comentaris"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Data"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Revisor"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versió/fitxer"
 
-#: controllers/editors_controller.php:411
+#: 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:422
 msgid "editors_reviewed_successfully"
 msgstr "La revisió s'ha processat satisfactòriament."
 
@@ -2960,7 +4944,7 @@ msgstr "Acció"
 msgid "editors_reviews_in_reply_to"
 msgstr "En resposta a:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "La revisió s'ha processat satisfactòriament."
 
@@ -2972,23 +4956,23 @@ msgstr "Actualment no hi ha cap revisió moderant-se."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Processa les revisions"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Web específic"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Nou"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Actualitzat"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Aplicació provada"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistema operatiu provat"
 
@@ -3029,17 +5013,20 @@ msgstr "Plataformes"
 msgid "editors_th_submissiontypes"
 msgstr "Tipus de publicacions"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dies"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s hores"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minuts"
@@ -3048,8 +5035,8 @@ msgstr "%s minuts"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Accés denegat"
 
@@ -3057,12 +5044,13 @@ msgstr "Accés denegat"
 msgid "error_access_denied_message"
 msgstr "No esteu autoritzats a veure aquesta pàgina."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3072,18 +5060,19 @@ msgstr "No esteu autoritzats a veure aquesta pàgina."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "El complement no s'ha trobat."
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Aquest complement no es pot veure ací."
 
@@ -3091,7 +5080,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:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "No hi ha cap complement en aquesta categoria."
 
@@ -3113,24 +5102,25 @@ msgstr "Aquesta adreça de correu no és vàlida."
 msgid "error_field_required"
 msgstr "Aquest camp no pot estar buit."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "No s'ha trobat el fitxer."
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Error en el fitxer: no existeix %s."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3147,16 +5137,18 @@ msgstr ""
 "Aquest URL no té un format vàlid. Els URL són de la forma http://exemple.com/"
 "pagina."
 
+#. %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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3174,7 +5166,7 @@ msgstr "Avís"
 msgid "error_preview_notfound"
 msgstr "No s'ha trobat la previsualització."
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Heu de fer una valoració."
 
@@ -3227,8 +5219,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Usuari o contrasenya erronis"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versió desconeguda"
 
@@ -3240,13 +5232,14 @@ msgstr "Contrasenya incorrecta"
 msgid "feature_learnmore"
 msgstr "Més informació"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Més informació sobre %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3258,6 +5251,40 @@ msgstr[1] "%1$s revisions"
 msgid "feature_view_more_from_category"
 msgstr "Més informació sobre el"
 
+#. 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 "Torna al complement"
+
+#. 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 "Expandeix-ho tot"
+
+#. 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 "Torna a la revisió"
+
+#. 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 :: Navegador :: Complements del %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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Tots els drets reservats."
@@ -3294,7 +5321,7 @@ msgstr "Altres llengües:"
 msgid "footer_privacy_policy"
 msgstr "Política de privadesa"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Desa"
 
@@ -3302,7 +5329,7 @@ msgstr "Desa"
 msgid "general_addontype_dict"
 msgstr "Diccionari"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Diccionaris"
@@ -3311,7 +5338,7 @@ msgstr "Diccionaris"
 msgid "general_addontype_extension"
 msgstr "Extensió"
 
-# 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensions"
@@ -3320,7 +5347,7 @@ msgstr "Extensions"
 msgid "general_addontype_lpaddon"
 msgstr "Paquet d'idioma (complement)"
 
-# 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Paquets d'idioma (complement)"
@@ -3329,7 +5356,7 @@ msgstr "Paquets d'idioma (complement)"
 msgid "general_addontype_lpapp"
 msgstr "Paquet d'idioma (aplicació)"
 
-# 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Paquets d'idioma (aplicació)"
@@ -3338,7 +5365,7 @@ msgstr "Paquets d'idioma (aplicació)"
 msgid "general_addontype_plugin"
 msgstr "Connector"
 
-# 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Connector"
@@ -3347,7 +5374,7 @@ msgstr "Connector"
 msgid "general_addontype_search"
 msgstr "Motor de cerca"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Motors de cerca"
@@ -3356,11 +5383,12 @@ msgstr "Motors de cerca"
 msgid "general_addontype_theme"
 msgstr "Tema"
 
-# 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Temes"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3391,12 +5419,12 @@ msgid "header_navlink_addons"
 msgstr "Complements"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Surt"
 
@@ -3404,37 +5432,41 @@ msgstr "Surt"
 msgid "header_navlink_myaccount"
 msgstr "El meu compte"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Registre"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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.
+#. %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 "<a href=\"%1$s\">Registreu-vos</a> per a instal·lar aquest complement"
 
+#. %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 "Afegeix-lo al %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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3457,7 +5489,7 @@ msgid "langtools_download_langpack"
 msgstr "Baixa el paquet d'idioma"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Diccionaris i paquets d'idioma"
 
@@ -3513,7 +5545,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3546,7 +5582,7 @@ msgstr "Temes"
 msgid "other_apps_tooltip"
 msgstr "Troba complements per a altres aplicacions"
 
-# In a user list: user 1, user 2, "others"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "altres"
@@ -3559,36 +5595,34 @@ msgstr "Versions de l'aplicació"
 msgid "page_title_credits"
 msgstr "Crèdits"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Complements experimentals"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
+msgstr "Preguntes més freqüents"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "PMF Modernitza el teu Firefox"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Normes dels complements"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Política de privacitat de Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Guia per a la revisió"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Sistema de revisió de l'entorn de proves"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Ajuda a la publicació"
 
@@ -3608,6 +5642,7 @@ msgstr ""
 "versions que es mostren a continuació són permeses per a aquestes "
 "aplicacions."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3615,6 +5650,8 @@ msgstr ""
 "Si la vostra aplicació no requereix un fitxer install.rdf, tot i així haureu "
 "d'incloure'n un amb les propietats necessàries tal com ho especifica %s."
 
+#. 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 "ací"
@@ -3623,7 +5660,6 @@ msgstr "ací"
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Torna a la pàgina anterior"
 
@@ -3635,7 +5671,7 @@ msgstr "Informació de l'entorn de proves"
 msgid "pagination_next_page"
 msgstr "següent"
 
-# %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"
@@ -3659,16 +5695,16 @@ msgstr "Escriviu la vostra resposta aquí:"
 msgid "recaptcha_enter_whatyouhear"
 msgstr "Escriviu el que escolteu."
 
-# %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 ""
 "Si no ho heu pogut entendre, podeu <a href=\"%1$s\">escoltar una altra cosa</"
 "a> o bé <a href=\"%2$s\">tornar al text</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
 msgid "recaptcha_hardtoread_text"
 msgstr ""
@@ -3684,7 +5720,7 @@ msgstr "Sou humà?"
 msgid "recaptcha_whatsthis"
 msgstr "Què és això?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "S'ha produït un error marcant aquesta revisió."
 
@@ -3709,7 +5745,7 @@ msgid "review_flag_reason_spam"
 msgstr "És spam o bé el contingut no és una revisió"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Gràcies, aquesta revisió està marcada per a què l'aprovi un editor."
 
@@ -3723,7 +5759,7 @@ msgstr ""
 "Aquesta revisió és inadequada, poc acurada o és correu brossa? cliqueu aquí "
 "per a marcar-la per a ser revisada per un editor."
 
-# %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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3742,22 +5778,22 @@ msgstr ""
 "href=\"%2$s\">Guia de les revisions</a> si voleu més informació sobre la "
 "revisió de complements.</p>"
 
-# %1 is the addon name
+#. %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 "Revisions del %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Complements destacats"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Complements nous"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Complements actualitzats"
 
@@ -3794,6 +5830,7 @@ msgstr "Tots els motors de cerca"
 msgid "search_landing_browse_search_engines"
 msgstr "Els motors de cerca del navegador"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3813,12 +5850,13 @@ msgstr "Cerca complements"
 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:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Resultats de la cerca: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Eines de l'administrador"
 
@@ -3826,7 +5864,7 @@ msgstr "Eines de l'administrador"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Eines del desenvolupador"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Eines de l'editor"
 
@@ -3834,6 +5872,7 @@ msgstr "Eines de l'editor"
 msgid "sidebar_navlink_welcome"
 msgstr "Benvingut/da"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3871,6 +5910,7 @@ msgstr "Tema"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Complements actualitzats"
 
+#. %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
@@ -3882,7 +5922,7 @@ msgstr "%1$s kB"
 msgid "stars_not_yet_rated"
 msgstr "Encara no s'ha valorat"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3900,24 +5940,32 @@ msgstr "Eines de desenvolupament"
 msgid "statistics_addon_switch"
 msgstr "Canvia de complement"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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."
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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:147 views/statistics/addon.thtml:158
+#: 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 "%1$s creats"
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3960,7 +6008,7 @@ msgstr "Consola d'estadístiques"
 msgid "statistics_index_view_button"
 msgstr "Mostra les estadístiques"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Visualitza aquesta taula en format CSV"
 
@@ -3976,7 +6024,7 @@ msgstr "Esborra aquesta traça"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Agrupa per: Dia"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Agrupa per: Mes"
 
@@ -3984,103 +6032,107 @@ msgstr "Agrupa per: Mes"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Agrupa per: Setmana"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compara per: Setmana"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s trobat en la regió"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Afegeix una traça"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Afegeix una altra traça al diagrama"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Amaga el total"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Mostra el total"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Mostra el total en aquest diagrama"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Visualitza les dades (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Amaga %s esdeveniments"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Mostra %s esdeveniments"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Amaga els esdeveniments del Firefox"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Mostra els esdeveniments del Firefox"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Amaga el diagrama"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Mostra el diagrama"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Canvia la mida del diagrama"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Usuaris actius diàriament"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplicació"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personalitzat"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Baixades"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistema operatiu"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Estat del complement"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Resum"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Versió del complement"
 
@@ -4104,13 +6156,13 @@ msgstr "Desconegut"
 msgid "statistics_longnames_version"
 msgstr "Versió del complement"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "Encara no hi ha prou informació per a mostrar aquest diagrama. Proveu-ho més "
 "tard."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "Encara no tenim informació del vostre complement. Proveu-ho d'aquí uns "
@@ -4123,12 +6175,12 @@ msgstr ""
 "informació més recent potser encara no estarà actualitzada fins que no "
 "s'acabi el procés d'actualització. Torneu d'aquí uns minuts."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr ""
 "La consola d'estadístiques està deshabilitada. Toneu-ho a provar més tard."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr ""
 "Cal Javascript per a visualitzar els diagrames de la consola d'estadístiques."
@@ -4144,36 +6196,36 @@ msgstr "S'han actualitzat les vostres preferències."
 msgid "statistics_pagetitle"
 msgstr "Consola d'estadístiques"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Usuaris actius diàriament"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Baixades per dia"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Amplia"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Amplia un mes"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Redueix"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Redueix un mes"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Resum diari de les estadístiques de %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Canal RSS del resum"
 
@@ -4213,23 +6265,23 @@ msgstr "Públic"
 msgid "statistics_settings_access_public_description"
 msgstr "Tothom podrà veure les estadístiques d'aquest complement"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Canvia les preferències"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Tracteu aquesta informació com a confidencial."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Aquestes dades actualment són <b>privades</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Aquestes dades actualment són <b>públiques</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Bloquejat"
 
@@ -4246,7 +6298,7 @@ msgstr "Desa les preferències"
 msgid "statistics_settings_title"
 msgstr "Preferències de la consola d'estadístiques de %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Desbloquejat"
 
@@ -4270,7 +6322,7 @@ msgstr "Des"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Mitjana de baixades diàries"
 
@@ -4278,37 +6330,37 @@ msgstr "Mitjana de baixades diàries"
 msgid "statistics_summary_downloads_heading"
 msgstr "Baixades"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Recompte de l'últim dia"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Baixades dels últims 7 dies"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Total de baixades"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Des de %1$s"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Sense dades encara"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Mitjana d'usuaris actius diàriament"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Canvis respecte l'anterior"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s de %2$s"
@@ -4317,17 +6369,17 @@ msgstr "%1$s de %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Usuaris actius diàriament"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Usuaris actius diàriament"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "A %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Estadístiques de %1$s"
@@ -4352,7 +6404,7 @@ msgstr "Canvia la contrasenya"
 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
+#. %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 ""
@@ -4373,7 +6425,7 @@ msgstr "Confirma la contrasenya"
 msgid "user_del_deletenow"
 msgstr "Suprimeix el meu compte d'usuari ara"
 
-# %1 is the URL of the user's info page
+#. %1 is the URL of the user's info page
 #: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4383,7 +6435,7 @@ msgstr ""
 "llista d'autors dels vostres complements. A continuació ja podreu suprimir "
 "el vostre compte des d'aquí."
 
-# %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: 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."
@@ -4399,7 +6451,7 @@ 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
+#. %1 is a link to the amo-admins mailing list
 #: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4411,7 +6463,7 @@ msgstr ""
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirmació de la supressió del compte"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Supressió del compte d'usuari %1$s"
@@ -4436,7 +6488,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4452,7 +6504,7 @@ msgstr "He entès que aquest pas no es pot desfer."
 msgid "user_deleted_nickname"
 msgstr "Suprimeix l'usuari"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4465,9 +6517,9 @@ msgstr ""
 msgid "user_edit_delete_user"
 msgstr "Suprimeix el compte de l'usuari"
 
-# 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4487,7 +6539,7 @@ msgstr ""
 "Gràcies per unir-vos al %2$s Add-ons\n"
 "-- Personal del %2$s Add-ons"
 
-# %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4512,8 +6564,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Gràcies per unir-vos al %s Add-ons"
 
-# 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
 #, php-format
 msgid "user_email_pwreset"
@@ -4540,7 +6592,7 @@ msgstr "Recuperació de la vostra contrasenya del %s Add-ons"
 msgid "user_emailchange_error"
 msgstr "Error!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4550,7 +6602,7 @@ msgstr "Confirmeu el canvi de la vostra adreça de correu al %1$s Add-ons"
 msgid "user_emailchange_success"
 msgstr "Èxit!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4722,7 +6774,7 @@ msgstr "Envia l'enllaç per a recuperar la contrasenya"
 msgid "user_register_amo_link"
 msgstr "Complements del %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"
@@ -4731,7 +6783,7 @@ msgstr ""
 "vostre compte d'usuari. Heu de clicar l'enllaç abans que pugueu connectar-"
 "vos al %2$s Add-ons."
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4748,7 +6800,7 @@ msgstr "Torna a enviar el missatge de confirmació"
 msgid "user_register_congratulations"
 msgstr "Felicitats! El vostre compte d'usuari s'ha creat satisfactòriament."
 
-# %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"
@@ -4758,7 +6810,7 @@ msgstr ""
 "necessiteu, podeu sol·licitar-nos-ho, %1$s, a la vostra adreça de correu "
 "descrita anteriorment. "
 
-# %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4818,7 +6870,7 @@ msgstr "Àlies"
 msgid "users_info_pagetitle"
 msgstr "Informació de l'usauri %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Revisats per %s"
@@ -4827,8 +6879,8 @@ msgstr "Revisats per %s"
 msgid "users_login_pagetitle"
 msgstr "Inici de sessió"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4837,8 +6889,8 @@ msgstr ""
 "teniu un compte del Mozilla Add-ons, connecteu-vos, o bé  <a href=\"%1$s"
 "\">coneixeu més coses de l'entorn de proves</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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4854,3 +6906,47 @@ msgstr "Recuperació de la contrasenya de l'usuari"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Registre d'un nou usuari"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "La versió més nova compatible amb"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "recaptcha_enter_numbers"
+#~ msgstr "Escriviu els <strong>números</strong> que esteu sentint a sota."
+
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to a text captcha
+#~ msgid "recaptcha_hardtohear"
+#~ msgstr ""
+#~ "Si us és difícil d'entendre podeu <a href=\"%1$s\">provar números "
+#~ "diferents</a> o bé <a href=\"%2$s\">tornar al text</a>."
+
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to an audio captcha
+#~ msgid "recaptcha_hardtoread"
+#~ msgstr ""
+#~ "Si us és difícil de llegir, podeu <a href=\"%1$s\">provar diverses "
+#~ "paraules</a> o bé en comptes d'això <a href=\"%2$s\">escoltar números</a>."
diff --git a/site/app/locale/cs/LC_MESSAGES/messages.po b/site/app/locale/cs/LC_MESSAGES/messages.po
index 2a32dee..259ea13 100644
--- a/site/app/locale/cs/LC_MESSAGES/messages.po
+++ b/site/app/locale/cs/LC_MESSAGES/messages.po
@@ -4,20 +4,6809 @@
 # Pavel Franc <franc@czilla.cz>, 2007-2008.

 # 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: 2007-04-10 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"
+
+#

+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 "položek na stránku"

+

+#: views/elements/addon_list_options.thtml:98

+msgid "addon_list_sortby"

+msgstr "Seřadit podle:"

+

+#: 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/Souhrn:"

+

+#: 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 "Zobrazit profil autora"

+

+#. %1 is the name of the Application (eg. Firefox)

+#: controllers/addons_controller.php:1080

+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:800

+#, 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:513

+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:147 controllers/addons_controller.php:283

+#: controllers/addons_controller.php:1215

+#, 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:84

+#: 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:198

+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520

+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887

+#: controllers/addons_controller.php:1026

+#: controllers/addons_controller.php:1082

+#, 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:610

+#: 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:153

+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343

+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659

+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818

+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905

+#: controllers/addons_controller.php:1024

+#: controllers/addons_controller.php:1139

+#: controllers/addons_controller.php:1146

+#: controllers/addons_controller.php:1215

+#: controllers/addons_controller.php:1250

+#: controllers/addons_controller.php:1305

+#: 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 "Zobrazit 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:906

+#, php-format

+msgid "addons_plugins_main_header"

+msgstr "Zásuvné moduly pro %1$s"

+

+#: controllers/components/amo.php:724 controllers/addons_controller.php:905

+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:1249

+#, php-format

+msgid "addons_previews_pagetitle"

+msgstr "Náhledy doplňku %s"

+

+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147

+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:1139

+#: controllers/addons_controller.php:1146

+msgid "addons_recommended_pagetitle"

+msgstr "Doporu�ované doplňky"

+

+#: controllers/addons_controller.php:1142

+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:884 controllers/addons_controller.php:894

+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."

+

+#: 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í"

+

+#: controllers/components/amo.php:195 controllers/components/amo.php:226

+msgid "addons_status_pending"

+msgstr "Na pískovišti: Čeká na kontrolu"

+

+#: controllers/components/amo.php:199 controllers/components/amo.php:228

+msgid "addons_status_public"

+msgstr "Veřejné"

+

+#: 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 "Dozvědět se 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:1313

+msgid "addons_versions_history"

+msgstr "Historie verzí s&nbsp;popisem změn"

+

+#. %1$s is the add-on name

+#: controllers/addons_controller.php:1302

+#, 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:68

+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:796

+msgid "browse_addons_name"

+msgstr "Doplňky podle jména"

+

+#: controllers/addons_controller.php:794

+msgid "browse_addons_newest"

+msgstr "Nové doplňky"

+

+#: controllers/addons_controller.php:792

+msgid "browse_addons_popular"

+msgstr "Oblíbené doplňky"

+

+#: controllers/addons_controller.php:795

+msgid "browse_addons_rated"

+msgstr "Doplňky podle hodnocení"

+

+#: controllers/addons_controller.php:793

+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

+#, 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."

+

+#: 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

+#, 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>."

+

+#. 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 "Nominate your add-on to become Public"

+

+#: 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

+#, 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."

+

+#: 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>."

+

+#: 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."

+

+#: 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

+#, 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

+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

+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\">Aktivován</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\">Deaktivován</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

+#, 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."

+

+#: 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: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."

+

+#: 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."

+

+#: 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

+#, fuzzy

+msgid "devcp_edit_descriptions_transbox_summary_name"

+msgstr "Add-on Summary"

+

+#: views/developers/addon_edit.thtml:46

+#, fuzzy

+msgid "devcp_edit_dt_manage_authors"

+msgstr "Manage Add-on Authors"

+

+#: views/developers/addon_edit.thtml:48

+#, fuzzy

+msgid "devcp_edit_dt_manage_categories"

+msgstr "Manage Add-on Categories"

+

+#: views/developers/addon_edit.thtml:50

+#, fuzzy

+msgid "devcp_edit_dt_manage_descriptions"

+msgstr "Manage Add-on Descriptions"

+

+#: views/developers/addon_edit.thtml:52

+#, fuzzy

+msgid "devcp_edit_dt_manage_properties"

+msgstr "Manage Add-on Properties"

+

+#: 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

+#, 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 "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

+#, fuzzy

+msgid "devcp_editbox_authors"

+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 "Change Status"

+

+#: views/elements/developers/editbox.thtml:48

+#, fuzzy

+msgid "devcp_editbox_descriptions"

+msgstr "Descriptions"

+

+#: views/elements/developers/editbox.thtml:43

+#, fuzzy

+msgid "devcp_editbox_edit_addon"

+msgstr "Edit Add-on"

+

+#: views/elements/developers/editbox.thtml:57

+#, fuzzy

+msgid "devcp_editbox_new_version"

+msgstr "New Version"

+

+#: views/elements/developers/editbox.thtml:49

+#, fuzzy

+msgid "devcp_editbox_properties"

+msgstr "Properties"

+

+#: views/elements/developers/editbox.thtml:60

+#, fuzzy

+msgid "devcp_editbox_screenshots"

+msgstr "Preview Screenshots"

+

+#: views/elements/developers/editbox.thtml:53

+#, fuzzy

+msgid "devcp_editbox_statistics_dashboard"

+msgstr "Statistics Dashboard"

+

+#: views/elements/developers/editbox.thtml:54

+#, fuzzy

+msgid "devcp_editbox_versions"

+msgstr "Versions and Files"

+

+#: views/elements/developers/editbox.thtml:42

+#, fuzzy

+msgid "devcp_editbox_view_listing"

+msgstr "View Listing"

+

+#: 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, php-format

+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/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/addon_submit_choose.thtml:56

+#: views/developers/addon_submit_choose.thtml:75

+#: 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 "Po�et 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ý po�et 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 "Po�et stažení 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/addon_submit_choose.thtml:61

+#: views/developers/addon_submit_choose.thtml:80

+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59

+msgid "devcp_submit_accept_dev_agreement"

+msgstr "Souhlasím"

+

+#: views/developers/addon_submit_choose.thtml:60

+#: views/developers/addon_submit_choose.thtml:79

+#: 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

+#, fuzzy

+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.

+#: 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

+#, fuzzy

+msgid "devcp_versions_edit_no_files"

+msgstr "No files found."

+

+#: 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

+#, fuzzy

+msgid "devcp_versions_edit_th_file"

+msgstr "File"

+

+#: views/developers/versions_edit.thtml:78

+#, fuzzy

+msgid "devcp_versions_edit_th_platform"

+msgstr "Platform"

+

+#: views/developers/versions_edit.thtml:79

+#, fuzzy

+msgid "devcp_versions_edit_th_size"

+msgstr "Size"

+

+#: views/developers/versions_edit.thtml:80

+#, fuzzy

+msgid "devcp_versions_edit_th_status"

+msgstr "Status"

+

+#: 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

+#, fuzzy

+msgid "devcp_versions_edit_transbox_releasenotes_name"

+msgstr "Release Notes"

+

+#: 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

+#, fuzzy

+msgid "devcp_versions_edit_update"

+msgstr "Update Versions"

+

+#: views/developers/versions.thtml:49

+#, fuzzy

+msgid "devcp_versions_header_manage"

+msgstr "Manage Versions and Files"

+

+#: views/developers/versions.thtml:87

+#, fuzzy

+msgid "devcp_versions_no_versions"

+msgstr "No versions."

+

+#. %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

+#, 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: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:610

+#: controllers/components/amo.php:611 controllers/components/amo.php:612

+#: 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/api_controller.php:894

+#: controllers/api_controller.php:925 controllers/addons_controller.php:131

+#: controllers/addons_controller.php:219

+#: controllers/addons_controller.php:1188

+#: controllers/addons_controller.php:1238

+#: controllers/addons_controller.php:1242

+#: 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:753

+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 controllers/api_controller.php:907

+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/api_controller.php:900

+#: controllers/addons_controller.php:206

+#: controllers/addons_controller.php:1162

+#: controllers/addons_controller.php:1228

+#: 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 "+/-"

+

+#: 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:73

+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:63

+#: 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:701 controllers/addons_controller.php:1023

+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 doplňku"

+

+#: views/elements/addon_list_options.thtml:48

+msgid "list_sortby_rating"

+msgstr "Bodové 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:680

+#: controllers/components/amo.php:682

+msgid "nav_category_dicts_langpacks"

+msgstr "Slovníky a jazykové balí�ky"

+

+#: controllers/components/amo.php:715 controllers/components/amo.php:717

+msgid "nav_category_plugins"

+msgstr "Zásuvné moduly"

+

+#: views/elements/addon_categories.thtml:57

+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:686

+msgid "nav_category_themes"

+msgstr "Motivy vzhledu"

+

+#: views/elements/app_chooser.thtml:47

+msgid "other_apps_tooltip"

+msgstr "Zde naleznete 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:390

+msgid "rss_featuredaddons"

+msgstr "Zajímavé doplňky"

+

+#: controllers/addons_controller.php:388

+msgid "rss_newestaddons"

+msgstr "Nejnovější doplňky"

+

+#: controllers/addons_controller.php:389

+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 "M. j"

+

+#. 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 "M. j, 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 "l, M. j"

+

+#. %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 "Vykreslit 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�it 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�it do diagramu datumy vydání Firefoxu"

+

+#: controllers/statistics_controller.php:248

+msgid "statistics_js_plotselection_options_resize_name_checked"

+msgstr "Zbalit graf"

+

+#: controllers/statistics_controller.php:249

+msgid "statistics_js_plotselection_options_resize_name_unchecked"

+msgstr "Rozbalit graf"

+

+#: controllers/statistics_controller.php:250

+msgid "statistics_js_plotselection_options_resize_tooltip"

+msgstr "Změnit velikost grafu"

+

+#: controllers/statistics_controller.php:230

+msgid "statistics_js_plotselection_selector_adu"

+msgstr "Po�et aktivních uživatelů 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 "Po�et 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 "Souhrn"

+

+#: 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í statistický souhrn doplňku %1$s"

+

+#: views/statistics/addon.thtml:214

+msgid "statistics_rss_icon_title"

+msgstr "RSS kanál statistického souhrnu"

+

+#: views/statistics/rss/summary.thtml:75

+msgid "statistics_rss_title_fulldate"

+msgstr "l, F j, 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"

 
 #: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
@@ -271,7 +7060,7 @@ msgstr "Stálý odkaz na tuto verzi"
 msgid "addon_versions_getlatesttext"
 msgstr "Nejnovější verze kompatibilní s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:432
 msgid "addons_author_addons_submit"
 msgstr "Odeslat"
 
@@ -280,19 +7069,19 @@ msgid "addons_author_tooltip"
 msgstr "Zobrazit profil autora"
 
 # %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#: controllers/addons_controller.php:954
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#: controllers/addons_controller.php:674
 #, 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:384
+#: controllers/addons_controller.php:387
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
@@ -365,18 +7154,13 @@ msgstr "Miluji ho"
 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:421
-#, fuzzy
+#, php-format
 msgid "addons_display_other_addons_by"
-msgid_plural "addons_display_other_addons_by"
-msgstr[0] "Další doplňky uživatele %1$s"
-msgstr[1] "Other add-ons by these authors"
+msgstr "Další doplňky uživatele %1$s"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#: controllers/addons_controller.php:157
+#: controllers/addons_controller.php:1089
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "Doplněk %s"
@@ -499,9 +7283,9 @@ msgid "addons_home_feature_head"
 msgstr "Doporu�ujeme"
 
 #: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/addons_controller.php:257 controllers/addons_controller.php:394
+#: controllers/addons_controller.php:531 controllers/addons_controller.php:761
+#: controllers/addons_controller.php:900 controllers/addons_controller.php:956
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -518,9 +7302,8 @@ msgstr "Ostatní aplikace"
 
 #: controllers/developers_controller.php:64
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:610
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:608
 #: 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
@@ -528,17 +7311,17 @@ msgstr "Ostatní aplikace"
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:345
 #: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/search_controller.php:178 controllers/addons_controller.php:157
+#: controllers/addons_controller.php:217 controllers/addons_controller.php:390
+#: controllers/addons_controller.php:533 controllers/addons_controller.php:677
+#: controllers/addons_controller.php:692 controllers/addons_controller.php:759
+#: controllers/addons_controller.php:779 controllers/addons_controller.php:898
+#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1020
+#: controllers/addons_controller.php:1089
+#: controllers/addons_controller.php:1124
+#: controllers/addons_controller.php:1179
+#: controllers/editors_controller.php:58 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
@@ -654,12 +7437,12 @@ msgstr ""
 "např. Flash, PDF, WMV. Zásuvné moduly na rozdíl od rozšíření nemodifikují "
 "samotný kód aplikace."
 
-#: controllers/addons_controller.php:777
+#: controllers/addons_controller.php:780
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Zásuvné moduly pro %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:723 controllers/addons_controller.php:779
 msgid "addons_plugins_pagetitle"
 msgstr "Zásuvné moduly"
 
@@ -678,23 +7461,23 @@ msgstr ""
 "s koncovým uživatelem (EULA): "
 
 # %1 is the addon name

-#: controllers/addons_controller.php:1120
+#: controllers/addons_controller.php:1123
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Náhledy doplňku %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1021
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1020
 msgid "addons_recommended_pagetitle"
 msgstr "Doporu�ované doplňky"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1016
 msgid "addons_recommended_title"
 msgstr "Doporu�ované doplňky"
 
@@ -747,7 +7530,7 @@ msgstr "Vyhledejte další moduly na stránkách %1$s"
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:758 controllers/addons_controller.php:768
 msgid "addons_searchengines_pagetitle"
 msgstr "Vyhledávací moduly"
 
@@ -757,31 +7540,31 @@ msgstr ""
 "Specialní díky patří projektu Mycroft za jejich práci kolem vyhledávacích "
 "modulů Firefoxu."
 
-#: controllers/components/amo.php:201 controllers/components/amo.php:229
+#: controllers/components/amo.php:199 controllers/components/amo.php:227
 msgid "addons_status_disabled"
 msgstr "Zakázaný"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:189
 msgid "addons_status_incomplete"
 msgstr "Neúplná verze"
 
-#: controllers/components/amo.php:197 controllers/components/amo.php:227
+#: controllers/components/amo.php:195 controllers/components/amo.php:225
 msgid "addons_status_nominated"
 msgstr "Na pískovišti: Nominováno ke zveřejnění"
 
-#: controllers/components/amo.php:195 controllers/components/amo.php:226
+#: controllers/components/amo.php:193 controllers/components/amo.php:224
 msgid "addons_status_pending"
 msgstr "Na pískovišti: Čeká na kontrolu"
 
-#: controllers/components/amo.php:199 controllers/components/amo.php:228
+#: controllers/components/amo.php:197 controllers/components/amo.php:226
 msgid "addons_status_public"
 msgstr "Veřejné"
 
-#: controllers/components/amo.php:193 controllers/components/amo.php:225
+#: controllers/components/amo.php:191 controllers/components/amo.php:223
 msgid "addons_status_sandbox"
 msgstr "Na pískovišti"
 
-#: controllers/components/amo.php:203
+#: controllers/components/amo.php:201
 msgid "addons_status_unknown"
 msgstr "Neznámý"
 
@@ -800,11 +7583,11 @@ 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:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1187
 msgid "addons_versions_history"
 msgstr "Historie verzí s&nbsp;popisem změn"
 
-#: controllers/addons_controller.php:1173
+#: controllers/addons_controller.php:1176
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Historie verzí doplňku %1$s"
@@ -963,23 +7746,65 @@ msgstr ""
 "Pro použití tohoto doplňku je nutné <a href=\"http://getfirefox.com"
 "\">aktualizovat Firefox</a>"
 
-#: controllers/addons_controller.php:667
+#: controllers/blog_controller.php:57
+msgid "blog_breadcrumb"
+msgstr "Blog"
+
+#: controllers/blog_controller.php:97
+msgid "blog_description"
+msgstr "Novinky a informace kolem doplňků a serveru addons.mozilla.org."
+
+#: views/blog/view.thtml:75
+msgid "blog_link_title"
+msgstr "Odkaz"
+
+#: views/blog/view.thtml:87
+msgid "blog_no_posts_found"
+msgstr "Nebyly nalezeny žádné příspěvky."
+
+#: views/blog/view.thtml:73
+#, php-format
+msgid "blog_posted_by"
+msgstr "Vloženo uživatelem %s dne %s"
+
+#: views/blog/view.thtml:83
+msgid "blog_previous_entries"
+msgstr "Předchozí příspěvek"
+
+#: views/blog/view.thtml:49
+msgid "blog_sidebar_other_blogs"
+msgstr "Další Mozilla blogy"
+
+#: controllers/blog_controller.php:58
+msgid "blog_subpage_title"
+msgstr "Blog"
+
+#: views/blog/view.thtml:59
+msgid "blog_subscribe_heading"
+msgstr "Odebírat"
+
+#: views/blog/view.thtml:60 controllers/blog_controller.php:55
+#: controllers/blog_controller.php:62 controllers/blog_controller.php:96
+msgid "blog_title"
+msgstr "Blog serveru doplňky Mozilly"
+
+#: controllers/addons_controller.php:670
 msgid "browse_addons_name"
 msgstr "Doplňky podle jména"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:668
 msgid "browse_addons_newest"
 msgstr "Nové doplňky"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:666
 msgid "browse_addons_popular"
 msgstr "Oblíbené doplňky"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:669
 msgid "browse_addons_rated"
 msgstr "Doplňky podle hodnocení"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:667
 msgid "browse_addons_updated"
 msgstr "Právě aktualizované doplňky"
 
@@ -1236,13 +8061,12 @@ msgstr ""
 #: views/addons/display.thtml:290 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
+#: views/reviews/delete.thtml:49 views/blog/view.thtml:74
 msgid "date"
 msgstr "%e. %B %Y"
 
 # date and time format string (strftime)

 #: views/elements/addon_version_detail.thtml:53
-#: views/admin/addons_status.thtml:57
 msgid "datetime"
 msgstr "%e. %B %Y, %H.%M"
 
@@ -1810,7 +8634,7 @@ msgstr "Aktualizovat"
 #: controllers/developers_controller.php:2648
 #: controllers/developers_controller.php:2698
 #: controllers/statistics_controller.php:139
-#: controllers/statistics_controller.php:336
+#: controllers/statistics_controller.php:327
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
@@ -3071,8 +9895,8 @@ 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:610
-#: controllers/components/amo.php:611 controllers/components/amo.php:612
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:608
+#: controllers/components/amo.php:609 controllers/components/amo.php:610
 #: controllers/reviews_controller.php:352
 #: controllers/reviews_controller.php:480
 msgid "error_access_denied"
@@ -3098,12 +9922,12 @@ msgstr "K zobrazení požadované stránky nemáte dostate�né oprávnění."
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
 #: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
-#: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
+#: controllers/reviews_controller.php:339 controllers/api_controller.php:116
+#: controllers/api_controller.php:752 controllers/api_controller.php:887
+#: controllers/api_controller.php:918 controllers/addons_controller.php:100
+#: controllers/addons_controller.php:1062
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1116
 #: controllers/editors_controller.php:386
 msgid "error_addon_notfound"
 msgstr "Doplněk nenalezen!"
@@ -3116,16 +9940,16 @@ msgstr "Tento doplněk zde nelze zobrazit."
 msgid "error_addon_selfreview"
 msgstr "Nelze hodnotit svůj vlastní doplněk."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:627
 msgid "error_browse_no_addons"
 msgstr "V této kategorii nejsou žádné doplňky."
 
-#: controllers/api_controller.php:424
+#: controllers/api_controller.php:417
 msgid "error_collection_feed_notfound"
 msgstr ""
 
 #: views/users/register.thtml:60 views/users/edit.thtml:176
-#: views/developers/add_step2.thtml:117 controllers/api_controller.php:907
+#: views/developers/add_step2.thtml:117 controllers/api_controller.php:900
 msgid "error_email_invalid"
 msgstr "Tato e-mailová adresa není platná."
 
@@ -3180,15 +10004,15 @@ msgstr ""
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:324
 #: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:470 controllers/api_controller.php:893
+#: controllers/addons_controller.php:87 controllers/addons_controller.php:1036
+#: controllers/addons_controller.php:1102
 #: 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
+#: controllers/components/amo.php:504 controllers/components/amo.php:529
 msgid "error_no_files_in_addon"
 msgstr "Soubory nenalezeny"
 
@@ -3324,68 +10148,54 @@ msgstr "Zásady ochrany soukromí"
 msgid "forum_save"
 msgstr "Uložit"
 
-#: models/addontype.php:89
+#: models/addontype.php:90 models/addontype.php:111
+#, fuzzy
 msgid "general_addontype_dict"
-msgstr "Slovník"
+msgid_plural "general_addontype_dict"
+msgstr[0] "Slovník"
+msgstr[1] "Slovníky"
 
-# 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
+#: models/addontype.php:86 models/addontype.php:109
+#, fuzzy
 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í"
+msgid_plural "general_addontype_extension"
+msgstr[0] "Rozšíření"
+msgstr[1] "Rozšíření"
 
-#: models/addontype.php:95
+#: models/addontype.php:96 models/addontype.php:114
+#, fuzzy
 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)"
+msgid_plural "general_addontype_lpaddon"
+msgstr[0] "Jazykový balí�ek (doplněk)"
+msgstr[1] "Jazykové balí�ky (doplněk)"
 
-#: models/addontype.php:93
+#: models/addontype.php:94 models/addontype.php:113
+#, fuzzy
 msgid "general_addontype_lpapp"
-msgstr "Jazykový balí�ek (aplikace)"
+msgid_plural "general_addontype_lpapp"
+msgstr[0] "Jazykový balí�ek (aplikace)"
+msgstr[1] "Jazykové balí�ky (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
+#: models/addontype.php:98 models/addontype.php:115
+#, fuzzy
 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"
+msgid_plural "general_addontype_plugin"
+msgstr[0] "Zásuvný modul"
+msgstr[1] "Zásuvné moduly"
 
-#: models/addontype.php:91
+#: models/addontype.php:92 models/addontype.php:112
+#, fuzzy
 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"
+msgid_plural "general_addontype_search"
+msgstr[0] "Vyhledávací modul"
+msgstr[1] "Vyhledávací moduly"
 
-#: models/addontype.php:87
+#: models/addontype.php:88 models/addontype.php:110
+#, fuzzy
 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"
+msgid_plural "general_addontype_theme"
+msgstr[0] "Motiv vzhledu"
+msgstr[1] "Motivy vzhledu"
 
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
@@ -3482,7 +10292,7 @@ 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:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:700 controllers/addons_controller.php:897
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Slovníky a jazykové balí�ky"
 
@@ -3553,17 +10363,17 @@ msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
 #: views/elements/addon_categories.thtml:53
-#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:680
-#: controllers/components/amo.php:682
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:678
+#: controllers/components/amo.php:680
 msgid "nav_category_dicts_langpacks"
 msgstr "Slovníky a jazykové balí�ky"
 
-#: controllers/components/amo.php:715 controllers/components/amo.php:717
+#: controllers/components/amo.php:714 controllers/components/amo.php:716
 msgid "nav_category_plugins"
 msgstr "Zásuvné moduly"
 
 #: views/elements/addon_categories.thtml:57
-#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:686
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:684
 msgid "nav_category_themes"
 msgstr "Motivy vzhledu"
 
@@ -3588,11 +10398,6 @@ msgstr "Autoři"
 msgid "page_title_experimental_addons"
 msgstr "Experimentální doplňky"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
-msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
-
 #: controllers/pages_controller.php:96
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Vytvořte si své Firefox FAQ"
@@ -3773,15 +10578,15 @@ msgstr ""
 msgid "reviews_header"
 msgstr "Hodnocení doplňku %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:264
 msgid "rss_featuredaddons"
 msgstr "Zajímavé doplňky"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:262
 msgid "rss_newestaddons"
 msgstr "Nejnovější doplňky"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:263
 msgid "rss_updatedaddons"
 msgstr "Aktualizované doplňky"
 
@@ -3938,12 +10743,12 @@ msgstr "M. j, Y"
 msgid "statistics_date_weekdayshortmonth"
 msgstr "l, M. j"
 
-#: controllers/components/stats.php:517
+#: controllers/components/stats.php:385
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "Doplněk %1$s vytvořen"
 
-#: controllers/components/stats.php:498
+#: controllers/components/stats.php:366
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "Aplikace %1$s vydána"
@@ -3984,151 +10789,131 @@ msgstr "Stránka statistik"
 msgid "statistics_index_view_button"
 msgstr "Zobrazit statistiky"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
-#, fuzzy
-msgid "statistics_js_download_csv"
-msgstr "View this table in CSV format"
-
-#: controllers/statistics_controller.php:222
+#: controllers/statistics_controller.php:217
 msgid "statistics_js_dropdowns_none"
 msgstr "žádný"
 
-#: controllers/statistics_controller.php:221
+#: controllers/statistics_controller.php:216
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Odstranit diagram"
 
-#: controllers/statistics_controller.php:224
-#, fuzzy
-msgid "statistics_js_groupby_selector_date"
-msgstr "Group by: Day"
-
 #: controllers/statistics_controller.php:226
-#, fuzzy
-msgid "statistics_js_groupby_selector_month"
-msgstr "Group by: Month"
-
-#: controllers/statistics_controller.php:225
-#, fuzzy
-msgid "statistics_js_groupby_selector_week"
-msgstr "Group by: Week"
-
-#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s nalezen v&nbsp;rozsahu"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Přidat diagram"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Přidá další diagram do tohoto grafu"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Skrýt celkový po�et"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Zobrazit celkový po�et"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Vykreslit na tento graf celkový po�et"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Zobrazit data (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Zobrazí �árkou oddělené hodnoty pro tyto data"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Skrýt události doplňku %s"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Zobrazit události doplňku %s"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Vyzna�it do diagramu datumy vydání doplňku"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Skrýt události Firefoxu"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Zobrazit události Firefoxu"
 
-#: controllers/statistics_controller.php:241
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Vyzna�it do diagramu datumy vydání Firefoxu"
 
-#: controllers/statistics_controller.php:247
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Zbalit graf"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Rozbalit graf"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Změnit velikost grafu"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:220
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Po�et aktivních uživatelů za den"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplikace"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Vlastní"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:219
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Po�et stažení"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Opera�ní systém"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:223
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Stav doplňku"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:218
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Souhrn"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Verze doplňku"
 
-#: controllers/components/stats.php:396
+#: controllers/components/stats.php:266
 msgid "statistics_longnames_application"
 msgstr "Aplikace"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:268
 msgid "statistics_longnames_os"
 msgstr "Opera�ní systém"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:267
 msgid "statistics_longnames_status"
 msgstr "Stav doplňku"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:269
 msgid "statistics_longnames_unknown"
 msgstr "Neznámý"
 
-#: controllers/components/stats.php:395
+#: controllers/components/stats.php:265
 msgid "statistics_longnames_version"
 msgstr "Verze doplňku"
 
@@ -4164,7 +10949,6 @@ msgstr "Vaše 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"
 
@@ -4192,7 +10976,7 @@ msgstr "Zmenšit velikost"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zmenšit velikost na jeden měsíc"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:249
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Denní statistický souhrn doplňku %1$s"
@@ -4237,23 +11021,23 @@ msgstr "Veřejný"
 msgid "statistics_settings_access_public_description"
 msgstr "Kdokoliv si může zobrazit statistiky tohoto doplňku"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:221
 msgid "statistics_settings_change_link"
 msgstr "Změnit nastavení"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:223
 msgid "statistics_settings_confidential"
 msgstr "Považujte prosím tyto informace za důvěrné."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:215
 msgid "statistics_settings_currently_private"
 msgstr "Tato stránka je v&nbsp;sou�asnosti <b>soukromá</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:211
 msgid "statistics_settings_currently_public"
 msgstr "Tato stránka je v&nbsp;sou�asnosti <b>veřejná</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:216
 msgid "statistics_settings_locked_alt"
 msgstr "Zamknuto"
 
@@ -4270,27 +11054,27 @@ msgstr "Uložit nastavení"
 msgid "statistics_settings_title"
 msgstr "Nastavení stránky statistik pro doplněk %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:212
 msgid "statistics_settings_unlocked_alt"
 msgstr "Odemknuto"
 
-#: controllers/components/stats.php:403
+#: controllers/components/stats.php:273
 msgid "statistics_shortnames_application"
 msgstr "Apl"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:275
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:274
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:276
 msgid "statistics_shortnames_unknown"
 msgstr "Nz"
 
-#: controllers/components/stats.php:402
+#: controllers/components/stats.php:272
 msgid "statistics_shortnames_version"
 msgstr "Vrz"
 
@@ -4350,8 +11134,8 @@ msgstr "Po�et aktivních uživatelů za den"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "%1$s"
 
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:175
+#: controllers/statistics_controller.php:248
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Statistika doplňku %1$s"
@@ -4838,7 +11622,7 @@ msgstr "Profil uživatele %1$s"
 
 # %1 is the user's name
 #: views/users/info.thtml:110
-#, fuzzy
+#, fuzzy, php-format
 msgid "users_info_reviews_by_user"
 msgstr "Reviews by %s"
 
@@ -4873,3 +11657,385 @@ 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"
+
+#~ msgid "addon_recommended"
+#~ msgstr "Tento doplněk je doporu�ovaný Mozillou"
+
+# %1 is the user, %2 is the (localized) date, %3 is the rating

+#~ msgid "addon_reviewed_by_u_on_d_rated_x"
+#~ msgstr "%1$s dne %2$s (hodnocení: %3$s)"
+
+#~ msgid "addons_breadcrumb_EULA"
+#~ msgstr "EULA"
+
+#~ msgid "addons_breadcrumb_privacy_policy"
+#~ msgstr "Zásady ochrany soukromí"
+
+#~ msgid "addons_browse_all_addons"
+#~ msgstr "VÅ¡echny/a %1$s"
+
+#~ msgid "addons_browse_all_addons_title"
+#~ msgstr "Procházet všechny/a %1$s"
+
+#~ msgid "addons_display_a_discuss"
+#~ msgstr "Diskutovat o doplňku %s"
+
+#~ msgid "addons_display_collapse"
+#~ msgstr "skrýt"
+
+#~ msgid "addons_display_developer_home_page"
+#~ msgstr "Domovská stránka vývojáře"
+
+#~ msgid "addons_display_expand"
+#~ msgstr "zobrazit"
+
+#~ msgid "addons_display_header_discussions"
+#~ msgstr "Diskuse"
+
+#~ msgid "breadcrumb_addon_previews"
+#~ msgstr "Ukázky"
+
+#~ msgid "breadcrumb_addon_versions"
+#~ msgstr "Historie verzí"
+
+#~ msgid "devcp_actionbar_link_disable"
+#~ msgstr "Zakázat doplněk"
+
+#~ msgid "devcp_actionbar_link_enable"
+#~ msgstr "Povolit doplněk"
+
+#~ msgid "devcp_actionbar_link_nominate"
+#~ msgstr "Nominovat doplněk"
+
+#~ msgid "devcp_actionbar_link_viewpublic"
+#~ msgstr "Zobrazit veřejnou �ást"
+
+#~ msgid "devcp_statsbar_rating"
+#~ msgstr "Bodové hodnocení: <em>%1$.2f</em> / %2$d"
+
+#~ msgid "editors_reviews_action_approve"
+#~ msgstr "Schválit"
+
+#~ msgid "editors_reviews_action_delete"
+#~ msgstr "Smazat"
+
+#~ msgid "forum_about_settings"
+#~ msgstr "O nastavení"
+
+#~ msgid "forum_about_settings_notes"
+#~ msgstr "Poznámky k&nbsp;nastavení"
+
+#~ msgid "forum_add_your_comments"
+#~ msgstr "Přidejte svůj komentář"
+
+#~ msgid "forum_administrative_options"
+#~ msgstr "Možnosti správce"
+
+#~ msgid "forum_administrative_settings"
+#~ msgstr "Nastavení správce"
+
+#~ msgid "forum_all"
+#~ msgstr "VÅ¡echna"
+
+#~ msgid "forum_back_to_discussions"
+#~ msgstr "Zpět do diskuzí"
+
+#~ msgid "forum_cancel"
+#~ msgstr "Zrušit"
+
+#~ msgid "forum_categories"
+#~ msgstr "Kategorie fóra"
+
+#~ msgid "forum_category_description"
+#~ msgstr "Popis"
+
+#~ msgid "forum_category_description_notes"
+#~ msgstr "Poznámky k&nbsp;popisu"
+
+#~ msgid "forum_category_management"
+#~ msgstr "Správa kategorií"
+
+#~ msgid "forum_category_name"
+#~ msgstr "Jméno"
+
+#~ msgid "forum_category_name_notes"
+#~ msgstr "Poznámky ke jménu"
+
+#~ msgid "forum_category_removed"
+#~ msgstr "Kategorie odebrána"
+
+#~ msgid "forum_category_reorder_notes"
+#~ msgstr "Přeskupit kategorie"
+
+#~ msgid "forum_category_saved"
+#~ msgstr "Kategorie uložena"
+
+#~ msgid "forum_check"
+#~ msgstr "Zkontrolovat"
+
+# %1 is the username, %2 is date and time

+#~ msgid "forum_comment_by_name_on_date"
+#~ msgstr "Komentář uživatele %1$s ze dne %2$s"
+
+#~ msgid "forum_confirm_hide_comment"
+#~ msgstr "Skute�ně si přejete tento komentář skrýt?"
+
+#~ msgid "forum_confirm_show_comment"
+#~ msgstr "Skute�ně si přejete tento komentář zobrazit?"
+
+#~ msgid "forum_create_a_new_role"
+#~ msgstr "Vytvořit novou roli"
+
+#~ msgid "forum_create_new_category"
+#~ msgstr "Vytvořit novou kategorii"
+
+#~ msgid "forum_current_category"
+#~ msgstr "Aktuální kategorie"
+
+#~ msgid "forum_define_new_category"
+#~ msgstr "Vytváření nové kategorie"
+
+#~ msgid "forum_define_new_role"
+#~ msgstr "Přidat novou roli"
+
+#~ msgid "forum_edit"
+#~ msgstr "Upravit"
+
+#~ msgid "forum_edit_comment"
+#~ msgstr "Upravit komentář"
+
+#~ msgid "forum_edit_your_comments"
+#~ msgstr "Úprava vlastních komentářů"
+
+#~ msgid "forum_edit_your_discussion_topic"
+#~ msgstr "Úprava tématu"
+
+#~ msgid "forum_enter_your_comments"
+#~ msgstr "Vložte váš komentář"
+
+#~ msgid "forum_enter_your_discussion_topic"
+#~ msgstr "Téma diskuse"
+
+#~ msgid "forum_error_title"
+#~ msgstr "Chyba"
+
+#~ msgid "forum_get_category_to_edit"
+#~ msgstr "Zvolte kategorii k&nbsp;úpravě"
+
+#~ msgid "forum_hide_comment"
+#~ msgstr "Skrýt komentáře"
+
+#~ msgid "forum_improper_format"
+#~ msgstr "Nesprávný formát"
+
+# %1 is the username, %2 is date and time

+#~ msgid "forum_last_comment_by_name_on_date"
+#~ msgstr "Poslední komentář od uživatele %1$s ze dne %2$s"
+
+#~ msgid "forum_modify_category_definition"
+#~ msgstr "Úprava popisu kategorie"
+
+#~ msgid "forum_modify_role_definition"
+#~ msgstr "Upravit roli"
+
+#~ msgid "forum_new_category_saved"
+#~ msgstr "Nová kategorie uložena"
+
+#~ msgid "forum_new_role_saved"
+#~ msgstr "Nová role vytvořena"
+
+#~ msgid "forum_no_discussions_found"
+#~ msgstr "Nenalezeny žádné diskuse."
+
+#~ msgid "forum_none"
+#~ msgstr "Žádné"
+
+#~ msgid "forum_not_signed_in"
+#~ msgstr "Nepřihlášen"
+
+#~ msgid "forum_one_day_ago"
+#~ msgstr "V�era"
+
+#~ msgid "forum_one_hour_ago"
+#~ msgstr "Před 1 hodinou"
+
+#~ msgid "forum_one_minute_ago"
+#~ msgstr "Před 1 minutou"
+
+#~ msgid "forum_one_second_ago"
+#~ msgstr "Před 1 vteřinou"
+
+# Page list's current position (no total) (ie. "1 to 15").

+# %1 is first record no., %2 is last record no.

+#~ msgid "forum_page_details"
+#~ msgstr "Od %1$s do %2$s"
+
+# Page list's current position (ie. "1 to 15 of 56").

+# %1 is first record no., %2 is last record no., %3 is total no. of records

+#~ msgid "forum_page_details_full"
+#~ msgstr "Od %1$s do %2$s z&nbsp;%3$s"
+
+#~ msgid "forum_permission_error"
+#~ msgstr "Přístup odepřen"
+
+#~ msgid "forum_remove"
+#~ msgstr "Odebrat fórum"
+
+#~ msgid "forum_replacement_category"
+#~ msgstr "Nahrazující kategorie"
+
+#~ msgid "forum_replacement_category_notes"
+#~ msgstr "Poznámky k&nbsp;nahrazující kategorii"
+
+#~ msgid "forum_replacement_role"
+#~ msgstr "Nahrazující role"
+
+#~ msgid "forum_replacement_role_notes"
+#~ msgstr "Poznámky k&nbsp;nahrazující roli"
+
+#~ msgid "forum_replies"
+#~ msgid_plural "forum_replies"
+#~ msgstr[0] "odpově�"
+#~ msgstr[1] "odpovědi"
+#~ msgstr[2] "odpovědí"
+
+#~ msgid "forum_required"
+#~ msgstr "Povinné pole"
+
+# %1 is input name

+#~ msgid "forum_required_input"
+#~ msgstr "%1$s je povinné pole"
+
+#~ msgid "forum_role_abilities"
+#~ msgstr "Schopnosti"
+
+#~ msgid "forum_role_abilities_notes"
+#~ msgstr "Poznámky ke schopnostem"
+
+#~ msgid "forum_role_category_notes"
+#~ msgstr "Poznámky ke kategorii"
+
+#~ msgid "forum_role_icon"
+#~ msgstr "Ikona"
+
+#~ msgid "forum_role_icon_notes"
+#~ msgstr "Poznámky k&nbsp;ikoně"
+
+#~ msgid "forum_role_management"
+#~ msgstr "Správa rolí"
+
+#~ msgid "forum_role_name"
+#~ msgstr "Jméno"
+
+#~ msgid "forum_role_name_notes"
+#~ msgstr "Poznámky ke jménu"
+
+#~ msgid "forum_role_removed"
+#~ msgstr "Role odstraněna."
+
+#~ msgid "forum_role_reorder_notes"
+#~ msgstr "Poznámky k&nbsp;přeskupování rolí"
+
+#~ msgid "forum_role_saved"
+#~ msgstr "Role uložena"
+
+#~ msgid "forum_role_tagline"
+#~ msgstr "Nadpis"
+
+#~ msgid "forum_role_tagline_notes"
+#~ msgstr "Poznámky k&nbsp;nadpisu"
+
+#~ msgid "forum_roles"
+#~ msgstr "Role"
+
+#~ msgid "forum_roles_in_category"
+#~ msgstr "Role v&nbsp;kategorii"
+
+#~ msgid "forum_save_your_changes"
+#~ msgstr "Uložit změny"
+
+#~ msgid "forum_search"
+#~ msgstr "Hledat v&nbsp;diskusích"
+
+#~ msgid "forum_select_category_to_remove"
+#~ msgstr "Zvolte kategorii k&nbsp;odebrání"
+
+#~ msgid "forum_select_replacement_category"
+#~ msgstr "Zvolte kategorii, která ji nahradí"
+
+#~ msgid "forum_select_replacement_role"
+#~ msgstr "Zvolte roli, která ji nahradí"
+
+#~ msgid "forum_select_role_to_edit"
+#~ msgstr "Zvolte roli k&nbsp;úpravě"
+
+#~ msgid "forum_select_role_to_remove"
+#~ msgstr "Zvolte roli k&nbsp;odstranění"
+
+#~ msgid "forum_show_comment"
+#~ msgstr "Zobrazit komentář"
+
+#~ msgid "forum_start_a_new_discussion"
+#~ msgstr "Za�ít novou diskusi"
+
+#~ msgid "forum_start_your_discussion"
+#~ msgstr "Za�něte novou diskusi"
+
+# %1 is username

+#~ msgid "forum_started_by"
+#~ msgstr "Zahájil(a) %1$s"
+
+# %1 is input name, %2 is character length

+#~ msgid "forum_too_many_characters"
+#~ msgstr "%1$s je o %2$s znaků delší než může být"
+
+#~ msgid "forum_top_of_page"
+#~ msgstr "Nahoru"
+
+#~ msgid "forum_wait"
+#~ msgstr "ÄŒekejte"
+
+# %1 is day count

+#~ msgid "forum_x_days_ago"
+#~ msgstr "Před %1$s dny"
+
+# %1 is hour count

+#~ msgid "forum_x_hours_ago"
+#~ msgstr "Před %1$s hodinami"
+
+# %1 is minute count

+#~ msgid "forum_x_minutes_ago"
+#~ msgstr "Před %1$s minutami"
+
+# %1 is second count

+#~ msgid "forum_x_seconds_ago"
+#~ msgstr "Před %1$s vteřinami"
+
+#~ msgid "header_navlink_browse"
+#~ msgstr "Procházet"
+
+#~ msgid "langtools_link_jumpto_dicts"
+#~ msgstr "Slovníky a jazykové balí�ky"
+
+#~ msgid "recaptcha_enter_numbers"
+#~ msgstr "Vložte prosím níže <strong>�ísla</strong>, která slyšíte."
+
+# %1 is the link switching refreshing the captcha

+# %2 is the link switching to a text captcha

+#~ msgid "recaptcha_hardtohear"
+#~ msgstr ""
+#~ "Pokud je pro vás obtížné rozumět, můžete <a href=\"%1$s\">zkusit jiná "
+#~ "�ísla</a> nebo <a href=\"%2$s\">přepnout zpět na text</a>."
+
+# %1 is the link switching refreshing the captcha

+# %2 is the link switching to an audio captcha

+#~ msgid "recaptcha_hardtoread"
+#~ msgstr ""
+#~ "Pokud je pro vás obtížné rozumět, můžete <a href=\"%1$s\">zkusit jiná "
+#~ "slova</a> nebo si <a href=\"%2$s\">poslechnout �ísla</a>."
+
+#~ msgid "rss_newestaddons_description"
+#~ msgstr "Nejnovější doplňky Mozilly"
+
+#~ msgid "search_form_submit"
+#~ msgstr "Hledat"
diff --git a/site/app/locale/cs/pages/experimental_addons.thtml b/site/app/locale/cs/pages/experimental_addons.thtml
deleted file mode 100644
index dab560d..0000000
--- a/site/app/locale/cs/pages/experimental_addons.thtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<h1>Experimentální doplňky</h1>
-
-<h2>Co je experimentální doplněk?</h2>
-
-<p>Experimentální doplňky jsou ur�eny pro pokro�ilé uživatele, kteří je testují
-dříve, než jsou dostupné pro všechny uživatele. Řada doplňků může být ve fázi
-prototypu. Experimentální doplňky mohou být alfa, beta �i v horší kvalitě,
-výkonu �i ve vlastnostech.</p>
-
-<p>Při instalaci experimentálních doplňků byste se měli mít na pozoru, protože
-nebyly testovány redaktorem a mohou poškodit konfiguraci vašeho po�íta�e.</p>
-
-
-<h2>Jak na webu poznám experimentální doplněk?</h2>
-
-<p>Experimentální doplňky jsou ozna�eny štítkem "experimentální" a pro jejich
-instalaci se potřebujete přihlásit.</p>
-
-
-<h2>Pro� se musím pro instalaci experimentálních doplňků přihlásit?</h2>
-
-<p>Web s doplňky vyžaduje přihlášení uživatelů při instalaci experimentálních doplňků
-jako vyrozumění, že se chystáte u�init riskantní krok.</p>
-
-
-<h2>Mám se přihlašovat nebo vytvářet ú�et pro instalaci veřejných doplňků?</h2>
-
-<p>Ne. Web s doplňky nevyžaduje uživatelský ú�et nebo přihlašování, abyste mohli
-instalovat veřejné doplňky.</p>
-
diff --git a/site/app/locale/cy/LC_MESSAGES/messages.po b/site/app/locale/cy/LC_MESSAGES/messages.po
index 14826c5..6e9986c 100644
--- a/site/app/locale/cy/LC_MESSAGES/messages.po
+++ b/site/app/locale/cy/LC_MESSAGES/messages.po
@@ -21,6 +21,10 @@ msgstr ""
 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 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
@@ -49,38 +53,34 @@ msgstr "Cyhoeddus"
 msgid "a_header_sandbox"
 msgstr "Blwch Tywod"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, fuzzy, php-format
-msgid "added"
-msgstr "Added %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Diweddaru %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Fersiwn %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "Y llwythi i gyd"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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
+#. %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"
@@ -97,22 +97,22 @@ msgstr "y dudalen"
 msgid "addon_list_sortby"
 msgstr "Trefnu yn ôl"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "argymell"
 
-# %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:57
 msgid "addon_not_available_for_platform"
 msgstr "Nid yw %1$s ar gael ar gyfer %2$s."
 
-# %1 is the addon name
+#. %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
@@ -121,7 +121,7 @@ msgstr "Nid yw %1$s ar gael ar gyfer %2$s."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Nôl i %1$s..."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -140,6 +140,7 @@ msgstr "Adolygiad:"
 msgid "addon_review_add_submit"
 msgstr "Cyflwyno dy adolygiad"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -173,23 +174,25 @@ msgstr "Iawn"
 msgid "addon_review_delete_header"
 msgstr "Dileu'r Adolygiad"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Wedi dileu'r adolygiad yn llwyddiannus."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Golygu’r adolygiad ar %s"
 
-# %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -200,7 +203,7 @@ msgstr ""
 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.
+#. %1 is the review count, %2 is the nickname or full name of the user.
 #: views/reviews/display.thtml:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
@@ -208,16 +211,16 @@ 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 addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Adolygiadau ar gyfer %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -231,13 +234,13 @@ msgstr "Ateb Datblygwr:"
 msgid "addon_review_saved_successfully"
 msgstr "Cafodd dy adolygiad ei gadw'n llwyddiannus. Diolch!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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
+#. %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
@@ -263,11 +266,14 @@ msgstr "Previous Add-on"
 msgid "addon_version_permalink"
 msgstr "Permanent link to this version"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "Y fersiwn cydnaws diweddar yw"
+#. %1 is the current Application name (e.g. Firefox)
+#. %2 is the Application's version number
+#: 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:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Mynd"
 
@@ -276,20 +282,21 @@ msgstr "Mynd"
 msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
@@ -298,7 +305,7 @@ msgstr "Browse %1$s Themes :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "Ychwanegu adolygiad"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Manylion Uwch"
 
@@ -306,11 +313,11 @@ msgstr "Manylion Uwch"
 msgid "addons_display_categories"
 msgstr "Categorïau"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "adolygiad manwl"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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"
@@ -319,143 +326,150 @@ msgstr "Dim yn ei hoffi"
 msgid "addons_display_edit_review"
 msgstr "Golygu dy adolygiad"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Mae gan yr ychwanegyn bolisi preifatrwydd"
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Sylw Datblygwr"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Tudalen cartref"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Adolygiadau"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Cefnogaeth"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Hoffi"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Disgrifiad Hir"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Rhagor o Ddelweddau"
 
-# %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:421
+#. %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
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Ychwanegion eraill gan %1$s"
 msgstr[1] "Other add-ons by these authors"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, fuzzy, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: 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"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "Mae cefnogaeth ar gyfer yr ychwanegyn ar gael gan y datblygwr yn %s neu drwy "
 "anfon e-bost at %s"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Grafddio Hwn"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %1 is the support section link
+#: 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:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Cadw"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Gweld pob adolygiad (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Gweld Pob Fersiwn"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Hanes Llawn Bob Fersiwn"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Gweld y ffynhonnell"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Gweld yr ystadegau"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Beth wyt ti'n feddwl?"
 
@@ -465,7 +479,7 @@ msgstr "Mae'n gweithio gyda:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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"
@@ -476,10 +490,11 @@ msgstr "gan"
 msgid "addons_home_feature_head"
 msgstr "Argymellion"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -496,7 +511,9 @@ msgstr "Newest:"
 msgid "addons_home_other_applications"
 msgstr "Rhaglenni Eraill"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -506,19 +523,20 @@ msgstr "Rhaglenni Eraill"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -618,6 +636,7 @@ msgstr "ar gyfer y Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "ar gyfer Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -638,12 +657,13 @@ msgstr ""
 "yn ychydig yn wahanol i estyniadau, sy'n newid neu yn ychwanegu at y "
 "swyddogaethau presennol."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Ategynnau Cyffredin ar gyfer %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Ategynnau"
 
@@ -654,6 +674,7 @@ msgstr "Ategynnau"
 msgid "addons_plugins_support_documentation"
 msgstr "Dogfennau Cymorth:"
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -661,24 +682,24 @@ msgstr ""
 "Mae %s angen i chi dderbyn y Cytundeb Trwyddedu Defnyddiwr cyn bod modd "
 "cychwyn gosod:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Rhagolwg %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Ychwanegion Gorau"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Ychwanegion Gorau"
 
@@ -686,7 +707,7 @@ msgstr "Ychwanegion Gorau"
 msgid "addons_searchengines_additional_resources"
 msgstr "Adnoddau Ychwanegol"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Canolfan Datblygwyr Mozilla"
@@ -703,36 +724,36 @@ msgstr ""
 "Mae angen Javascript ar gyfer gosod ategyn, ond mae'n ymddangos dy fod wedi "
 "ei anablu. Bydd angen cychwyn Javascript cyn gallu gosod yr ategynnau hyn."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %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 "Dysgu sut i %1$s yn y %2$s."
 
-# link path to search plugins instructions, relative to devmo
+#. 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 "/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: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
+#. %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 "Pori drwy ragor o beiriannau chwilio yn %1$s"
 
-# link text to mycroft.mozdev.org
+#. link text to mycroft.mozdev.org
 #: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 #, fuzzy
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Peiriannau Chwilio"
 
@@ -746,7 +767,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Disabled"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 #, fuzzy
 msgid "addons_status_incomplete"
 msgstr "Incomplete Version"
@@ -791,11 +812,12 @@ msgstr ""
 "Mae'r fersiynau hyn yn cael eu dangos er mwyn gwybodaeth a chynnal "
 "arbrofion. Dylet ddefnyddio'r fersiwn diweddaraf bob tro."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Hanes y Fersiwn a'r Cofnodion Newid"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Hanes Fersiwn %1$s"
@@ -808,6 +830,7 @@ msgstr "Ychwanegu Grŵp"
 msgid "admin_group_delete_pagetitle"
 msgstr "Dileu Grŵp"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -957,6 +980,7 @@ msgstr "Anwybyddu gwirio'r fersiwn"
 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:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
@@ -964,10 +988,13 @@ 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: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:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
@@ -980,27 +1007,27 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Diweddaru Firefox</a> er mwyn defnyddio’r "
 "ychwanegyn hwn"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 #, fuzzy
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 #, fuzzy
 msgid "browse_addons_newest"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 #, fuzzy
 msgid "browse_addons_popular"
 msgstr "Popular Add-ons"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 #, fuzzy
 msgid "browse_addons_rated"
 msgstr "Add-ons by Rating"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 #, fuzzy
 msgid "browse_addons_updated"
 msgstr "Recently Updated Add-ons"
@@ -1033,7 +1060,7 @@ msgstr "Diweddarwyd Diwethaf yn Gyntaf"
 msgid "category_extra_mostpopular"
 msgstr "Mwyaf Poblogaidd yn Gyntaf"
 
-# %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"
@@ -1044,12 +1071,20 @@ msgstr "Gweld Popeth %1$s"
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
+#. %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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 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:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
@@ -1089,6 +1124,8 @@ 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
 #: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
@@ -1117,6 +1154,10 @@ 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)
 #: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
@@ -1134,6 +1175,8 @@ msgstr ""
 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:69
 #, fuzzy
 msgid "compatibility_report_intro"
@@ -1147,6 +1190,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
@@ -1157,6 +1201,7 @@ 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
 #: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
@@ -1167,6 +1212,7 @@ 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
 #: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
@@ -1177,6 +1223,7 @@ 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
 #: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
@@ -1198,12 +1245,13 @@ msgstr "Information for Add-on Users"
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Am wybodaeth ar gyfrannu, gwel %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "tudalen wiki"
 
@@ -1245,26 +1293,35 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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"
 
-# date and time format string (strftime)
+#. 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 "%B %e, %Y, %I:%M %p"
@@ -1290,14 +1347,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 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"
@@ -1345,36 +1430,36 @@ msgstr "Cam 5: Llwyddiant"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Cymorth ar gyfer Cyflwyno"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Ychwanegyn wedi ei anablu'n llwyddiannus"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Golygu Ychwanegyn"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Ychwanegyn wedi ei alluogi'n llwyddiannus"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Disgrifiad o Ychwanegyn"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Ychwanegu Tiudalen Cartref"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Enw'r Ychwanegyn"
 
@@ -1383,40 +1468,298 @@ msgstr "Enw'r Ychwanegyn"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Rhagolwg o'r Pennawd"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Polisi Preifatrwydd"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Crynodeb Ychwanegion"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Cynnal E-bost"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "Cynnal URL"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Nodiadau'r Fersiwn"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Enwebu Ychwanegyn"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Enwebwyd Ychwanegyn yn llwyddiannus!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1439,7 +1782,7 @@ msgstr ""
 "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
+#. %1 is the link to the sandbox information page
 #: views/developers/add_step5.thtml:63
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1449,7 +1792,7 @@ msgstr "Gelli ddarllen mwy am System Adolygu Blwch Tywod %s."
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "yma"
 
-# %1 is the "nominate" link
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1472,16 +1815,16 @@ 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:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Cyflwyno Ychwanegyn"
 
-#: controllers/developers_controller.php:2375
+#: 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
+#. %1 is the link to the preview upload page
 #: views/developers/add_step5.thtml:71
 #, php-format
 msgid "devcp_addon_upload_preview"
@@ -1492,7 +1835,7 @@ msgstr ""
 msgid "devcp_addon_upload_preview_link"
 msgstr "llwytho'r rhagolwg"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1521,10 +1864,102 @@ msgstr "Nesaf"
 msgid "devcp_change_addontype"
 msgstr "Newid y math o ychwanegyn:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "Diweddarwyd Sylwadau Datblygwyr"
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Ychwanegu Rhagolwg"
@@ -1617,6 +2052,7 @@ msgstr "Dim url cefnogi wedi ei ddarparu gan y datblygwr."
 msgid "devcp_details_trusted"
 msgstr "Ymddiriedir"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1646,6 +2082,7 @@ msgstr ""
 "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"
@@ -1666,11 +2103,65 @@ msgstr ""
 "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"
+msgstr "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Ychwanegu Awdur"
@@ -1683,10 +2174,297 @@ msgstr "Cyfeiriad E-bost yr Awdur"
 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:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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"
@@ -1752,6 +2530,206 @@ msgstr "Lleoliad Targed"
 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: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 "Diweddaru"
@@ -1762,11 +2740,66 @@ 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"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Cyflwyno Ychwanegion "
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1775,7 +2808,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Adolygiad wedi ei Gymedroli (%s)"
 msgstr[1] "Adolygiadau wedi eu Cymedroli (%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
 #, php-format
@@ -1784,7 +2817,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Ychwanegyn Enwebedig (%s)"
 msgstr[1] "Ychwanegion Enwebedig (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1797,8 +2830,8 @@ msgstr[1] "Diweddariadau'n Disgwyl (%s)"
 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)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
 #: views/developers/editversion.thtml:58
 #, php-format
 msgid "devcp_editversion_filename_size"
@@ -1824,29 +2857,30 @@ msgstr "Nodiadau ar gyfer Adolygwyr"
 msgid "devcp_editversion_submit_update"
 msgstr "Diweddaru"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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 "
@@ -1854,19 +2888,33 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Gwel %s am gyfeirnod"
 
+#. 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 "yn y dudalen"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, fuzzy, php-format
+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"
@@ -1874,7 +2922,7 @@ 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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Nid yw pob ffeil GUIDau'n cyd-fynd"
 
@@ -1904,6 +2952,8 @@ msgstr "Mae'n fwy na'r maint llwytho i fyny"
 msgid "devcp_error_http_nofile"
 msgstr "Heb llwytho ffeil i fyny"
 
+#. %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"
@@ -1911,15 +2961,16 @@ msgstr ""
 "Nid yw'r estyniad ffeil yma (%s) i'w ddefnyddio ar gyfer eicon. Defnyddia'r "
 "canlynol: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Dim install.rdf ar gael."
 
@@ -1927,21 +2978,26 @@ msgstr "Dim install.rdf ar gael."
 msgid "devcp_error_install_manifest"
 msgstr "Roedd y gwallau canlynol yn yr install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Dewisa math o ychwanegyn dilys"
 
+#. %$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 "Nid yw %s yn fersiwn dilys o %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "Nid yw dynodiad yr ychwanegyn yn ddilys: %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"
@@ -1960,6 +3016,7 @@ msgstr ""
 "Mae'r fersiwn yma o'r ychwanegyn yn annilys: nid oes modd i fersiynau "
 "gynnwys bylchau."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1969,6 +3026,7 @@ msgstr "Digwyddodd y gwall canlynol wrth ddidoli install.rdf: %s"
 msgid "devcp_error_move_file"
 msgstr "Methu symud y ffeil"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1991,15 +3049,15 @@ 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:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "Rhaid darparu'r wybodaeth gofynnwyd amdano ar gyfer enwebiad."
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "Nid oes modd enwebu ychwanegyn cyn ei ryddhau."
 
-#: controllers/developers_controller.php:2704
+#: 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."
@@ -2012,6 +3070,8 @@ msgstr "Dewis o leiaf un categori"
 msgid "devcp_error_one_user"
 msgstr "Rhaid bod o leiaf un awdur ar gyfer yr ychwanegyn."
 
+#. %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"
@@ -2019,13 +3079,13 @@ 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:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Nid oes gennyt ganiatâd i ddiweddaru'r ychwanegyn."
 
@@ -2041,7 +3101,7 @@ msgstr ""
 "Nid oes modd i ychwanegyn ddefnyddio updateURL allanol. Tynna hwn o'r ffeil "
 "install.rdf a cheisio eto."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Llwytha ffeil i fyny."
@@ -2262,7 +3322,7 @@ msgstr "Fy Ychwanegion"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Meysydd Lleoleiddiwyd"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2306,33 +3366,68 @@ msgstr "Cyflwyno'r Ychwanegyn"
 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: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ôl i fanylion ychwanegyn"
 
-# %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 "Enwebu %s"
 
-# %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 "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: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 ""
 "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)
+#. %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"
@@ -2347,9 +3442,14 @@ msgstr ""
 "Bydd gwneud hyn yn rhagolwg rhagosodedig yn tynnu statws rhagosodedig o'r "
 "rhagolwg rhagosodedig presennol."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2378,6 +3478,60 @@ msgstr "Golygu'r Rhagolwg"
 msgid "devcp_preview_updated_successfully"
 msgstr "Mae'r rhagolwg wedi ei ddiweddaru'n llwyddiannus."
 
+#: 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 ""
@@ -2389,10 +3543,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Ychwanegu Rhagolwg"
 
+#: 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 "Golygu Rhagolwg"
 
+#: 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 "Rhagolwg Ffeil"
@@ -2401,6 +3565,34 @@ msgstr "Rhagolwg Ffeil"
 msgid "devcp_previews_label_makedefault"
 msgstr "Gwneud hyn yn ddelwedd rhagosodedig"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Dileu'r Rhagolwg"
@@ -2417,55 +3609,170 @@ msgstr "Golygu'r Rhagolwg"
 msgid "devcp_previews_submit_upload"
 msgstr "Llwytho'r Rhagolwg"
 
+#: 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 "Anghywir?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Wyt ti'n siŵr dy fod am ddileu'r ffeil?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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"
 
+#: 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 "Hepgor diweddaru fy ngwybodaeth gyfredol ar yr ychwanegyn"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Defnyddiwr Dyddiol Gweithredol"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> Cyfanswm Llwytho i Lawr"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Llwytho i Lawr Wythnosol"
 
-#: controllers/developers_controller.php:1481
+#: 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 "Mae cyflwyno ychwanegion wedi eu hanablu ar hyn o bryd. Dewch nôl eto."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Rwy'n Derbyn"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Rwy'n Gwrthod"
 
@@ -2481,11 +3788,11 @@ msgstr "Anablwyd"
 msgid "devcp_summary_header_trusted"
 msgstr "Ymddiriedwyr"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Fersiwn Diweddaraf:"
 
-# %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"
@@ -2495,7 +3802,7 @@ msgstr "Nid oes gennyt ychwanegion. Clicia %s i gyflwyno un."
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "yma"
 
-# %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"
@@ -2505,30 +3812,674 @@ msgstr "Gwnewch yn siŵr eich bod %s ar gyfer eich thema."
 msgid "devcp_theme_upload_preview_link"
 msgstr "llwytho rhagolwg i fyny"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Gw. %s ar gyfer cyfeiriad"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "y dudalen hon"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Golygu Fersiwn"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Diweddarwyd y fersiwn yn llwyddiannus."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Mae'r ychwanegyn wedi ei anablu'n llwyddiannus"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Hidl"
@@ -2537,7 +4488,7 @@ msgstr "Hidl"
 msgid "editorcp_logs_filter_by"
 msgstr "Hidlo yn ôl math/gweithred"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Cofnod Digwyddiad"
 
@@ -2589,6 +4540,7 @@ msgstr "Cuddio Sylwadau"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Dangos Sylwadau"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2598,7 +4550,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Cofnod Adolygu"
 
@@ -2622,24 +4574,24 @@ msgstr "Gweithgaredd Golygyddol Diweddar"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Cyfanswm Adolygiadau"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Adolygiad Ychwanegyn"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Cwblha'r meysydd canlynol:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Dewisa o leiaf un ffeil i'w adolygu."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Dim caniatâd ar gyfer hunan adolygu"
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Meddalwedd Allanol"
 
@@ -2651,39 +4603,39 @@ msgstr "Ychwanegu nodwedd"
 msgid "editors_featured_add_feature_submit"
 msgstr "Ychwanegu"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Methu tynnu nodwedd."
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Wedi tynnu nodwedd yn llwyddiannus."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Nodweddion Gorau"
 
@@ -2717,39 +4669,40 @@ 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
+#. %1 is the queue mode
 #: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 diwrnod"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 awr"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 munud"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Offer Golygydd"
 
-#: controllers/editors_controller.php:286
+#. %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 "%s yn unig"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Cyn rhyddhau"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2763,19 +4716,24 @@ msgstr "Clirio"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Gweithred Adolygu"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Gwthio i'r Cyhoeddus"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Gofyn am Uwch Adolygiad"
 
@@ -2783,34 +4741,42 @@ msgstr "Gofyn am Uwch Adolygiad"
 msgid "editors_review_action_sandbox"
 msgstr "Cadw yn y Blwch Tywod"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Sylwadau Adolygu"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "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:170
+#: 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:159
+#: 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:162
+#: 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:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Os oes gennych bryderon am ddiogelwch, materion hawlfraint neu bryderon "
@@ -2838,15 +4804,15 @@ msgstr "Categoriau:"
 msgid "editors_review_header_compatibility"
 msgstr "Cytunedd:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Disgrifiad"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Sylwadau Datblygwyr"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2854,85 +4820,111 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Ffeiliau:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Hanes Eitemau"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Neges Enwebu"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Rhagolwg"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Polisi Preifatrwydd"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Adolygu %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Nodiadau Adolygu"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Crynodeb"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Nodiadau'r Fersiwn"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "Adolygiad Gweinyddol"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Enwebiad Cytunwyd/Cyhoeddus"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Enwebiad Gwrthod/Blwch Tywod"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Methu canfod cofnod adolygu blaenorol."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Adolygiad Gweinyddol"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Cytuno/Cyhoeddus"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Gwrthod/Blwch Tywod"
 
-#: views/editors/review.thtml:198
+#. 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 "Rhaglenni:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "neu ddewis ymateb parod:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Sylwadau:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Systemau Gweithredu:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Brig"
 
@@ -2941,7 +4933,7 @@ msgstr "Brig"
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Heb ganfod rhagolwg."
 
@@ -2950,42 +4942,49 @@ msgstr "Heb ganfod rhagolwg."
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %1 is the add-ons rank in the queue, %2 is the total queue length
 #: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Gweithred Prosesu"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Gweithred"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Sylwadau"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Dyddiad"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Adolygwr"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Fersiwn/Ffeil"
 
-#: controllers/editors_controller.php:411
+#: 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 "Adolygiad wedi ei brosesu'n llwyddiannus"
 
@@ -3011,7 +5010,7 @@ msgstr "Gweithred"
 msgid "editors_reviews_in_reply_to"
 msgstr "Mewn ymateb i:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Adolygiadau wedi eu prosesu'n llwyddiannus!"
 
@@ -3023,23 +5022,23 @@ 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:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Gwefan Benodol"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Newydd"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Diewddarwyd"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Rhaglenni wedi eu Profi"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Systemau Gweithredu wedi eu Profi"
 
@@ -3080,17 +5079,20 @@ msgstr "Platfform"
 msgid "editors_th_submissiontypes"
 msgstr "Math o Gyflwyno"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dwrnod"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s awr"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minud"
@@ -3099,8 +5101,8 @@ msgstr "%s minud"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Gwrthod Mynediad"
 
@@ -3108,12 +5110,13 @@ msgstr "Gwrthod Mynediad"
 msgid "error_access_denied_message"
 msgstr "Nid oes gennyt ganiatâd i ddarllen y dudalen hon."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3123,18 +5126,19 @@ msgstr "Nid oes gennyt ganiatâd i ddarllen y dudalen hon."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Heb ganfod ychwanegyn!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Nid yw'r ychwanegyn i'w weld yma."
 
@@ -3143,7 +5147,7 @@ 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:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Dim ychwanegion yn y categori hwn!"
 
@@ -3165,24 +5169,25 @@ msgstr "Nid yw hwn yn gyfeiriad e-bost dilys."
 msgid "error_field_required"
 msgstr "Rhaid i'r maes beidio â bod yn wag."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Heb ganfod y ffeil!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Gwall ffeil: Nid yw %s yn bodoli."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3200,16 +5205,18 @@ msgstr ""
 "Mae i'r URL fformat annilys. Dyali URLau dilys edrych fel http://esiampl.com/"
 "fy_nhudalen."
 
+#. %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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3228,7 +5235,7 @@ msgstr "Hysbysiad"
 msgid "error_preview_notfound"
 msgstr "Heb ganfod rhagolwg!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Rhaid dewis gradd."
 
@@ -3282,8 +5289,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Enw defnyddiwr neu gyfrinair anghywir!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Heb ganfod y fersiwn!"
 
@@ -3295,13 +5302,14 @@ msgstr "Cyfrinair anghywir wedi ei gynnig!"
 msgid "feature_learnmore"
 msgstr "Dysgu mwy"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Dysgu mwy am %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3313,6 +5321,45 @@ msgstr[1] "%1$s adolygiad"
 msgid "feature_view_more_from_category"
 msgstr "Gweld mwy o"
 
+#. 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Cedwir pob hawl."
@@ -3349,7 +5396,7 @@ msgstr "Ieithoedd Eraill"
 msgid "footer_privacy_policy"
 msgstr "Polisi Preifatrwydd"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Cadw"
 
@@ -3358,7 +5405,7 @@ msgstr "Cadw"
 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:110
 #, fuzzy
 msgid "general_addontype_dict_plural"
@@ -3369,7 +5416,7 @@ msgstr "Dictionaries"
 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:108
 #, fuzzy
 msgid "general_addontype_extension_plural"
@@ -3380,7 +5427,7 @@ msgstr "Extensions"
 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:113
 #, fuzzy
 msgid "general_addontype_lpaddon_plural"
@@ -3391,7 +5438,7 @@ msgstr "Language Packs (Add-on)"
 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:112
 #, fuzzy
 msgid "general_addontype_lpapp_plural"
@@ -3402,7 +5449,7 @@ msgstr "Language Packs (Application)"
 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:114
 #, fuzzy
 msgid "general_addontype_plugin_plural"
@@ -3413,7 +5460,7 @@ msgstr "Plugins"
 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:111
 #, fuzzy
 msgid "general_addontype_search_plural"
@@ -3424,12 +5471,13 @@ msgstr "Search Engines"
 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:109
 #, fuzzy
 msgid "general_addontype_theme_plural"
 msgstr "Themes"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3460,12 +5508,12 @@ msgid "header_navlink_addons"
 msgstr "Ychwanegion"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Allgofnodi"
 
@@ -3473,36 +5521,41 @@ msgstr "Allgofnodi"
 msgid "header_navlink_myaccount"
 msgstr "Cyfrif"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Cofrestru"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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
+#. %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 "<a href=\"%1$s\">Mewngofnodi</a> i osod yr ychwanegyn"
 
+#. %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 "Ychwaneu at %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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3525,7 +5578,7 @@ msgid "langtools_download_langpack"
 msgstr "Llwytho Pecyn Iaith i Lawr"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Geiriaduron a Phecynnau Iaith"
 
@@ -3583,7 +5636,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3617,7 +5674,7 @@ msgstr ""
 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:214
 msgid "other_users"
 msgstr "eraill"
@@ -3632,42 +5689,41 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_experimental_addons"
 msgstr "Experimental Add-ons"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 #, fuzzy
 msgid "page_title_policy"
 msgstr "Add-ons Policy"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 #, fuzzy
 msgid "page_title_privacy"
 msgstr "Mozilla Privacy Policy"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 #, fuzzy
 msgid "page_title_review_guide"
 msgstr "Review Guidelines"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 #, fuzzy
 msgid "page_title_sandbox"
 msgstr "Sandbox Review System"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 #, fuzzy
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
@@ -3687,6 +5743,7 @@ msgstr ""
 "install.rdf file sy'n cynnal o leiaf un o'r rhaglenni isod. Dim ond y "
 "fersiynau isod sydd ar gael i'r rhaglenni."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3694,6 +5751,8 @@ msgstr ""
 "Os nad yw dy raglen cynnal  angen ffeil install.rdf file, rhaid i ti gynnwys "
 "un gyda'r priodweddau angenrheidiol fel su'n cael ei nodi %s."
 
+#. 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 "yma"
@@ -3702,7 +5761,6 @@ msgstr "yma"
 msgid "pages_appversions_versions"
 msgstr "Fersiynnau"
 
-#: views/pages/experimental_addons.thtml:56
 #, fuzzy
 msgid "pages_experimental_addons_backbutton"
 msgstr "Back to the previous page"
@@ -3715,7 +5773,7 @@ msgstr "Tudalen Gwybodaeth y Blwch Tywod"
 msgid "pagination_next_page"
 msgstr "nesaf"
 
-# %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"
@@ -3742,8 +5800,8 @@ 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
+#. %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"
@@ -3751,8 +5809,8 @@ 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
+#. %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"
@@ -3770,7 +5828,7 @@ msgstr "Are you human?"
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 #, fuzzy
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
@@ -3801,7 +5859,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 #, fuzzy
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
@@ -3818,7 +5876,7 @@ 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
+#. %1 is the URL of the support section, %2 for the review guidelines
 #: views/reviews/add.thtml:48
 #, fuzzy
 msgid "review_guidelines_short"
@@ -3836,21 +5894,22 @@ msgstr ""
 "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: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:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Ychwanegion Gorau"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Ychwanegion Diweddaraf"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 #, fuzzy
 msgid "rss_updatedaddons"
 msgstr "Updated Add-ons"
@@ -3890,6 +5949,7 @@ msgstr "Pob Peiriant Chwilio"
 msgid "search_landing_browse_search_engines"
 msgstr "Pori'r Peiriannau Chwilio"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3909,12 +5969,13 @@ msgstr "Chwilio Ychwanegion"
 msgid "search_rss_description"
 msgstr "Chwilio llif canlyniadau"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Canlyniadau chwilio am: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Offer Gweinyddol"
 
@@ -3922,7 +5983,7 @@ msgstr "Offer Gweinyddol"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Offer Datblygu"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Offer Golygu"
 
@@ -3930,6 +5991,7 @@ msgstr "Offer Golygu"
 msgid "sidebar_navlink_welcome"
 msgstr "Croeso"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3968,6 +6030,7 @@ msgstr "Thema"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Add-ons"
 
+#. %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
@@ -3979,7 +6042,7 @@ msgstr "%1$s KB"
 msgid "stars_not_yet_rated"
 msgstr "Heb ei raddio eto"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3997,24 +6060,32 @@ msgstr "Offer Datblygwr"
 msgid "statistics_addon_switch"
 msgstr "Newid Ychwanegyn"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "%b. %e"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "%b. %e, %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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -4056,7 +6127,7 @@ msgstr "Bwrdd Gwybodaeth Ystadegau"
 msgid "statistics_index_view_button"
 msgstr "Gweld yr Ystadegau"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
@@ -4074,7 +6145,7 @@ msgstr "Tynnu'r plot"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
@@ -4084,104 +6155,109 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "Wedi canfod %s dewis"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Ychwanebu Plot"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Ychwanegu plot arall i'r graff"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Cuddio Cyfanswm y Cyfrif"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Dangos Cyfanswm y Cyfrif"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Gweld y Data (CVS)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Estyn ffeil CVS o'r data"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Cuddio %s Digwyddiad"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Dangos %s Digwyddiad"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Cuddio Digwyddiadau Firefox"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Dangos Digwyddiadau Firefox"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Cau'r Graff"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Ehangu'r Graff"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Newid y graff"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Defnyddwyr Gweithredol Dyddiol"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Rhaglen"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Addasu"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Llwythi"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Systemau Gweithredu"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Statws Ychwanegyn"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Crynodeb"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Fersiwn yr Ychwanegyn"
 
@@ -4205,11 +6281,11 @@ msgstr "Anhysbys"
 msgid "statistics_longnames_version"
 msgstr "Fersiwn yr Ychwanegyn"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr "Nid oes digon o ddata i arddangos y graff. Galwa eto."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "Nid oes gennym ddata ar dy ychwanegyn eto. Galw eto ymhen ychwydig "
@@ -4222,12 +6298,12 @@ msgstr ""
 "diweddar fod yn anghyflawn wrth i'n sgriptiau weithio i ddiweddaru'r "
 "wybodaeth. Galwa eto ymhen ychydig funudau"
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr ""
 "Mae'r bwrdd Gwybodaeth Ystadegau wedi ei anablu. Galwa heibio eto rhywbryd."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "Mae angen Javascript ar gyfer gweld graffiau'r Bwrdd Gwybodaeth."
 
@@ -4242,36 +6318,36 @@ msgstr "Mae dy osodiadau wedi eu diweddaru"
 msgid "statistics_pagetitle"
 msgstr "Bwrdd Gwybodaeth Ystadegau"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Defnyddwyr Dyddiol Gweithredol"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Llwythi Dyddiol"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Chwyddo i Mewn"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Chwyddo i un mis"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Chwyddo Allan"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Chwyddo allan un mis"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Crynodeb dyddiol o ystadegau %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Llif RSS o grynodeb y data"
 
@@ -4311,23 +6387,23 @@ msgstr "Cyhoeddus"
 msgid "statistics_settings_access_public_description"
 msgstr "Gall unrhyw un weld ystadegau'r ychwanegyn"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Newid y Gosodiadau"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Cofia drin y wybodaeth fel un cyfrinachol."
 
-#: views/statistics/addon.thtml:233
+#: 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:229
+#: 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:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Wedi Cloi"
 
@@ -4344,7 +6420,7 @@ msgstr "Cadw'r Gosodiadau"
 msgid "statistics_settings_title"
 msgstr "Gosodiadau Bwrdd Gwybodaeth Ystadegau %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Ddim ar Glo"
 
@@ -4368,7 +6444,7 @@ msgstr "ah"
 msgid "statistics_shortnames_version"
 msgstr "Fer"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Cyfartaledd Llwythi Dyddiol"
 
@@ -4376,37 +6452,37 @@ msgstr "Cyfartaledd Llwythi Dyddiol"
 msgid "statistics_summary_downloads_heading"
 msgstr "Llwythi"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Cyfri'r Diwrnod Diwethaf"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Llwythi yn ystod y 7 diwrnod diwethaf"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Cyfanswm Llwythi"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Ers %1$s"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Dim data eto"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Cyfartaledd Defnyddwyr Dyddiol Gweithredol"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Newid o'r cyfrif blaenorol"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s ar %2$s"
@@ -4415,17 +6491,17 @@ msgstr "%1$s ar %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Defnyddwyr Dyddiol Gweithredol"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Defnyddwyr Dyddiol Gweithredol"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Ar %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Ystadegau %1$s"
@@ -4451,7 +6527,7 @@ msgstr "Newid cyfrinair"
 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
+#. %1 is the email address, %2 is the URL of the user registration page
 #: views/users/delete.thtml:49
 #, fuzzy
 msgid "user_del_account_deleted"
@@ -4475,7 +6551,7 @@ msgstr "Confirm Password"
 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:62
 #, fuzzy
 msgid "user_del_error_addons"
@@ -4485,7 +6561,7 @@ msgstr ""
 "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:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
@@ -4503,7 +6579,7 @@ msgstr ""
 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:83
 #, fuzzy
 msgid "user_del_error_unknown"
@@ -4516,7 +6592,7 @@ msgstr ""
 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:93
 #, fuzzy
 msgid "user_del_header_delete_account"
@@ -4546,7 +6622,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
@@ -4565,7 +6641,7 @@ msgstr "I understand that this step cannot be undone."
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 #, fuzzy
 msgid "user_edit_confirm_email_sent"
@@ -4579,9 +6655,9 @@ msgstr ""
 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
+#. 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"
@@ -4602,7 +6678,7 @@ msgstr ""
 "Diolch am ymuno gydag Ychwanegion %2$s\n"
 "-- Staff Ychwanegion %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, fuzzy, php-format
@@ -4626,8 +6702,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Diolch am ymuno gydag Ychwanegion %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
 #, php-format
 msgid "user_email_pwreset"
@@ -4655,7 +6731,7 @@ msgstr "Ailosod dy gyfrinair Ychwanegion %s"
 msgid "user_emailchange_error"
 msgstr "Error!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, fuzzy, php-format
 msgid "user_emailchange_subject"
@@ -4666,7 +6742,7 @@ msgstr "Please confirm your email address change at %1$s Add-ons"
 msgid "user_emailchange_success"
 msgstr "Success!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, fuzzy, php-format
 msgid "user_emailchange_successful_description"
@@ -4840,7 +6916,7 @@ msgstr "Anfon cyswllt ailosod y cyfrinair"
 msgid "user_register_amo_link"
 msgstr "%s Ychanegyn"
 
-# %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"
@@ -4848,7 +6924,7 @@ msgstr ""
 "Mae cyswllt ailosod dy gyfrinair wedi ei anfon at dy gyfeiriad e-bost %1$s. "
 "Rhaid i ti glicio arno cyn bod modd mewngofnodi i Ychwanegion %2$s."
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4866,7 +6942,7 @@ msgid "user_register_congratulations"
 msgstr ""
 "Llongyfarchiadau! Mae dy gyfrif defnyddiwr wedi ei greu yn llwyddiannus."
 
-# %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"
@@ -4875,7 +6951,7 @@ msgstr ""
 "bost heb ei farcio fel \"sbwriel\" neu \"sbam\". Os oes angen, mae modd "
 "cysylltu â %1$s ar yr e-bost uchod."
 
-# %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4939,7 +7015,7 @@ msgstr "Llys Enw"
 msgid "users_info_pagetitle"
 msgstr "Gwybodaeth Defnyddiwr %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
@@ -4949,8 +7025,8 @@ msgstr "Reviews by %s"
 msgid "users_login_pagetitle"
 msgstr "Mewngofnod Defnyddiwr"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4959,8 +7035,8 @@ msgstr ""
 "gyfrif yn Ychwanegion Mozilla, mewngofnoda, neu <a href=\"%1$s\"> dysga fwy "
 "am y blwch tywod.</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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4976,3 +7052,33 @@ msgstr "Ailosod Cyfrinair Defnyddiwr"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Cofrestru defnyddiwr Newydd"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Y fersiwn cydnaws diweddar yw"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "search_form_submit"
+#~ msgstr "Chwilio"
diff --git a/site/app/locale/da/LC_MESSAGES/da.txt b/site/app/locale/da/LC_MESSAGES/da.txt
index 00a50cc..667dcd3 100644
--- a/site/app/locale/da/LC_MESSAGES/da.txt
+++ b/site/app/locale/da/LC_MESSAGES/da.txt
@@ -1,21 +1,28 @@
+# 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: REMORA 0.1\n"
+"Project-Id-Version: addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-28 15:45-0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2009-01-16 11:45-0800\n"
+"PO-Revision-Date: 2009-02-26 15:08-0800\n"
 "Last-Translator: Jesper Kristensen <www.mozilladanmark.dk>\n"
 "Language-Team: Danish\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.1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 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 parenthesis are included in the string. :(
 #, php-format
 msgid "a_download"
 msgstr "Download nu %s"
@@ -32,13 +39,11 @@ msgstr "Offentlig"
 msgid "a_header_sandbox"
 msgstr "Sandkasse"
 
-#, php-format
-msgid "added"
-msgstr "Tilføjet %s"
-
+#. %s is a date in the _('date') format
 msgid "addon_detail_last_updated"
 msgstr "Opdateret %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
@@ -52,6 +57,7 @@ msgstr "downloads i alt"
 msgid "addon_downloads_weekly"
 msgstr "downloads pr. uge"
 
+#. %1 is the add-on count, %2 the category name
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
@@ -70,13 +76,16 @@ msgstr "eksperimentel"
 msgid "addon_listitem_flag_recommended"
 msgstr "anbefalet"
 
+#. %1 is the add-on name, %2 is the platform
 msgid "addon_not_available_for_platform"
 msgstr "%1$s er ikke tilgængelig til %2$s."
 
+#. %1 is the add-on name
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Tilbage til %1$s..."
 
+#. %1 is the add-on name
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Tilbage til anmeldelser..."
@@ -90,6 +99,7 @@ msgstr "Anmeldelse:"
 msgid "addon_review_add_submit"
 msgstr "Indsend din anmeldelse"
 
+#. %s is the name of the add-on
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Tilføj en anmeldelse af %s"
@@ -118,15 +128,18 @@ msgstr "Slet anmeldelse"
 msgid "addon_review_deleted_successfully"
 msgstr "Anmeldelsen blev slettet."
 
+#. %s is the name of the add-on
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Ret anmeldelse af %s"
 
+#. %1 is the count of characters entered as notes for the review flag reason.
 msgid "addon_review_flag_error_other_length"
 msgstr ""
 "Problem ved rapporteringen af anmeldelse: Bemærkninger til rapporterede anmeldelser skal være på "
 "mellem 10 og 100 tegn. Du har skrevet %1$s tegn."
 
+#. Removing an extra comma
 msgid "addon_review_in_moderation"
 msgstr ""
 "Bemærk: Din anmeldelse vil blive gennemgået af en redaktør, før den kan ses "
@@ -135,16 +148,19 @@ msgstr ""
 msgid "addon_review_in_reply_to"
 msgstr "Udviklersvar til:"
 
+#. %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] "Vis %1$s tidligere anmeldelse af denne tilføjelse indsendt af %2$s."
 msgstr[1] "Vis %1$s tidligere anmeldelser af denne tilføjelse indsendt af %2$s."
 
+#. %1 is the add-on name
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Anmeldelser af %s"
 
+#. %1 is the user, %2 is the (localized) date
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Svar fra %1$s den %2$s"
@@ -159,6 +175,7 @@ msgstr "Din anmeldelse er gemt. Tak!"
 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
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "af %1$s den %2$s (bedømmelse %3$s)"
@@ -172,8 +189,10 @@ msgstr "Forrige tilføjelse"
 msgid "addon_version_permalink"
 msgstr "Permanent link til denne version"
 
-msgid "addon_versions_getlatesttext"
-msgstr "Seneste version, som er kompatibel med"
+#. %1 is the current Application name (e.g. Firefox)
+#. %2 is the Application's version number
+msgid "addon_versions_getlatestversion"
+msgstr "Seneste version, som er kompatibel med %1$s %2$s"
 
 msgid "addons_author_addons_submit"
 msgstr "Vis"
@@ -181,10 +200,20 @@ msgstr "Vis"
 msgid "addons_author_tooltip"
 msgstr "Vis forfatterens profil"
 
+#. %1 is the name of the Application (eg. Firefox)
+msgid "addons_browse_all_themes_title"
+msgstr "Gennemse alle temaer :: %1$s Add-ons"
+
+#. %s is the name of the category
 #, 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)
+msgid "addons_browse_categories_header_theme"
+msgstr "Gennemse temaer i kategorien %1$s :: %2$s Add-ons"
+
 msgid "addons_display_add_review"
 msgstr "Tilføj en anmeldelse"
 
@@ -233,24 +262,35 @@ msgstr "Er vild med den"
 msgid "addons_display_more_images"
 msgstr "Flere billeder"
 
-#, php-format
+#. %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"
-msgstr "Andre tilføjelser fra %1$s"
+msgid_plural "addons_display_other_addons_by"
+msgstr[0] "Andre tilføjelser fra %1$s"
+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.
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
+#. %s is an email address
 #, 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
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
-"Support af denne tilføjelse tilbydes af udvikleren på %s eller ved at "
-"kontakte %s"
+"Support af denne tilføjelse tilbydes af udvikleren på %1$s eller ved at "
+"kontakte %2$s"
 
+#. %s is a URL
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Support af denne tilføjelse tilbydes af udvikleren på %s"
@@ -267,9 +307,11 @@ msgstr ""
 "til tilføjelsens udviklere, og de kan have behov for at kontakte dig for at "
 "løse problemet."
 
+#. %1 is the review guidelines link
 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 ""
@@ -283,6 +325,7 @@ msgstr "Gem"
 msgid "addons_display_see_all_addons"
 msgstr "Alle tilføjelser i kategorien %1$s"
 
+#. %1 is the number of reviews
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Vis alle anmeldelser (%1$s)"
@@ -323,6 +366,8 @@ msgstr "Nyeste:"
 msgid "addons_home_other_applications"
 msgstr "Andre programmer"
 
+#. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
+#. Sunbird
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s Add-ons"
@@ -388,6 +433,7 @@ msgstr "til Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "til Windows"
 
+#. %1$s is a URL
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -404,6 +450,7 @@ msgstr ""
 "specielle grafikformater eller afspille multimediefiler. Plugins er en "
 "anelse anderledes end udvidelser, som ændrer eller udvider eksisterende funktionalitet."
 
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Almindelige plugins til %1$s"
@@ -414,12 +461,14 @@ msgstr "Plugins"
 msgid "addons_plugins_support_documentation"
 msgstr "Hjælp og dokumentation: "
 
+#. %s is the name of the add-on
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
 "%s kræver, at du accepterer følgende slutbrugerlicensaftale, før "
 "installationen kan fortsætte:"
 
+#. %1 is the add-on name
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Skærmbilleder af %s"
@@ -438,6 +487,7 @@ msgstr "Anbefalede tilføjelser"
 msgid "addons_searchengines_additional_resources"
 msgstr "Yderligere kilder"
 
+#. link text devmo
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
@@ -452,20 +502,26 @@ msgstr ""
 "du har slået det fra. Slå JavaScript til før du forsøger at installere nogen "
 "af søgepluginsne herunder."
 
+#. %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."
 
+#. 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 "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"
 
+#. link text to mycroft.mozdev.org
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
@@ -477,6 +533,24 @@ msgstr ""
 "Særligt tak til Mycroftprojektet for deres arbejder med søgetjenester til "
 "Firefox."
 
+msgid "addons_share_button_text"
+msgstr "Del dette"
+
+msgid "addons_share_label_delicious"
+msgstr "Tilføj til Delicious"
+
+msgid "addons_share_label_digg"
+msgstr "Tilføj til Digg"
+
+msgid "addons_share_label_facebook"
+msgstr "Besked på Facebook"
+
+msgid "addons_share_label_friendfeed"
+msgstr "Del på FriendFeed"
+
+msgid "addons_share_label_myspace"
+msgstr "Besked på MySpace"
+
 msgid "addons_status_disabled"
 msgstr "Deaktiveret"
 
@@ -512,6 +586,7 @@ msgstr ""
 msgid "addons_versions_history"
 msgstr "Versionshistorik med beskrivelse af ændringer"
 
+#. %1$s is the add-on name
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Versionshistorik for %1$s"
@@ -522,6 +597,7 @@ msgstr "Tilføj gruppe"
 msgid "admin_group_delete_pagetitle"
 msgstr "Slet gruppe"
 
+#. %s is a number to identify the group
 #, php-format
 msgid "admin_group_deleted"
 msgstr "Gruppen med id %s er slettet"
@@ -616,14 +692,18 @@ msgstr "Ignorer versionskontrol"
 msgid "app_compat_older_firefox_only"
 msgstr "Denne tilføjelse er til ældre versioner af Firefox"
 
+#. %1$s and %2$s are URLs
 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
 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
 msgid "app_compat_unreleased_version"
 msgstr ""
 "Denne tilføjelse kræver <a href=\"%1$s\">Firefox %2$s</a>, som endnu ikke er udgivet"
@@ -632,38 +712,6 @@ msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Opdater Firefox</a> for at bruge denne tilføjelse"
 
-msgid "blog_breadcrumb"
-msgstr "Blog"
-
-msgid "blog_description"
-msgstr ""
-"Nyheder og information om tilføjelser og hjemmesiden addons.mozilla.org."
-
-msgid "blog_link_title"
-msgstr "Link"
-
-msgid "blog_no_posts_found"
-msgstr "Ingen beskeder fundet."
-
-#, php-format
-msgid "blog_posted_by"
-msgstr "Skrevet af %s, %s"
-
-msgid "blog_previous_entries"
-msgstr "Tidligere beskeder"
-
-msgid "blog_sidebar_other_blogs"
-msgstr "Andre blogs hos Mozilla"
-
-msgid "blog_subpage_title"
-msgstr "Blog"
-
-msgid "blog_subscribe_heading"
-msgstr "Abonner"
-
-msgid "blog_title"
-msgstr "Mozilla Add-ons blog"
-
 msgid "browse_addons_name"
 msgstr "Tilføjelser efter navn"
 
@@ -700,6 +748,7 @@ 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"
@@ -707,6 +756,119 @@ msgstr "Se alle tilføjelser i kategorien %1$s"
 msgid "collection_not_found"
 msgstr "Samlingen findes ikke!"
 
+#. %s is a date in the _('date') format
+#, php-format
+msgid "collections_interactive_addon_added"
+msgstr "Tilføjet %s"
+
+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
+msgid "compatibility_dashboard_intro"
+msgstr ""
+"Vær klar til udgivelsen af %1$s med værktøjerne og informationerne herunder."
+""
+
+msgid "compatibility_dashboard_loading"
+msgstr "Indlæser data..."
+
+msgid "compatibility_dashboard_main_link"
+msgstr "Tilbage til hovedsiden"
+
+msgid "compatibility_dashboard_report"
+msgstr "Kompatibilitetsrapport for tilføjelser"
+
+msgid "compatibility_developer_info"
+msgstr "Information til udviklere af tilføjelser"
+
+msgid "compatibility_developers_adjust_maxversion"
+msgstr "Juster maxVersion uden at uploade"
+
+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
+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."
+
+msgid "compatibility_developers_mdclogo_alt"
+msgstr "Logo for Mozilla Developer Center"
+
+msgid "compatibility_developers_no_addons"
+msgstr "Du har ingen tilføjelser, som hostes af Mozilla Add-ons."
+
+msgid "compatibility_developers_results"
+msgstr "Resultat af statustjek"
+
+msgid "compatibility_developers_retrieving"
+msgstr "Indlæser status for tilføjelser..."
+
+#. %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 brugere af %2$s (%3$s&#37; af alle)"
+
+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."
+
+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
+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."
+
+msgid "compatibility_report_legend_alpha"
+msgstr "Alfaversioner"
+
+#. %1$s is an application name and version.  Example: Firefox 3.1
+msgid "compatibility_report_legend_alpha_description"
+msgstr "Tilføjelser som er kompatible med en alfaversion af %1$s"
+
+msgid "compatibility_report_legend_beta"
+msgstr "Betaversioner"
+
+#. %1$s is an application name and version.  Example: Firefox 3.1
+msgid "compatibility_report_legend_beta_description"
+msgstr "Tilføjelser som er kompatible med en betaversion eller release candidate af %1$s"
+
+msgid "compatibility_report_legend_latest"
+msgstr "Seneste version"
+
+#. %1$s is an application name and version.  Example: Firefox 3.1
+msgid "compatibility_report_legend_latest_description"
+msgstr "Tilføjelser som er opdateret til de seneste udgaver af %1$s"
+
+msgid "compatibility_report_legend_other"
+msgstr "Andre versioner"
+
+#. %1$s is an application name and version.  Example: Firefox 3.1
+msgid "compatibility_report_legend_other_description"
+msgstr "Tilføjelser som ikke er kompatible med nogen versioner af %1$s"
+
+msgid "compatibility_report_title"
+msgstr "Kompatibilitetsrapport for tilføjelser"
+
+msgid "compatibility_user_info"
+msgstr "Information til brugere af tilføjelser"
+
+msgid "compatibility_view_report"
+msgstr "Vis kompatibilitetsrapport"
+
+#. %s is a URL
 #, php-format
 msgid "credits_contributing"
 msgstr "Se hvodan du selv kan bidrage på %s."
@@ -744,9 +906,16 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Navngivelse 2.5 "
 "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>."
+
+#. date format string as used in PHP's strftime():
+#. http://php.net/strftime
 msgid "date"
 msgstr "%e. %B %Y"
 
+#. date and time format string (strftime)
+#. http://php.net/strftime
 msgid "datetime"
 msgstr "%e. %B %Y, %H:%M"
 
@@ -762,9 +931,29 @@ 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 ""
@@ -847,6 +1036,179 @@ 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 ""
@@ -865,6 +1227,7 @@ msgstr ""
 "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."
@@ -872,6 +1235,7 @@ 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 ""
@@ -896,6 +1260,7 @@ 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."
@@ -903,6 +1268,7 @@ 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]"
@@ -925,6 +1291,66 @@ 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"
 
@@ -994,6 +1420,7 @@ 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"
@@ -1017,6 +1444,7 @@ msgstr ""
 "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"
@@ -1033,10 +1461,48 @@ msgstr ""
 "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"
 
@@ -1046,9 +1512,193 @@ 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"
 
@@ -1094,6 +1744,135 @@ 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"
 
@@ -1102,21 +1881,57 @@ 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"
@@ -1126,6 +1941,8 @@ 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)"
@@ -1148,6 +1965,7 @@ 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"
@@ -1160,21 +1978,34 @@ msgstr ""
 "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 (%s) is not allowed for the selected add-on type. Please "
-"use one of the following: %s"
+"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"
@@ -1194,12 +2025,15 @@ 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 (%s) is not allowed for an icon. Please use one of the "
-"following: %s"
+"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."
@@ -1213,17 +2047,23 @@ 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 "%s is not a valid version for %s"
+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 "%s is not a valid version for %s: minimum versions cannot contain *"
+msgstr ""
+"%1$s is not a valid version for %2$s: minimum versions cannot contain *"
 
 msgid "devcp_error_invalid_version"
 msgstr ""
@@ -1233,6 +2073,7 @@ msgstr ""
 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"
@@ -1240,6 +2081,7 @@ 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."
@@ -1268,11 +2110,13 @@ 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 (%s) is not allowed for a preview. Please use one of the "
-"following: %s"
+"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."
@@ -1452,9 +2296,51 @@ 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 ""
@@ -1484,22 +2370,48 @@ 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 ""
@@ -1512,6 +2424,9 @@ 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"
 
@@ -1530,6 +2445,42 @@ 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. "
@@ -1539,15 +2490,39 @@ msgstr ""
 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"
 
@@ -1560,6 +2535,13 @@ 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?"
 
@@ -1570,21 +2552,93 @@ 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."
@@ -1607,6 +2661,7 @@ 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."
@@ -1614,6 +2669,7 @@ 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."
@@ -1621,22 +2677,445 @@ 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"
 
@@ -1682,9 +3161,10 @@ 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 %s and %s"
+msgstr "View entries between %1$s and %2$s"
 
 msgid "editorcp_reviewlog_none_found"
 msgstr "No reviews found for this period."
@@ -1773,6 +3253,7 @@ 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."
 
@@ -1788,6 +3269,7 @@ 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"
@@ -1795,6 +3277,7 @@ 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"
@@ -1812,6 +3295,9 @@ msgstr ""
 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"
 
@@ -1824,6 +3310,12 @@ 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. "
@@ -1888,6 +3380,7 @@ 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"
@@ -1901,6 +3394,13 @@ 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"
 
@@ -1922,6 +3422,13 @@ 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:"
 
@@ -1937,12 +3444,22 @@ 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"
 
@@ -1961,6 +3478,11 @@ 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."
 
@@ -2030,14 +3552,17 @@ 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"
@@ -2060,6 +3585,9 @@ msgstr "Du kan ikke anmelde din egen tilføjelse."
 msgid "error_browse_no_addons"
 msgstr "Ingen tilføjelser i denne kategori!"
 
+msgid "error_collection_feed_notfound"
+msgstr "Tilføjelsesfeed ikke fundet."
+
 msgid "error_email_invalid"
 msgstr "Dette er ikke en gyldig e-mail-adresse."
 
@@ -2069,6 +3597,7 @@ msgstr "Dette felt skal udfyldes."
 msgid "error_file_notfound"
 msgstr "Fil ikke fundet!"
 
+#. %s is a filename
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Fejl: Filen %s eksisterer ikke."
@@ -2084,6 +3613,7 @@ msgstr ""
 "Denne URL har et ugyldigt format. Gyldige URLs ligner http://example.com/"
 "min_side."
 
+#. %s is a string representing what's missing.  Example:  file_id
 #, php-format
 msgid "error_missing_argument"
 msgstr "Manglende argument: %s"
@@ -2140,10 +3670,12 @@ msgstr "Forkert adgangskode!"
 msgid "feature_learnmore"
 msgstr "Lær mere"
 
+#. %1 is the add-on name
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Lær mere om %1$s"
 
+#. %1$s is a number
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
@@ -2153,6 +3685,51 @@ msgstr[1] "%1$s anmeldelser"
 msgid "feature_view_more_from_category"
 msgstr "Vis mere fra"
 
+#. 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 "Tilbage til tilføjelsen"
+
+#. 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 "Vis alle"
+
+#. 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 "Tilbage til anmeldelse"
+
+#. 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 :: Filbrowser :: %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 "Om"
+
+#. 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 "Alle rettigheder forbeholdes."
 
@@ -2184,6 +3761,56 @@ msgstr "Privatlivspolitik"
 msgid "forum_save"
 msgstr "Gem"
 
+msgid "general_addontype_dict"
+msgstr "Ordbog"
+
+#. Plural in this context means many of the add-on type
+msgid "general_addontype_dict_plural"
+msgstr "Ordbøger"
+
+msgid "general_addontype_extension"
+msgstr "Udvidelse"
+
+#. Plural in this context means many of the add-on type
+msgid "general_addontype_extension_plural"
+msgstr "Udvidelser"
+
+msgid "general_addontype_lpaddon"
+msgstr "Sprogpakke (tilføjelse)"
+
+#. Plural in this context means many of the add-on type
+msgid "general_addontype_lpaddon_plural"
+msgstr "Sprogpakker (tilføjelse)"
+
+msgid "general_addontype_lpapp"
+msgstr "Sprogpakke (program)"
+
+#. Plural in this context means many of the add-on type
+msgid "general_addontype_lpapp_plural"
+msgstr "Sprogpakker (program)"
+
+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 "Søgetjeneste"
+
+#. Plural in this context means many of the add-on type
+msgid "general_addontype_search_plural"
+msgstr "Søgetjenester"
+
+msgid "general_addontype_theme"
+msgstr "Tema"
+
+#. Plural in this context means many of the add-on type
+msgid "general_addontype_theme_plural"
+msgstr "Temaer"
+
+#. %1$s is the application name.  Example:  Firefox
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Tilbage til startsiden for %1$s Add-ons"
@@ -2195,7 +3822,7 @@ msgid "header_main_header"
 msgstr "Tilføjelser"
 
 msgid "header_main_seamonkey_header"
-msgstr "Seamonkey Add-ons"
+msgstr "SeaMonkey Add-ons"
 
 msgid "header_main_sunbird_header"
 msgstr "Sunbird Add-ons"
@@ -2218,23 +3845,30 @@ msgstr "Min konto"
 msgid "header_navlink_register"
 msgstr "Registrer"
 
+#. %s is the add-on name
 #, 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.
 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$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 "Tilføj til %s %s"
+msgstr "Tilføj til %1$s %2$s"
 
+#. %1 is the add-on name, %2 is the app name
 #, php-format
 msgid "install_button_title"
 msgstr "Tilføj %1$s til %2$s"
 
+#. %1$s is the add-on name
 #, php-format
 msgid "install_download"
 msgstr "Download %1$s"
@@ -2291,7 +3925,7 @@ msgid "main_prettyname_firefox"
 msgstr "Firefox"
 
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -2311,6 +3945,7 @@ msgstr "Temaer"
 msgid "other_apps_tooltip"
 msgstr "Find tilføjelser til andre programmer"
 
+#. In a user list: user 1, user 2, "others"
 msgid "other_users"
 msgstr "andre"
 
@@ -2320,8 +3955,8 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Tak til"
 
-msgid "page_title_experimental_addons"
-msgstr "Eksperimentelle tilføjelser"
+msgid "page_title_faq"
+msgstr "Ofte stillede spørgsmål"
 
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
@@ -2353,27 +3988,28 @@ msgstr ""
 "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_experimental_addons_backbutton"
-msgstr "Tilbage til forrige side"
-
 msgid "pages_policy_sandbox_link"
 msgstr "Sandbox Information Page"
 
 msgid "pagination_next_page"
 msgstr "næste"
 
+#. %1 is page number, %2 is total page count
 #, php-format
 msgid "pagination_page_number_title"
 msgstr "Dette er side %1$s af %2$s"
@@ -2392,11 +4028,15 @@ msgstr "Skriv ordene her:"
 msgid "recaptcha_enter_whatyouhear"
 msgstr "Indtast hvad du hører."
 
+#. %1 is the link switching refreshing the captcha
+#. %2 is the link switching to a text captcha
 msgid "recaptcha_hardtohear_text"
 msgstr ""
 "Hvis det er svære at høre, kan du <a href=\"%1$s\">lytte til noget "
 "andet</a> eller <a href=\"%2$s\">bruge tekst i stedet</a>."
 
+#. %1 is the link switching refreshing the captcha
+#. %2 is the link switching to an audio captcha
 msgid "recaptcha_hardtoread_text"
 msgstr ""
 "Hvis ordene er svære at læse, kan du <a href=\"%1$s\">prøve med andre ord</a> eller "
@@ -2437,6 +4077,7 @@ msgstr ""
 "Er denne anmeldelse upassende, unøjagtig eller spam? Klik her for at "
 "rapportere den til redaktørerne."
 
+#. %1 is the URL of the support section, %2 for the review guidelines
 msgid "review_guidelines_short"
 msgstr ""
 "<p>Bemærk disse råd:</p><ul><li>Skriv som hvis du fortalte en ven "
@@ -2452,6 +4093,7 @@ msgstr ""
 "personlig information.</li></ul><p>Læs vores <a href=\"%2$s\">retningslinjer "
 "for anmeldelser</a>, hvis du vil vide mere om brugeranmeldelser af tilføjelser.</p>"
 
+#. %1 is the add-on name
 #, php-format
 msgid "reviews_header"
 msgstr "Anmeldelser af %s"
@@ -2489,6 +4131,7 @@ msgstr "Alle søgemaskiner"
 msgid "search_landing_browse_search_engines"
 msgstr "Gennemse søgemaskiner"
 
+#. %s is a number
 #, php-format
 msgid "search_matching_addons_number"
 msgid_plural "search_matching_addons_number"
@@ -2504,6 +4147,7 @@ msgstr "Søg i tilføjelser"
 msgid "search_rss_description"
 msgstr "Feed med søgeresultater"
 
+#. %s is the terms the user is searching for (a string)
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Søgeresulteter for: %s"
@@ -2520,6 +4164,7 @@ msgstr "Editor Tools"
 msgid "sidebar_navlink_welcome"
 msgstr "Velkommen"
 
+#. %s is the user's name
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Velkommen %s"
@@ -2548,6 +4193,7 @@ msgstr "et tema"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Opdaterede tilføjelser"
 
+#. %1$s is a number
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
@@ -2555,6 +4201,7 @@ msgstr "%1$s KB"
 msgid "stars_not_yet_rated"
 msgstr "Ikke bedømt endnu"
 
+#. %1 is the number of stars this add-on has
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Bedømmelse: %s ud af 5 stjerner"
@@ -2568,19 +4215,27 @@ 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"
@@ -2612,12 +4267,27 @@ 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"
 
@@ -2892,6 +4562,7 @@ msgstr "Skift adgangskode"
 msgid "user_confirmationcode_resent"
 msgstr "Bekræftelseskoden er sendt igen!"
 
+#. %1 is the email address, %2 is the URL of the user registration page
 msgid "user_del_account_deleted"
 msgstr ""
 "Din konto, %1$s, er nu slettet. Hvis du ønsker at vende tilbage "
@@ -2907,6 +4578,7 @@ msgstr "Bekræft adgangskode"
 msgid "user_del_deletenow"
 msgstr "Slet min konto nu"
 
+#. %1 is the URL of the user's info page
 msgid "user_del_error_addons"
 msgstr ""
 "Du kan ikke slette din konto, hvis du står listet som en <a href=\"%1$s"
@@ -2914,6 +4586,7 @@ msgstr ""
 " person i din udviklergruppe til at slette dig fra listen over forfattere til "
 " dine tilføjelser. Derefter kan du slette din konto her."
 
+#. %1 is a link to the amo-editors mailing list
 msgid "user_del_error_addons_more_questions"
 msgstr "Har du yderligere spørgsmål, kan du kontakte %1$s for mere information."
 
@@ -2925,6 +4598,7 @@ msgstr ""
 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
 msgid "user_del_error_unknown"
 msgstr ""
 "En ukendt fejl opstod under sletningen af din konto. Kontakt venligst %1$s vedrørende dette "
@@ -2933,6 +4607,7 @@ msgstr ""
 msgid "user_del_header_confirm_deletion"
 msgstr "Bekræft sletning af konto"
 
+#. %1 is the user's email address
 msgid "user_del_header_delete_account"
 msgstr "Slet kontoen %1$s"
 
@@ -2952,6 +4627,7 @@ 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
 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, "
@@ -2964,6 +4640,7 @@ msgstr "Jeg forstår at dette trin ikke kan annulleres."
 msgid "user_deleted_nickname"
 msgstr "Slettet bruger"
 
+#. %1 is the new email address
 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 "
@@ -2973,6 +4650,9 @@ msgstr ""
 msgid "user_edit_delete_user"
 msgstr "Slet konto"
 
+#. 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 ""
@@ -2991,6 +4671,7 @@ msgstr ""
 "Tak fordi du tilmeldte dig %2$s Add-ons\n"
 "-- %2$s Add-ons"
 
+#. %1 is the confirmation url, %2 is the application name
 #, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
@@ -3011,6 +4692,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Tak fordi du tilmeldte dig %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 ""
@@ -3034,6 +4717,7 @@ msgstr "Nulstil din adgangskode til %s Add-ons"
 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"
@@ -3041,6 +4725,7 @@ msgstr "Bekræft ændring af e-mail-adresse hos %1$s Add-ons"
 msgid "user_emailchange_success"
 msgstr "Succes!"
 
+#. %1 is the new email address
 #, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
@@ -3164,12 +4849,14 @@ msgstr "Send link til ændring af adgangskode"
 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 ""
 "Et link til aktivering af din brugerkonto er sendt af sted via e-mail til "
 "din adresse, %1$s. Du skal klikke på linket i denne e-mail, før du kan logge ind på %2$s Add-ons."
 
+#. %1 is the user's email address
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -3183,6 +4870,7 @@ msgstr "sende bekræftelsesmeddelelsen igen"
 msgid "user_register_congratulations"
 msgstr "Tillykke! Din brugerkonto er nu oprettet."
 
+#. %1 is the link to the "resend confirmation code" page
 #, php-format
 msgid "user_register_resend_confirmation_link"
 msgstr ""
@@ -3190,6 +4878,7 @@ msgstr ""
 "maiservice ikke markerede den som \"spam\". Har du behov for det, kan vi %1"
 "$s til din e-mail-adresse, som står herover."
 
+#. %1 is the link to the Mozilla Add-ons front page
 #, php-format
 msgid "user_register_welcome"
 msgstr "Tak fordi du registrerede dig og velkommen til %1$s!"
@@ -3235,9 +4924,15 @@ msgstr "Kaldenavn"
 msgid "users_info_pagetitle"
 msgstr "Brugerinfo om %1$s"
 
+#. %1 is the user's name
+msgid "users_info_reviews_by_user"
+msgstr "Anmeldelser skrevet af %s"
+
 msgid "users_login_pagetitle"
 msgstr "Log ind"
 
+#. %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 ""
@@ -3245,6 +4940,8 @@ msgstr ""
 "allerede en konto hos Mozilla Add-ons, bedes du logge ind, eller du kan <a "
 "href=\"%1$s\">lære mere om sandkassen.</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 ""
diff --git a/site/app/locale/da/LC_MESSAGES/en-US.txt b/site/app/locale/da/LC_MESSAGES/en-US.txt
index 84eaa2a..036abd9 100644
--- a/site/app/locale/da/LC_MESSAGES/en-US.txt
+++ b/site/app/locale/da/LC_MESSAGES/en-US.txt
@@ -1,21 +1,28 @@
+# 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: REMORA 0.1\n"
+"Project-Id-Version: addons\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-28 15:45-0700\n"
-"PO-Revision-Date: 2008-09-22 13:20-0700\n"
-"Last-Translator: Wil Clouser <wclouser@mozilla.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
-"X-Generator: Pootle 1.1.0\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"
@@ -32,13 +39,11 @@ msgstr "Public"
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
-#, php-format
-msgid "added"
-msgstr "Added %s"
-
+#. %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"
@@ -52,6 +57,7 @@ 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"
@@ -70,13 +76,16 @@ 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..."
@@ -90,6 +99,7 @@ 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"
@@ -118,15 +128,18 @@ 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 "
@@ -135,16 +148,19 @@ msgstr ""
 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"
@@ -159,6 +175,7 @@ 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)"
@@ -172,8 +189,10 @@ msgstr "Previous Add-on"
 msgid "addon_version_permalink"
 msgstr "Permanent link to this version"
 
-msgid "addon_versions_getlatesttext"
-msgstr "The most recent version compatible with"
+#. %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"
@@ -181,10 +200,20 @@ 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"
 
@@ -233,24 +262,35 @@ msgstr "Love it"
 msgid "addons_display_more_images"
 msgstr "More Images"
 
-#, php-format
+#. %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"
-msgstr "Other add-ons by %1$s"
+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 %s or by sending an "
-"e-mail to %s"
+"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"
@@ -267,9 +307,11 @@ msgstr ""
 "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 ""
@@ -283,6 +325,7 @@ msgstr "Save"
 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)"
@@ -323,6 +366,8 @@ 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"
@@ -388,6 +433,7 @@ 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 ""
@@ -404,6 +450,7 @@ msgstr ""
 "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"
@@ -414,12 +461,14 @@ 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"
@@ -438,6 +487,7 @@ msgstr "Recommended Add-ons"
 msgid "addons_searchengines_additional_resources"
 msgstr "Additional Resources"
 
+#. link text devmo
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
@@ -452,20 +502,26 @@ msgstr ""
 "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"
 
@@ -477,6 +533,24 @@ 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"
 
@@ -512,6 +586,7 @@ msgstr ""
 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"
@@ -522,6 +597,7 @@ 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"
@@ -616,14 +692,18 @@ 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>"
@@ -632,38 +712,6 @@ msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Upgrade Firefox</a> to use this add-on"
 
-msgid "blog_breadcrumb"
-msgstr "Blog"
-
-msgid "blog_description"
-msgstr ""
-"News and information regarding add-ons and the addons.mozilla.org website."
-
-msgid "blog_link_title"
-msgstr "Link"
-
-msgid "blog_no_posts_found"
-msgstr "No posts could be found."
-
-#, php-format
-msgid "blog_posted_by"
-msgstr "Posted by %s on %s"
-
-msgid "blog_previous_entries"
-msgstr "Previous Entries"
-
-msgid "blog_sidebar_other_blogs"
-msgstr "Other Mozilla Blogs"
-
-msgid "blog_subpage_title"
-msgstr "Blog"
-
-msgid "blog_subscribe_heading"
-msgstr "Subscribe"
-
-msgid "blog_title"
-msgstr "Mozilla Add-ons Blog"
-
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
@@ -700,6 +748,7 @@ 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"
@@ -707,6 +756,119 @@ 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."
@@ -744,9 +906,16 @@ msgstr ""
 "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"
 
@@ -762,9 +931,29 @@ 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 ""
@@ -847,6 +1036,179 @@ 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 ""
@@ -865,6 +1227,7 @@ msgstr ""
 "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."
@@ -872,6 +1235,7 @@ 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 ""
@@ -896,6 +1260,7 @@ 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."
@@ -903,6 +1268,7 @@ 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]"
@@ -925,6 +1291,66 @@ 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"
 
@@ -994,6 +1420,7 @@ 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"
@@ -1017,6 +1444,7 @@ msgstr ""
 "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"
@@ -1033,10 +1461,48 @@ msgstr ""
 "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"
 
@@ -1046,9 +1512,193 @@ 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"
 
@@ -1094,6 +1744,135 @@ 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"
 
@@ -1102,21 +1881,57 @@ 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"
@@ -1126,6 +1941,8 @@ 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)"
@@ -1148,6 +1965,7 @@ 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"
@@ -1160,21 +1978,34 @@ msgstr ""
 "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 (%s) is not allowed for the selected add-on type. Please "
-"use one of the following: %s"
+"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"
@@ -1194,12 +2025,15 @@ 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 (%s) is not allowed for an icon. Please use one of the "
-"following: %s"
+"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."
@@ -1213,17 +2047,23 @@ 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 "%s is not a valid version for %s"
+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 "%s is not a valid version for %s: minimum versions cannot contain *"
+msgstr ""
+"%1$s is not a valid version for %2$s: minimum versions cannot contain *"
 
 msgid "devcp_error_invalid_version"
 msgstr ""
@@ -1233,6 +2073,7 @@ msgstr ""
 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"
@@ -1240,6 +2081,7 @@ 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."
@@ -1268,11 +2110,13 @@ 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 (%s) is not allowed for a preview. Please use one of the "
-"following: %s"
+"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."
@@ -1452,9 +2296,51 @@ 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 ""
@@ -1484,22 +2370,48 @@ 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 ""
@@ -1512,6 +2424,9 @@ 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"
 
@@ -1530,6 +2445,42 @@ 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. "
@@ -1539,15 +2490,39 @@ msgstr ""
 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"
 
@@ -1560,6 +2535,13 @@ 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?"
 
@@ -1570,21 +2552,93 @@ 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."
@@ -1607,6 +2661,7 @@ 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."
@@ -1614,6 +2669,7 @@ 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."
@@ -1621,22 +2677,445 @@ 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"
 
@@ -1682,9 +3161,10 @@ 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 %s and %s"
+msgstr "View entries between %1$s and %2$s"
 
 msgid "editorcp_reviewlog_none_found"
 msgstr "No reviews found for this period."
@@ -1773,6 +3253,7 @@ 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."
 
@@ -1788,6 +3269,7 @@ 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"
@@ -1795,6 +3277,7 @@ 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"
@@ -1812,6 +3295,9 @@ msgstr ""
 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"
 
@@ -1824,6 +3310,12 @@ 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. "
@@ -1888,6 +3380,7 @@ 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"
@@ -1901,6 +3394,13 @@ 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"
 
@@ -1922,6 +3422,13 @@ 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:"
 
@@ -1937,12 +3444,22 @@ 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"
 
@@ -1961,6 +3478,11 @@ 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."
 
@@ -2030,14 +3552,17 @@ 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"
@@ -2060,6 +3585,9 @@ 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."
 
@@ -2069,6 +3597,7 @@ 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."
@@ -2084,6 +3613,7 @@ 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"
@@ -2140,10 +3670,12 @@ 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"
@@ -2153,6 +3685,51 @@ 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."
 
@@ -2184,6 +3761,56 @@ 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"
@@ -2195,7 +3822,7 @@ msgid "header_main_header"
 msgstr "Add-ons"
 
 msgid "header_main_seamonkey_header"
-msgstr "Seamonkey Add-ons"
+msgstr "SeaMonkey Add-ons"
 
 msgid "header_main_sunbird_header"
 msgstr "Sunbird Add-ons"
@@ -2218,23 +3845,30 @@ 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 %s %s"
+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"
@@ -2291,7 +3925,7 @@ msgid "main_prettyname_firefox"
 msgstr "Firefox"
 
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -2311,6 +3945,7 @@ 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"
 
@@ -2320,8 +3955,8 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Credits"
 
-msgid "page_title_experimental_addons"
-msgstr "Experimental Add-ons"
+msgid "page_title_faq"
+msgstr "Frequently Asked Questions"
 
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
@@ -2353,27 +3988,28 @@ msgstr ""
 "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_experimental_addons_backbutton"
-msgstr "Back to the previous page"
-
 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"
@@ -2392,11 +4028,15 @@ 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 "
@@ -2437,6 +4077,7 @@ 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 "
@@ -2452,6 +4093,7 @@ msgstr ""
 "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"
@@ -2489,6 +4131,7 @@ 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"
@@ -2504,6 +4147,7 @@ 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"
@@ -2520,6 +4164,7 @@ 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"
@@ -2548,6 +4193,7 @@ 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"
@@ -2555,6 +4201,7 @@ 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"
@@ -2568,19 +4215,27 @@ 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"
@@ -2612,12 +4267,27 @@ 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"
 
@@ -2892,6 +4562,7 @@ 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 "
@@ -2907,6 +4578,7 @@ 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"
@@ -2914,6 +4586,7 @@ msgstr ""
 "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."
 
@@ -2925,6 +4598,7 @@ msgstr ""
 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 "
@@ -2933,6 +4607,7 @@ msgstr ""
 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"
 
@@ -2952,6 +4627,7 @@ 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 "
@@ -2964,6 +4640,7 @@ 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 "
@@ -2973,6 +4650,9 @@ msgstr ""
 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 ""
@@ -2991,6 +4671,7 @@ msgstr ""
 "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 ""
@@ -3011,6 +4692,8 @@ msgstr ""
 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 ""
@@ -3034,6 +4717,7 @@ 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"
@@ -3041,6 +4725,7 @@ 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 ""
@@ -3164,12 +4849,14 @@ msgstr "Send password reset link"
 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 ""
@@ -3183,6 +4870,7 @@ 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 ""
@@ -3190,6 +4878,7 @@ msgstr ""
 "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!"
@@ -3235,9 +4924,15 @@ msgstr "Nickname"
 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 ""
@@ -3245,6 +4940,8 @@ msgstr ""
 "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 ""
@@ -3257,3 +4954,9 @@ 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 1adeaaf..04adcd9 100644
--- a/site/app/locale/da/LC_MESSAGES/messages.po
+++ b/site/app/locale/da/LC_MESSAGES/messages.po
@@ -1,596 +1,439 @@
+# 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: REMORA 0.1\n"
+"Project-Id-Version: addons\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2009-02-26 15:08-0800\n"
 "Last-Translator: Jesper Kristensen <www.mozilladanmark.dk>\n"
 "Language-Team: Danish\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.1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Annuller installation"
 
-#: 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
+#. 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 nu %s"
 
-#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Accepter og download"
 
-#: 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
 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
 msgid "a_header_sandbox"
 msgstr "Sandkasse"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Tilføjet %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %s is a date in the _('date') format
 msgid "addon_detail_last_updated"
 msgstr "Opdateret %s"
 
-#: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
+#. %s is the version of the add-on.  Example:  3.2a1
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "downloads"
 
-#: views/addons/display.thtml:119
 msgid "addon_downloads_total"
 msgstr "downloads i alt"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
-#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "downloads pr. uge"
 
-#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
+#. %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 tilføjelse"
 msgstr[1] "%1$s tilføjelser"
 
-#: views/elements/pagination.thtml:67
-#: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "pr. side"
 
-#: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Sorter efter:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "anbefalet"
 
-#: views/pages/js_constants.js.thtml:57
+#. %1 is the add-on name, %2 is the platform
 msgid "addon_not_available_for_platform"
 msgstr "%1$s er ikke tilgængelig til %2$s."
 
-#: 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
+#. %1 is the add-on name
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Tilbage til %1$s..."
 
-#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
-#: views/reviews/review_added.thtml:52
+#. %1 is the add-on name
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Tilbage til anmeldelser..."
 
-#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Bedømmelse:"
 
-#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Anmeldelse:"
 
-#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Indsend din anmeldelse"
 
-#: views/reviews/add.thtml:46
+#. %s is the name of the add-on
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Tilføj en anmeldelse af %s"
 
-#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Titel/resumé:"
 
-#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Slet"
 
-#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Svar"
 
-#: 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:56
 msgid "addon_review_confirm_no"
 msgstr "Nej"
 
-#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Ja"
 
-#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Slet anmeldelse"
 
-#: controllers/reviews_controller.php:444
 msgid "addon_review_deleted_successfully"
 msgstr "Anmeldelsen blev slettet."
 
-#: views/reviews/add.thtml:46
+#. %s is the name of the add-on
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Ret anmeldelse af %s"
 
-#: controllers/reviews_controller.php:534
+#. %1 is the count of characters entered as notes for the review flag reason.
 msgid "addon_review_flag_error_other_length"
 msgstr ""
-"Problem ved rapporteringen af anmeldelse: Bemærkninger til rapporterede "
-"anmeldelser skal være på mellem 10 og 100 tegn. Du har skrevet %1$s tegn."
+"Problem ved rapporteringen af anmeldelse: Bemærkninger til rapporterede anmeldelser skal være på "
+"mellem 10 og 100 tegn. Du har skrevet %1$s tegn."
 
-#: views/reviews/review_added.thtml:49
+#. Removing an extra comma
 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:71
 msgid "addon_review_in_reply_to"
 msgstr "Udviklersvar til:"
 
-#: views/reviews/display.thtml:135
+#. %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] "Vis %1$s tidligere anmeldelse af denne tilføjelse indsendt af %2$s."
-msgstr[1] ""
-"Vis %1$s tidligere anmeldelser af denne tilføjelse indsendt af %2$s."
+msgstr[1] "Vis %1$s tidligere anmeldelser af denne tilføjelse indsendt af %2$s."
 
-#: controllers/reviews_controller.php:201
-#: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#. %1 is the add-on name
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Anmeldelser af %s"
 
-#: views/reviews/display.thtml:164
+#. %1 is the user, %2 is the (localized) date
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Svar fra %1$s den %2$s"
 
-#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Svar fra udvikleren:"
 
-#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Din anmeldelse er gemt. Tak!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
-#: 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"
 
-#: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
+#. %1 is the user, %2 is the (localized) date, %3 is the rating
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "af %1$s den %2$s (bedømmelse %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 "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"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "Seneste version, som er kompatibel med"
+#. %1 is the current Application name (e.g. Firefox)
+#. %2 is the Application's version number
+msgid "addon_versions_getlatestversion"
+msgstr "Seneste version, som er kompatibel med %1$s %2$s"
 
-#: views/addons/display.thtml:431
 msgid "addons_author_addons_submit"
 msgstr "Vis"
 
-#: 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:951
-#, fuzzy
+#. %1 is the name of the Application (eg. Firefox)
 msgid "addons_browse_all_themes_title"
-msgstr "Browse all Themes :: %1$s Add-ons"
+msgstr "Gennemse alle temaer :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
 #, 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:384
-#, fuzzy
+#. %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"
+msgstr "Gennemse temaer i kategorien %1$s :: %2$s Add-ons"
 
-#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Tilføj en anmeldelse"
 
-#: views/addons/display.thtml:312
 msgid "addons_display_advanced_details"
 msgstr "Avancerede detaljer"
 
-#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Kategorier"
 
-#: views/addons/display.thtml:383
 msgid "addons_display_detailed_review"
 msgstr "detaljeret anmeldelse"
 
-#: views/addons/display.thtml:368 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:225
 msgid "addons_display_edit_review"
 msgstr "Rediger din anmeldelse"
 
-#: views/addons/display.thtml:143
 msgid "addons_display_has_privacy"
 msgstr "Denne tilføjelse har en privatlivspolitik."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
-#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Hader den"
 
-#: views/addons/display.thtml:315
 msgid "addons_display_header_developer_comments"
 msgstr "Kommentarer fra udvikleren"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
 msgid "addons_display_header_homepage"
 msgstr "Hjemmeside"
 
-#: views/addons/display.thtml:264
 msgid "addons_display_header_reviews"
 msgstr "Anmeldelser"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
 msgid "addons_display_header_support"
 msgstr "Support"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
-#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Synes om den"
 
-#: views/addons/display.thtml:186
 msgid "addons_display_long_description"
 msgstr "Lang beskrivelse"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
-#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Er vild med den"
 
-#: views/addons/display.thtml:156
 msgid "addons_display_more_images"
 msgstr "Flere billeder"
 
-# %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:421
-#, fuzzy
+#. %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] "Andre tilføjelser fra %1$s"
-msgstr[1] "Other add-ons by these authors"
+msgstr[1] "Andre tilføjelser fra samme forfattere"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Support af denne tilføjelse tilbydes af udvikleren ved at kontakte %s"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
-"Support af denne tilføjelse tilbydes af udvikleren på %s eller ved at "
-"kontakte %s"
+"Support af denne tilføjelse tilbydes af udvikleren på %1$s eller ved at "
+"kontakte %2$s"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Support af denne tilføjelse tilbydes af udvikleren på %s"
 
-#: views/addons/display.thtml:365
 msgid "addons_display_rate_it"
 msgstr "Bedømmelse"
 
-#: views/addons/display.thtml:370 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:387 views/addons/display.thtml:390
 msgid "addons_display_review_etiquette"
 msgstr ""
-"Lad venligst være med at sende fejlrapporter som anmeldelser. Vi videregiver "
-"ikke din e-mail-adresse til tilføjelsens udviklere, og de kan have behov for "
-"at kontakte dig for at løse problemet."
+"Lad venligst være med at sende fejlrapporter som anmeldelser. Vi videregiver ikke din e-mail-adresse "
+"til tilføjelsens udviklere, og de kan have behov for at kontakte dig for at "
+"løse problemet."
 
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Retningslinjer for anmeldelser</a>"
 
-#: views/addons/display.thtml:396 views/addons/display.thtml:400
+#. %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å "
 "hjælp til denne udvidelse."
 
-#: views/addons/display.thtml:379
 msgid "addons_display_review_submit"
 msgstr "Gem"
 
-#: views/addons/display.thtml:415
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Alle tilføjelser i kategorien %1$s"
 
-#: views/addons/display.thtml:302
+#. %1 is the number of reviews
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Vis alle anmeldelser (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
 msgid "addons_display_see_all_versions"
 msgstr "Vis alle versioner"
 
-#: views/addons/display.thtml:196
 msgid "addons_display_version_history"
 msgstr "Fuldstændig versionshistorik"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Vis kildekoden"
 
-#: views/addons/display.thtml:338
 msgid "addons_display_view_stats"
 msgstr "Vis statistik"
 
-#: views/addons/display.thtml:358
 msgid "addons_display_what_do_you_think"
 msgstr "Hvad synes du?"
 
-#: views/elements/app_compatibility.thtml:49
 msgid "addons_display_workswith"
 msgstr "Virker med:"
 
-#: views/elements/fyf_promotion.thtml:51
-#: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
-#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "af"
 
-#: 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:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
 #, 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."
 
-#: views/addons/home.thtml:201
 msgid "addons_home_newest_header"
 msgstr "Nyeste:"
 
-#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Andre programmer"
 
-#: controllers/developers_controller.php:64
-#: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:610
-#: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
-#: 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
+#. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
+#. Sunbird
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s Add-ons"
 
-#: 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:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Vis alle populære tilføjelser"
 
-#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Vis alle anbefalede tilføjelser"
 
-#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Vis alle nyligt opdaterede tilføjelser"
 
-#: 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 "
+"<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/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Hvordan du installerer i Sunbird"
 
-#: 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 "
-"Thunderbird, og åbn Tilføjelser fra menuen Funktioner.</li><li>Klik på "
-"knappen Installer, find/marker filen, som du downloadede, og klik \"OK\".</"
-"li></ol>"
+"<ol><li>Klik på linket herunder for at gemme filen."
+"</li><li>Ã…bn Mozilla "
+"Thunderbird, 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/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Hvordan du installerer i Thunderbird"
 
-#: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "Vis eksperimentelle tilføjelser"
 
-#: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Opdater"
 
-#: 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:111
 msgid "addons_plugins_for_linux"
 msgstr "til Linux"
 
-#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "til Mac OS X"
 
-#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "til Windows"
 
-#: views/addons/plugins.thtml:154
+#. %1$s is a URL
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -598,571 +441,464 @@ msgstr ""
 "Besøg %1$s for at få mere at vide om andre plugins til Mozillabaserede "
 "browsere."
 
-#: 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:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Plugins hjælper din browser med specifikke funktioner, som fx at vise "
 "specielle grafikformater eller afspille multimediefiler. Plugins er en "
-"anelse anderledes end udvidelser, som ændrer eller udvider eksisterende "
-"funktionalitet."
+"anelse anderledes end udvidelser, som ændrer eller udvider eksisterende funktionalitet."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Almindelige plugins til %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
-#: 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: "
 
-#: views/addons/policy.thtml:68
+#. %s is the name of the add-on
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
 "%s kræver, at du accepterer følgende slutbrugerlicensaftale, før "
 "installationen kan fortsætte:"
 
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Skærmbilleder af %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
 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:1010
-#: controllers/addons_controller.php:1017
 msgid "addons_recommended_pagetitle"
 msgstr "Anbefalede tilføjelser"
 
-#: controllers/addons_controller.php:1013
 msgid "addons_recommended_title"
 msgstr "Anbefalede tilføjelser"
 
-#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Yderligere kilder"
 
-#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
+#. link text devmo
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: 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 "
 "at installere et søgeplugin."
 
-#: views/addons/searchengines.thtml:49
 msgid "addons_searchengines_error_nojavascript"
 msgstr ""
 "Der kræves JavaScript for at installere søgeplugins, men det ser ud til, at "
 "du har slået det fra. Slå JavaScript til før du forsøger at installere nogen "
 "af søgepluginsne herunder."
 
-#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#. %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."
 
-#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
+#. link path to search plugins instructions, relative to devmo
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
-#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
+#. link text for "make your own" (opensearch engine)
 msgid "addons_searchengines_makeyourown_link"
 msgstr "laver din egen"
 
-#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#. %1 is the link to mycroft.mozdev.org
 #, php-format
 msgid "addons_searchengines_more"
 msgstr "Find flere søgetjenester hos %1$s"
 
-#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
+#. link text to mycroft.mozdev.org
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
 msgid "addons_searchengines_pagetitle"
 msgstr "Søgemasikner"
 
-#: 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."
 
-#: controllers/components/amo.php:201 controllers/components/amo.php:229
+msgid "addons_share_button_text"
+msgstr "Del dette"
+
+msgid "addons_share_label_delicious"
+msgstr "Tilføj til Delicious"
+
+msgid "addons_share_label_digg"
+msgstr "Tilføj til Digg"
+
+msgid "addons_share_label_facebook"
+msgstr "Besked på Facebook"
+
+msgid "addons_share_label_friendfeed"
+msgstr "Del på FriendFeed"
+
+msgid "addons_share_label_myspace"
+msgstr "Besked på MySpace"
+
 msgid "addons_status_disabled"
 msgstr "Deaktiveret"
 
-#: controllers/components/amo.php:191
 msgid "addons_status_incomplete"
 msgstr "Inkompatibel version"
 
-#: controllers/components/amo.php:197 controllers/components/amo.php:227
 msgid "addons_status_nominated"
 msgstr "I sandkassen; Nomineret til at blive offentliggjort"
 
-#: controllers/components/amo.php:195 controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "I sandkassen; Venter på anmeldelser"
 
-#: controllers/components/amo.php:199 controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Offentliggjort"
 
-#: controllers/components/amo.php:193 controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "I sandkassen"
 
-#: controllers/components/amo.php:203
 msgid "addons_status_unknown"
 msgstr "Ukendt"
 
-#: 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/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Pas på med gamle versioner"
 
-#: 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."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
 msgid "addons_versions_history"
 msgstr "Versionshistorik med beskrivelse af ændringer"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Versionshistorik for %1$s"
 
-#: controllers/groups_controller.php:71
 msgid "admin_group_add_pagetitle"
 msgstr "Tilføj gruppe"
 
-#: controllers/groups_controller.php:111
 msgid "admin_group_delete_pagetitle"
 msgstr "Slet gruppe"
 
-#: controllers/groups_controller.php:117
+#. %s is a number to identify the group
 #, php-format
 msgid "admin_group_deleted"
 msgstr "Gruppen med id %s er slettet"
 
-#: controllers/groups_controller.php:89
 msgid "admin_group_edit_pagetitle"
 msgstr "Ret gruppe"
 
-#: controllers/groups_controller.php:92 controllers/groups_controller.php:113
 msgid "admin_group_error_invalid_id"
 msgstr "Ugyldigt id til gruppe"
 
-#: controllers/groups_controller.php:65
 msgid "admin_group_pagetitle"
 msgstr "Gruppeadministration"
 
-#: controllers/groups_controller.php:77 controllers/groups_controller.php:99
 msgid "admin_group_saved"
 msgstr "Gruppen er gemt"
 
-#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Avanceret"
 
-#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "NÃ¥r som helst"
 
-#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Enhver"
 
-#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Enhver"
 
-#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Program"
 
-#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Relevans for søgningen"
 
-#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Sidst opdateret"
 
-#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Navn"
 
-#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Nyeste"
 
-#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "under 3 måneder siden"
 
-#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "under 6 måneder siden"
 
-#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "under et døgn siden"
 
-#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "under en måned siden"
 
-#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "under en uge siden"
 
-#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "under et år siden"
 
-#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Pr. side"
 
-#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Platform"
 
-#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Popularitet"
 
-#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Bedømmelse"
 
-#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Sorter efter"
 
-#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "til"
 
-#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Skift mellem avanceret og simpel søgning"
 
-#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Type"
 
-#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "version"
 
-#: views/pages/js_constants.js.thtml:68
 msgid "app_compat_ignore_check"
 msgstr "Ignorer versionskontrol"
 
-#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Denne tilføjelse er til ældre versioner af Firefox"
 
-#: views/pages/js_constants.js.thtml:65
+#. %1$s and %2$s are URLs
 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>"
+"Du kan <a href=\"%1$s\">prøve en ældre version</a> eller <a href=\"#\" onclick="
+"\"%2$s\">ignorere denne test</a>"
 
-#: views/pages/js_constants.js.thtml:62
+#. %1$s is a URL
 msgid "app_compat_try_old_version"
 msgstr "En <a href=\"%1$s\">ældre version</a> vil måske virke"
 
-#: views/pages/js_constants.js.thtml:64
+#. %1$s is a URL
+#. %2$s is a version number.  Example: 3.1
 msgid "app_compat_unreleased_version"
 msgstr ""
-"Denne tilføjelse kræver <a href=\"%1$s\">Firefox %2$s</a>, som endnu ikke er "
-"udgivet"
+"Denne tilføjelse kræver <a href=\"%1$s\">Firefox %2$s</a>, som endnu ikke er udgivet"
 
-#: 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"
+"<a href=\"http://getfirefox.com\">Opdater Firefox</a> for at bruge denne tilføjelse"
 
-#: controllers/addons_controller.php:667
 msgid "browse_addons_name"
 msgstr "Tilføjelser efter navn"
 
-#: controllers/addons_controller.php:665
 msgid "browse_addons_newest"
 msgstr "Nyeste tilføjelser"
 
-#: controllers/addons_controller.php:663
 msgid "browse_addons_popular"
 msgstr "Populære tilføjelser"
 
-#: controllers/addons_controller.php:666
 msgid "browse_addons_rated"
 msgstr "Tilføjelser efter bedømmelse"
 
-#: controllers/addons_controller.php:664
 msgid "browse_addons_updated"
 msgstr "Nyligt opdaterede tilføjelser"
 
-#: views/elements/categories.thtml:73 views/elements/categories.thtml:82
 msgid "categories_current_title"
 msgstr "Nuværende kategori"
 
-#: views/elements/categories.thtml:50
 msgid "categories_header"
 msgstr "Kategorier"
 
-#: views/elements/categories.thtml:50
 msgid "categories_header_title"
 msgstr "Vælg en kategori"
 
-#: views/addons/category_landing.thtml:68
 msgid "category_extra_allrecommended"
 msgstr "Se alle anbefalede tilføjelser"
 
-#: views/addons/category_landing.thtml:59
 msgid "category_extra_highestrated"
 msgstr "Bedst bedømte først"
 
-#: views/addons/category_landing.thtml:60
 msgid "category_extra_lastupdated"
 msgstr "Sidst opdaterede først"
 
-#: views/addons/category_landing.thtml:58
 msgid "category_extra_mostpopular"
 msgstr "Mest populære først"
 
-#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#. %1$s is the category name
 #, php-format
 msgid "category_extra_see_all"
 msgstr "Se alle tilføjelser i kategorien %1$s"
 
-#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Samlingen findes ikke!"
 
-#: views/compatibility/dashboard.thtml:45
-#: controllers/compatibility_controller.php:72
-#, fuzzy
+#. %s is a date in the _('date') format
+#, php-format
+msgid "collections_interactive_addon_added"
+msgstr "Tilføjet %s"
+
 msgid "compatibility_dashboard_center_header"
-msgstr "Add-on Compatibility Center"
+msgstr "Kompatibilitetscenter for tilføjelser"
 
-#: views/compatibility/dashboard.thtml:46
-#, fuzzy
+#. %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."
+"Vær klar til udgivelsen af %1$s med værktøjerne og informationerne herunder."
+""
 
-#: views/compatibility/dashboard.thtml:107
-#, fuzzy
 msgid "compatibility_dashboard_loading"
-msgstr "Loading data..."
+msgstr "Indlæser data..."
 
-#: views/compatibility/dashboard.thtml:41
-#, fuzzy
 msgid "compatibility_dashboard_main_link"
-msgstr "Back to Main"
+msgstr "Tilbage til hovedsiden"
 
-#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
-#, fuzzy
 msgid "compatibility_dashboard_report"
-msgstr "Add-on Compatibility Report"
+msgstr "Kompatibilitetsrapport for tilføjelser"
 
-#: 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"
+msgstr "Information til udviklere af tilføjelser"
 
-#: views/compatibility/developers.thtml:64
-#, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
-msgstr "Adjust maxVersion without uploading"
+msgstr "Juster maxVersion uden at uploade"
 
-#: views/compatibility/dashboard.thtml:128
-#, fuzzy
 msgid "compatibility_developers_check_status"
-msgstr "Check Status of My Add-ons"
+msgstr "Kontroller status for mine tilføjelser"
 
-#: views/compatibility/dashboard.thtml:130
-#, fuzzy
+#. %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."
+"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:118
-#, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
-msgstr "Mozilla Developer Center Logo"
+msgstr "Logo for Mozilla Developer Center"
 
-#: views/compatibility/developers.thtml:71
-#, fuzzy
 msgid "compatibility_developers_no_addons"
-msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
+msgstr "Du har ingen tilføjelser, som hostes af Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:137
-#: views/compatibility/developers.thtml:53
-#, fuzzy
 msgid "compatibility_developers_results"
-msgstr "Add-on Status Check Results"
+msgstr "Resultat af statustjek"
 
-#: views/compatibility/dashboard.thtml:141
-#, fuzzy
 msgid "compatibility_developers_retrieving"
-msgstr "Retrieving status of hosted add-ons..."
+msgstr "Indlæser status for tilføjelser..."
 
-#: views/compatibility/developers.thtml:63
-#, fuzzy
+#. %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)"
+msgstr "%1$s brugere af %2$s (%3$s&#37; af alle)"
 
-#: 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."
+"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:98
-#, fuzzy
 msgid "compatibility_report_detailed_link"
-msgstr "View Detailed Report"
+msgstr "Vis detaljeret rapport"
 
-#: views/compatibility/dashboard.thtml:69
-#, fuzzy
+#. %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."
+"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:85
-#, fuzzy
 msgid "compatibility_report_legend_alpha"
-msgstr "Alpha Versions"
+msgstr "Alfaversioner"
 
-#: views/compatibility/dashboard.thtml:85
-#, fuzzy
+#. %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"
+msgstr "Tilføjelser som er kompatible med en alfaversion af %1$s"
 
-#: views/compatibility/dashboard.thtml:89
-#, fuzzy
 msgid "compatibility_report_legend_beta"
-msgstr "Beta Versions"
+msgstr "Betaversioner"
 
-#: views/compatibility/dashboard.thtml:89
-#, fuzzy
+#. %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"
+msgstr "Tilføjelser som er kompatible med en betaversion eller release candidate af %1$s"
 
-#: views/compatibility/dashboard.thtml:93
-#, fuzzy
 msgid "compatibility_report_legend_latest"
-msgstr "Latest Version"
+msgstr "Seneste version"
 
-#: views/compatibility/dashboard.thtml:93
-#, fuzzy
+#. %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"
+msgstr "Tilføjelser som er opdateret til de seneste udgaver af %1$s"
 
-#: views/compatibility/dashboard.thtml:81
-#, fuzzy
 msgid "compatibility_report_legend_other"
-msgstr "Other Versions"
+msgstr "Andre versioner"
 
-#: views/compatibility/dashboard.thtml:81
-#, fuzzy
+#. %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"
+msgstr "Tilføjelser som ikke er kompatible med nogen versioner af %1$s"
 
-#: views/compatibility/dashboard.thtml:66
-#, fuzzy
 msgid "compatibility_report_title"
-msgstr "Add-on Compatibility Report"
+msgstr "Kompatibilitetsrapport for tilføjelser"
 
-#: 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"
+msgstr "Information til brugere af tilføjelser"
 
-#: views/compatibility/dashboard.thtml:48
-#, fuzzy
 msgid "compatibility_view_report"
-msgstr "View Compatibility Report"
+msgstr "Vis kompatibilitetsrapport"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
 #, php-format
 msgid "credits_contributing"
 msgstr "Se hvodan du selv kan bidrage på %s."
 
-#: views/pages/credits.thtml:139
 msgid "credits_contributing_wikipage"
 msgstr "vores wikiside"
 
-#: 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:"
+"Mozilla vil gerne takke følgende personer for deres bidrag til "
+"addons.mozilla.org gennem årene:"
 
-#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Udviklere"
 
-#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Redaktører"
 
-#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Oversættere"
 
-#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Andre bidragydere"
 
-#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Forhenværende udviklere"
 
-#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Software og billeder"
 
-#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Visse ikoner på siden er fra <a href=\"http://www.famfamfam.com/lab/icons/"
@@ -1170,38 +906,25 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Navngivelse 2.5 "
 "Licens</a>."
 
-#: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 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 "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>."
+
+#. date format string as used in PHP's strftime():
+#. http://php.net/strftime
 msgid "date"
 msgstr "%e. %B %Y"
 
-#: views/elements/addon_version_detail.thtml:53
-#: views/admin/addons_status.thtml:57
+#. date and time format string (strftime)
+#. http://php.net/strftime
 msgid "datetime"
 msgstr "%e. %B %Y, %H:%M"
 
-#: views/elements/developers/actionbar.thtml:47
 msgid "devcp_actionbar_link_details"
 msgstr "Detailed Info"
 
-#: views/elements/developers/actionbar.thtml:42
-#: views/elements/developers/actionbar.thtml:50
-#: views/developers/dashboard.thtml:64
 msgid "devcp_actionbar_link_edit"
 msgstr "Edit Add-on"
 
-#: views/elements/developers/actionbar.thtml:51
 msgid "devcp_actionbar_link_newversion"
 msgstr "Upload New Version"
 
@@ -1213,14 +936,33 @@ msgstr "Edit Previews"
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
 #: views/developers/dashboard.thtml:70
+
 msgid "devcp_actionbar_link_stats"
 msgstr "Statistics Dashboard"
 
-#: controllers/components/developers.php:1163
+#. %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)"
 
-#: views/developers/add_step3.thtml:60
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
 #, php-format
 msgid "devcp_additem_firefox_notice"
 msgstr ""
@@ -1231,144 +973,278 @@ msgstr ""
 "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"
 
-#: views/elements/developers/additem.thtml:41
 msgid "devcp_additem_sidebar_title"
 msgstr "Submit Add-on"
 
-#: views/elements/developers/additem.thtml:53
 msgid "devcp_additem_step0_newlink"
 msgstr "Developer Agreement"
 
-#: views/elements/developers/additem.thtml:46
 msgid "devcp_additem_step1_link"
 msgstr "Step 1: Upload"
 
-#: views/elements/developers/additem.thtml:47
 msgid "devcp_additem_step2_link"
 msgstr "Step 2: Add-on Details"
 
-#: views/elements/developers/additem.thtml:48
 msgid "devcp_additem_step3_link"
 msgstr "Step 3: Version Details"
 
-#: views/elements/developers/additem.thtml:49
 msgid "devcp_additem_step4_link"
 msgstr "Step 4: Localization"
 
-#: views/elements/developers/additem.thtml:50
 msgid "devcp_additem_step5_link"
 msgstr "Step 5: Success"
 
-#: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Submission Help"
 
-#: controllers/developers_controller.php:2661
 msgid "devcp_addon_disabled_successfully"
 msgstr "Add-on disabled successfully"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Edit Add-on"
 
-#: controllers/developers_controller.php:2656
 msgid "devcp_addon_enabled_successfully"
 msgstr "Add-on enabled successfully"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Add-on Description"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Add-on Homepage"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
 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"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Privacy Policy"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Add-on Summary"
 
-#: controllers/developers_controller.php:2455
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Support Email"
 
-#: controllers/developers_controller.php:2464
 msgid "devcp_addon_field_supporturl_displaytitle"
-msgstr "Support URL"
+msgstr "Support URL" 
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Version Notes"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Nominate Add-on"
 
-#: controllers/developers_controller.php:2729
 msgid "devcp_addon_nominated_successfully"
 msgstr "Add-on nominated successfully!"
 
-#: views/developers/add_step5.thtml:76
+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."
 
-#: 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."
 
-#: views/developers/add_step5.thtml:63
+#. %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."
 
-#: views/developers/add_step5.thtml:63
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "here"
 
-#: views/developers/add_step5.thtml:60
+#. %1 is the "nominate" link
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
 msgstr ""
@@ -1376,184 +1252,200 @@ msgstr ""
 "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:1475
-#: controllers/developers_controller.php:1476
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Submit Add-on"
 
-#: controllers/developers_controller.php:2375
 msgid "devcp_addon_updated_successfully"
 msgstr "Add-on updated successfully"
 
-#: views/developers/add_step5.thtml:71
+#. %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."
 
-#: views/developers/add_step5.thtml:71
 msgid "devcp_addon_upload_preview_link"
 msgstr "upload a preview"
 
-#: views/developers/author_lookup.thtml:41
+#. #1 is the author email
 #, 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:1402
 msgid "devcp_comments_updated"
 msgstr "Developer Comments updated."
 
-#: views/developers/details.thtml:120
+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"
 
-#: 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"
 
-#: views/developers/details.thtml:84 views/developers/versions.thtml:65
+#. %s is a version number.  Example:  3.0
 #, 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 "
@@ -1561,202 +1453,533 @@ msgstr ""
 "checks. The add-on will effectively be deleted, although you will be able to "
 "return here and re-enable it at your convenience."
 
-#: views/developers/disable.thtml:55
+#. %s is the name of an add-on
 #, 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."
 
-#: views/developers/disable.thtml:48
+#. %s is the name of an add-on
 #, php-format
 msgid "devcp_disable_enable_title"
 msgstr "Enable %s"
 
-#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+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"
 
-#: 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/edit.thtml:77
+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."
 
-#: views/developers/edit.thtml:51
+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"
 
-#: 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/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:167
-#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "This is a pre-release"
 
-#: 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:201
-#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Target Locale"
 
-#: views/developers/edit.thtml:126
 msgid "devcp_edit_locale_disambiguation_explanation"
 msgstr "short additional info (such as a local dialect name)"
 
-#: views/developers/edit.thtml:153
+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"
 
-#: 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/editorsmenu.thtml:59
+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"
 
-#: views/elements/developers/editorsqueue.thtml:42
-#: views/elements/developers/editorsmenu.thtml:56
+#. %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)"
 
-#: views/elements/developers/editorsqueue.thtml:44
-#: views/elements/developers/editorsmenu.thtml:58
+#. %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)"
 
-#: views/elements/developers/editorsqueue.thtml:43
-#: views/elements/developers/editorsmenu.thtml:57
+#. %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)"
 
-#: views/developers/editversion.thtml:66
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "Checked files will be deleted."
 
-#: views/developers/editversion.thtml:58
+#. %1 is the file name
+#. %2 is the file size (150 KB)
 #, 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:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
-#: controllers/statistics_controller.php:139
-#: controllers/statistics_controller.php:336
-#: 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."
 
-#: views/developers/add_step2.thtml:126
-#: controllers/developers_controller.php:2191
-#: controllers/developers_controller.php:2479
+#. %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)"
 
-#: controllers/developers_controller.php:1907
 msgid "devcp_error_addonname_not_unique"
 msgstr ""
 "The name for your add-on already exists in the database. Please make sure "
@@ -1764,408 +1987,369 @@ msgstr ""
 "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>"
 
-#: controllers/components/developers.php:591
+#. %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."
 
-#: controllers/components/developers.php:591
+#. 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"
 
-#: controllers/developers_controller.php:2013
 msgid "devcp_error_describe_changes"
 msgstr "Please describe the changes made in this add-on update."
 
-#: controllers/components/developers.php:355
+#. %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 (%s) is not allowed for the selected add-on type. Please "
-"use one of the following: %s"
+"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:1654
 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."
 
-#: controllers/components/developers.php:526
 msgid "devcp_error_guid_application"
 msgstr "The ID of this add-on is already used by an application."
 
-#: controllers/components/developers.php:337
-#: controllers/components/developers.php:389
 msgid "devcp_error_http_incomplete"
 msgstr "Incomplete transfer"
 
-#: 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 "Exceeds maximum upload size"
 
-#: controllers/components/developers.php:338
-#: controllers/components/developers.php:390
 msgid "devcp_error_http_nofile"
 msgstr "No file uploaded"
 
-#: controllers/components/developers.php:401
+#. %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 (%s) is not allowed for an icon. Please use one of the "
-"following: %s"
+"That file extension (%1$s) is not allowed for an icon. Please use one of the "
+"following: %2$s"
 
-#: controllers/developers_controller.php:1723
+#. %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."
 
-#: controllers/developers_controller.php:448
-#: controllers/developers_controller.php:1664
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No install.rdf present."
 
-#: controllers/components/developers.php:601
 msgid "devcp_error_install_manifest"
 msgstr "The following errors were found in install.rdf:"
 
-#: controllers/developers_controller.php:1607
 msgid "devcp_error_invalid_addontype"
 msgstr "Please select a valid add-on type."
 
-#: controllers/components/developers.php:569
-#: controllers/components/developers.php:581
+#. %$1s is a version.  Example: 3.1.1
+#. %$2s is an add-on name.
 #, php-format
 msgid "devcp_error_invalid_appversion"
-msgstr "%s is not a valid version for %s"
+msgstr "%1$s is not a valid version for %2$s"
 
-#: controllers/components/developers.php:521
+#. %s is a string
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "The ID of this add-on is invalid: %s"
 
-#: controllers/components/developers.php:572
+#. %$1s is a version.  Example: 3.1.1
+#. %$2s is an add-on name.
 #, php-format
 msgid "devcp_error_invalid_minversion"
-msgstr "%s is not a valid version for %s: minimum versions cannot contain *"
+msgstr ""
+"%1$s is not a valid version for %2$s: minimum versions cannot contain *"
 
-#: controllers/components/developers.php:536
 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>"
 
-#: controllers/components/developers.php:531
 msgid "devcp_error_invalid_version_spaces"
 msgstr "The version of this add-on is invalid: versions cannot contain spaces."
 
-#: controllers/components/developers.php:501
+#. %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"
 
-#: controllers/components/developers.php:373
 msgid "devcp_error_move_file"
 msgstr "Could not move 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
+#. %s is the name of a file
 #, php-format
 msgid "devcp_error_moving_file"
 msgstr "An error occurred moving %s."
 
-#: controllers/components/developers.php:595
 msgid "devcp_error_mozilla_application"
 msgstr "You must have at least one valid Mozilla target application."
 
-#: controllers/components/developers.php:516
 msgid "devcp_error_no_guid"
 msgstr "No ID could be found for this add-on in install.rdf."
 
-#: controllers/components/developers.php:287
 msgid "devcp_error_no_platform"
 msgstr "No platform selected"
 
-#: controllers/developers_controller.php:2718
 msgid "devcp_error_nominate_message"
 msgstr "You must supply the requested details for nomination."
 
-#: controllers/developers_controller.php:2712
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "You cannot nominate a pre-release add-on."
 
-#: controllers/developers_controller.php:2704
 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."
 
-#: controllers/components/developers.php:92
 msgid "devcp_error_one_user"
 msgstr "There must be at least one author for this add-on."
 
-#: controllers/components/developers.php:1081
+#. %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 (%s) is not allowed for a preview. Please use one of the "
-"following: %s"
+"That file extension (%1$s) is not allowed for a preview. Please use one of "
+"the following: %2$s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
 msgid "devcp_error_saving"
 msgstr "An error occurred trying to save your data."
 
-#: controllers/developers_controller.php:1696
 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 ""
 "Add-ons cannot use an updateKey. Please remove this from install.rdf and try "
 "again."
 
-#: controllers/components/developers.php:506
 msgid "devcp_error_updateurl"
 msgstr ""
 "Add-ons cannot use an external updateURL. Please remove this from install."
 "rdf and try again."
 
-#: controllers/developers_controller.php:409
-#: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Please upload a file."
 
-#: 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/elements/developers/localebox.thtml:44
+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"
 
-#: views/elements/developers/localebox.thtml:48
+#. %1 is the default locale
 #, php-format
 msgid "devcp_localebox_intro"
 msgstr ""
@@ -2174,62 +2358,69 @@ msgstr ""
 "language. If a translation for a locale is not available, it will fall back "
 "to the selected default locale (%s)."
 
-#: views/elements/developers/sidebar.thtml:68
-#: 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:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Editor Tools"
 
-#: views/elements/developers/myaddons.thtml:52
 msgid "devcp_myaddons_link"
 msgstr "My Add-ons"
 
-#: views/elements/developers/sidebar.thtml:70
-#: 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:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Statistics Dashboard"
 
-#: views/elements/developers/sidebar.thtml:62
-#: 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:48
 msgid "devcp_myaddons_title"
 msgstr "Developer Tools"
 
-#: views/developers/nominate.thtml:53
+#. %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"
 
-#: views/developers/addon_status_nominate.thtml:61
-#: views/developers/nominate.thtml:52
+#. %1 is the add-on name
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Nominate %s"
 
-#: views/developers/add_step2.thtml:63
+#. %1 is the autodetected add-on type
 #, php-format
 msgid "devcp_notice_autodetected_addontype"
 msgstr "Automatically detected add-on type: %s."
 
-#: controllers/previews_controller.php:252
+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."
 
-#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#. %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 ""
@@ -2237,981 +2428,1326 @@ msgstr ""
 "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"
 msgstr ""
 "Making this the default preview will remove default status from the current "
 "default preview."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
-#: controllers/developers_controller.php:77
-#: controllers/previews_controller.php:67
-#: controllers/previews_controller.php:79
-#: controllers/previews_controller.php:82
+msgid "devcp_notice_unsaved_changes"
+msgstr "You have unsaved changes."
+
 msgid "devcp_pagetitle"
 msgstr "Developer Tools"
 
-#: controllers/previews_controller.php:103
-#: controllers/previews_controller.php:104
 msgid "devcp_preview_add_pagetitle"
 msgstr "Add Preview"
 
-#: controllers/previews_controller.php:135
 msgid "devcp_preview_added_successfully"
 msgstr "Preview added successfully."
 
-#: controllers/previews_controller.php:323
 msgid "devcp_preview_deleted_successfully"
 msgstr "Preview deleted successfully."
 
-#: controllers/previews_controller.php:194
-#: controllers/previews_controller.php:195
 msgid "devcp_preview_edit_pagetitle"
 msgstr "Edit Preview"
 
-#: controllers/previews_controller.php:237
 msgid "devcp_preview_updated_successfully"
 msgstr "Preview updated successfully."
 
-#: views/previews/add.thtml:45
+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."
 
-#: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
 msgstr "Add Preview"
 
-#: views/previews/edit.thtml:43
+msgid "devcp_previews_header_caption"
+msgstr "Preview Caption"
+
 msgid "devcp_previews_header_edit"
 msgstr "Edit Preview"
 
-#: views/previews/add.thtml:54
+msgid "devcp_previews_label_default"
+msgstr "Default Preview"
+
 msgid "devcp_previews_label_file"
 msgstr "Preview File"
 
-#: views/previews/add.thtml:59 views/previews/edit.thtml:50
 msgid "devcp_previews_label_makedefault"
 msgstr "Make this the default preview image"
 
-#: views/previews/edit.thtml:55
+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"
 
-#: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete_confirm"
 msgstr "Are you sure you wish to delete this preview?"
 
-#: views/previews/edit.thtml:54
 msgid "devcp_previews_submit_edit"
 msgstr "Edit Preview"
 
-#: views/previews/add.thtml:63
 msgid "devcp_previews_submit_upload"
 msgstr "Upload Preview"
 
-#: views/developers/add_step2.thtml:64
+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?"
 
-#: controllers/developers_controller.php:2632
 msgid "devcp_question_delete_file"
 msgstr "Are you sure you want to delete this file?"
 
-#: views/developers/addon_submit_choose.thtml:56
-#: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Please review and accept the following Developer Agreement before proceeding."
 
-#: views/developers/add_step1.thtml:123
+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"
 
-#: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#. %s is a number
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Active Daily Users"
 
-#: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#. %s is a number
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> Total Downloads"
 
-#: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#. %s is a number
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Weekly Downloads"
 
-#: controllers/developers_controller.php:1481
+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."
 
-#: views/developers/addon_submit_choose.thtml:61
-#: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "I Accept"
 
-#: views/developers/addon_submit_choose.thtml:60
-#: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 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:82 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Latest Version:"
 
-#: views/developers/index.thtml:101
+#. %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."
 
-#: views/developers/index.thtml:102
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "here"
 
-#: views/developers/add_step5.thtml:68
+#. %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."
 
-#: views/developers/add_step5.thtml:68
 msgid "devcp_theme_upload_preview_link"
 msgstr "upload a preview"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+msgid "devcp_verify_author_error"
+msgstr "No account found for that email address."
+
 msgid "devcp_version_edit_pagetitle"
 msgstr "Edit Version"
 
-#: controllers/developers_controller.php:2572
 msgid "devcp_version_updated_successfully"
 msgstr "Version updated successfully."
 
-#: controllers/downloads_controller.php:90
+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"
 
-#: views/editors/logs.thtml:51
+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"
 
-#: views/editors/logs.thtml:44
 msgid "editorcp_logs_filter_by"
 msgstr "Filter by type/action"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
 msgid "editorcp_logs_page_heading"
 msgstr "Event Log"
 
-#: views/elements/developers/editorsmenu.thtml:60
 msgid "editorcp_menu_eventlog_link"
 msgstr "Event Log"
 
-#: views/elements/developers/editorsmenu.thtml:62
 msgid "editorcp_menu_mainpage_link"
 msgstr "Back to Main"
 
-#: views/elements/developers/editorsmenu.thtml:61
 msgid "editorcp_menu_reviewlog_link"
 msgstr "Review Log"
 
-#: views/elements/developers/editorsmenu.thtml:55
 msgid "editorcp_menu_summary_link"
 msgstr "Editor Summary"
 
-#: views/elements/developers/editorsmenu.thtml:52
 msgid "editorcp_menu_title"
 msgstr "Editor Tools"
 
-#: views/editors/reviewlog.thtml:49
 msgid "editorcp_reviewlog_button_filter"
 msgstr "Filter"
 
-#: views/editors/reviewlog.thtml:58
 msgid "editorcp_reviewlog_column_action"
 msgstr "Action"
 
-#: views/editors/reviewlog.thtml:56
 msgid "editorcp_reviewlog_column_addon"
 msgstr "Add-on"
 
-#: views/editors/reviewlog.thtml:55
 msgid "editorcp_reviewlog_column_date"
 msgstr "Date"
 
-#: views/editors/reviewlog.thtml:57
 msgid "editorcp_reviewlog_column_editor"
 msgstr "Editor"
 
-#: views/editors/reviewlog.thtml:94
 msgid "editorcp_reviewlog_comments_hide"
 msgstr "Hide Comments"
 
-#: views/editors/reviewlog.thtml:93
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Show Comments"
 
-#: views/editors/reviewlog.thtml:45
+#. %1$s and %2$s are full <input> tags for dates
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
-msgstr "View entries between %s and %s"
+msgstr "View entries between %1$s and %2$s"
 
-#: views/editors/reviewlog.thtml:104
 msgid "editorcp_reviewlog_none_found"
 msgstr "No reviews found for this period."
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Review Log"
 
-#: views/editors/summary.thtml:61
 msgid "editorcp_summary_monthreviews_heading"
 msgstr "Month Reviews"
 
-#: views/editors/summary.thtml:77
 msgid "editorcp_summary_neweditors_heading"
 msgstr "New Editors"
 
-#: views/editors/summary.thtml:42
 msgid "editorcp_summary_page_heading"
 msgstr "Editor Summary"
 
-#: views/editors/summary.thtml:94
 msgid "editorcp_summary_recentactivity_heading"
 msgstr "Recent Editor Activity"
 
-#: views/editors/summary.thtml:45
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total Reviews"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
 msgid "editors_addon_review_pagetitle"
 msgstr "Review Add-on"
 
-#: controllers/editors_controller.php:460
 msgid "editors_error_js-formerror"
 msgstr "Please complete the following fields:"
 
-#: controllers/editors_controller.php:461
 msgid "editors_error_review_one_file"
 msgstr "Please select at least one file to review."
 
-#: controllers/editors_controller.php:395
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Self-reviews are not allowed."
 
-#: controllers/editors_controller.php:305
 msgid "editors_external_software"
 msgstr "External Software"
 
-#: views/editors/featured.thtml:120 views/editors/featured.thtml:121
 msgid "editors_featured_add_feature"
 msgstr "Add feature"
 
-#: views/editors/featured.thtml:126
 msgid "editors_featured_add_feature_submit"
 msgstr "Add"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
 msgid "editors_featured_addon_add_failure"
 msgstr "Failed to add feature."
 
-#: controllers/editors_controller.php:675
 msgid "editors_featured_addon_add_success"
 msgstr "Successfully added feature."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
 msgid "editors_featured_addon_edit_failure"
 msgstr "Failed to edit feature."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:712
 msgid "editors_featured_addon_edit_success"
 msgstr "Successfully edited feature."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:685
 msgid "editors_featured_addon_invalid_locale"
 msgstr "One or more locales are invalid."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:730
 msgid "editors_featured_addon_remove_failure"
 msgstr "Failed to remove feature."
 
-#: controllers/editors_controller.php:725
 msgid "editors_featured_addon_remove_success"
 msgstr "Successfully removed feature."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
 msgid "editors_featured_addons_pagetitle"
 msgstr "Featured Add-ons"
 
-#: views/editors/featured.thtml:54 views/editors/featured.thtml:107
 msgid "editors_featured_edit_feature_submit"
 msgstr "Go"
 
-#: views/editors/featured.thtml:90 views/editors/featured.thtml:91
 msgid "editors_featured_remove_feature"
 msgstr "Remove feature"
 
-#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Filter Queue"
 
-#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Helpful Links"
 
-#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Editors' Guide"
 
-#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Add-on Policy"
 
-#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "These filters will remain in place for this session or until cleared."
 
-#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
+#. %1 is the queue mode
 msgid "editors_notice_none_found"
 msgstr "There are currently no add-ons of this type to review."
 
-#: controllers/editors_controller.php:258
 msgid "editors_one_day"
 msgstr "1 day"
 
-#: controllers/editors_controller.php:266
 msgid "editors_one_hour"
 msgstr "1 hour"
 
-#: controllers/editors_controller.php:274
 msgid "editors_one_minute"
 msgstr "1 minute"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
 msgid "editors_pagetitle"
 msgstr "Editor Tools"
 
-#: controllers/editors_controller.php:286
-#: controllers/editors_controller.php:289
+#. %s is a comma separated list of platforms.  Example:  Windows, OS X
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s only"
 
-#: controllers/editors_controller.php:301
 msgid "editors_pre-release"
 msgstr "Pre-release"
 
-#: views/editors/queue.thtml:78
+#. %1 is the app name
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s Compatibility"
 
-#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Clear"
 
-#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filter"
 
-#: controllers/editors_controller.php:133
 msgid "editors_queues_disabled"
 msgstr ""
 "All review queues are currently disabled. Please check back at a later time."
 
-#: controllers/editors_controller.php:456
 msgid "editors_review_action"
 msgstr "Review Action"
 
-#: views/editors/review.thtml:151
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 msgid "editors_review_action_public"
 msgstr "Push to Public"
 
-#: views/editors/review.thtml:153
 msgid "editors_review_action_request_superreview"
 msgstr "Request Super-Review"
 
-#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Retain in Sandbox"
 
-#: controllers/editors_controller.php:457
 msgid "editors_review_comments"
 msgstr "Review Comments"
 
-#: views/editors/review.thtml:167
+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."
 
-#: views/editors/review.thtml:170
 msgid "editors_review_details_nominated_sandbox"
 msgstr "This will retain the add-on in the sandbox."
 
-#: views/editors/review.thtml:159
 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:162
 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:174
 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:128
 msgid "editors_review_file_diff_link"
 msgstr "Compare with public version"
 
-#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "View Contents"
 
-#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Authors:"
 
-#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Categories:"
 
-#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Compatibility:"
 
-#: views/editors/review.thtml:234
 msgid "editors_review_header_description"
 msgstr "Description"
 
-#: views/editors/review.thtml:258
 msgid "editors_review_header_devcomments"
 msgstr "Developer Comments"
 
-#: views/editors/review.thtml:246
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Files:"
 
-#: views/editors/review.thtml:267
 msgid "editors_review_header_itemhistory"
 msgstr "Item History"
 
-#: views/editors/review.thtml:215
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomination Message"
 
-#: views/editors/review.thtml:323
 msgid "editors_review_header_previews"
 msgstr "Previews"
 
-#: views/editors/review.thtml:252
 msgid "editors_review_header_privacy"
 msgstr "Privacy Policy"
 
-#: views/editors/review.thtml:50
+#. %1 is the add-on name and version
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Review %s"
 
-#: views/editors/review.thtml:222
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes to Reviewer"
 
-#: views/editors/review.thtml:228
 msgid "editors_review_header_summary"
 msgstr "Summary"
 
-#: views/editors/review.thtml:240
 msgid "editors_review_header_versionnotes"
 msgstr "Version Notes"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
 msgid "editors_review_history_nominated_approved"
 msgstr "Nomination Approved/Public"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomination Denied/Sandbox"
 
-#: views/editors/review.thtml:315
 msgid "editors_review_history_nonefound"
 msgstr "No previous review entries could be found."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
 msgid "editors_review_history_pending_adminreview"
 msgstr "Admin Review"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
 msgid "editors_review_history_pending_approved"
 msgstr "Approved/Public"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
 msgid "editors_review_history_pending_denied"
 msgstr "Denied/Sandbox"
 
-#: views/editors/review.thtml:198
+#. 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:"
 
-#: views/editors/review.thtml:186
 msgid "editors_review_label_cannedresponse"
 msgstr "or select a canned response:"
 
-#: views/editors/review.thtml:180
 msgid "editors_review_label_comments"
 msgstr "Comments:"
 
-#: views/editors/review.thtml:194
 msgid "editors_review_label_operating_systems"
 msgstr "Operating Systems:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
 msgid "editors_review_link_pagetop"
 msgstr "Top"
 
-#: views/editors/review.thtml:45
-#, fuzzy
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
 msgid "editors_review_previews_notfound"
 msgstr "No previews found."
 
-#: views/editors/review.thtml:44
-#, fuzzy
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
 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:43
-#, fuzzy
+#. %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"
 
-#: views/editors/review.thtml:206
 msgid "editors_review_submit_process_action"
 msgstr "Process Action"
 
-#: views/editors/review.thtml:276
 msgid "editors_review_th_action"
 msgstr "Action"
 
-#: views/editors/review.thtml:277
 msgid "editors_review_th_comments"
 msgstr "Comments"
 
-#: views/editors/review.thtml:274
 msgid "editors_review_th_date"
 msgstr "Date"
 
-#: views/editors/review.thtml:275
 msgid "editors_review_th_reviewer"
 msgstr "Reviewer"
 
-#: views/editors/review.thtml:273
 msgid "editors_review_th_version_file"
 msgstr "Version/File"
 
-#: controllers/editors_controller.php:411
+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."
 
-#: views/editors/reviews_queue.thtml:106
 msgid "editors_reviews_action_delete_review"
 msgstr "Delete review"
 
-#: views/editors/reviews_queue.thtml:104
 msgid "editors_reviews_action_keep"
 msgstr "Remove flags; keep review"
 
-#: views/editors/reviews_queue.thtml:102
 msgid "editors_reviews_action_skip"
 msgstr "Skip"
 
-#: views/editors/reviews_queue.thtml:100
 msgid "editors_reviews_header_action"
 msgstr "Action"
 
-#: views/editors/reviews_queue.thtml:67
 msgid "editors_reviews_in_reply_to"
 msgstr "In reply to:"
 
-#: controllers/editors_controller.php:572
 msgid "editors_reviews_processed"
 msgstr "Reviews processed successfully!"
 
-#: views/editors/reviews_queue.thtml:117
 msgid "editors_reviews_queue_empty"
 msgstr "There are currently no reviews in moderation."
 
-#: views/editors/reviews_queue.thtml:111
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Process Reviews"
 
-#: controllers/editors_controller.php:297
 msgid "editors_site_specific"
 msgstr "Site Specific"
 
-#: controllers/editors_controller.php:228
 msgid "editors_submissiontype_new"
 msgstr "New"
 
-#: controllers/editors_controller.php:229
 msgid "editors_submissiontype_updated"
 msgstr "Updated"
 
-#: controllers/editors_controller.php:459
 msgid "editors_tested_app"
 msgstr "Tested Application"
 
-#: controllers/editors_controller.php:458
 msgid "editors_tested_os"
 msgstr "Tested Operating Systems"
 
-#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Additional Information"
 
-#: 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: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:55
 msgid "editors_th_platforms"
 msgstr "Platforms"
 
-#: views/editors/queue.thtml:57
 msgid "editors_th_submissiontypes"
 msgstr "Submission Types"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
 #, php-format
 msgid "editors_x_days"
 msgstr "%s days"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s hours"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
 #, 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:610
-#: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
 msgid "error_access_denied"
 msgstr "Ingen adgang"
 
-#: views/errors/error401.thtml:52
 msgid "error_access_denied_message"
 msgstr "Du har ikke adgang til at se denne side."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
-#: 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:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
-#: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
 msgid "error_addon_notfound"
 msgstr "Tilføjelse ikke fundet!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
 msgid "error_addon_notviewable"
 msgstr "Tilføjelsen kan ikke vises her."
 
-#: controllers/reviews_controller.php:246
 msgid "error_addon_selfreview"
 msgstr "Du kan ikke anmelde din egen tilføjelse."
 
-#: controllers/addons_controller.php:624
 msgid "error_browse_no_addons"
 msgstr "Ingen tilføjelser i denne kategori!"
 
-#: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr ""
+msgstr "Tilføjelsesfeed ikke fundet."
 
-#: views/users/register.thtml:60 views/users/edit.thtml:176
-#: views/developers/add_step2.thtml:117 controllers/api_controller.php:907
 msgid "error_email_invalid"
 msgstr "Dette er ikke en gyldig e-mail-adresse."
 
-#: 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:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
 msgid "error_file_notfound"
 msgstr "Fil ikke fundet!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Fejl: Filen %s eksisterer ikke."
 
-#: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
-#: 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: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."
+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: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/"
 "min_side."
 
-#: 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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
-#: controllers/collections_controller.php:71
+#. %s is a string representing what's missing.  Example:  file_id
 #, php-format
 msgid "error_missing_argument"
 msgstr "Manglende argument: %s"
 
-#: 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:373 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Du skal give en bedømmelse."
 
-#: controllers/users_controller.php:160
 msgid "error_user_already_confirmed"
 msgstr "Brugerkontoen er allerede bekræftet."
 
-#: 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:70
-#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Adgangskoderne matchede ikke."
 
-#: 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: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."
 
-#: 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:260 controllers/users_controller.php:592
-#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Bruger ikke fundet!"
 
-#: views/users/activatefirst.thtml:47
 msgid "error_user_unconfirmed"
 msgstr ""
 "Bekræft venligst først din brugerkonto med koden, du modtog via e-mail."
 
-#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Forkert brugernavn eller adgangskode!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
 msgid "error_version_notfound"
 msgstr "Version ikke fundet!"
 
-#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Forkert adgangskode!"
 
-#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Lær mere"
 
-#: views/elements/feature.thtml:130
+#. %1 is the add-on name
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Lær mere om %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
-#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
+#. %1$s is a number
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s anmeldelse"
 msgstr[1] "%1$s anmeldelser"
 
-#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Vis mere fra"
 
-#: views/elements/footer.thtml:67
+#. 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 "Tilbage til tilføjelsen"
+
+#. 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 "Vis alle"
+
+#. 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 "Tilbage til anmeldelse"
+
+#. 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 :: Filbrowser :: %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 "Om"
+
+#. 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 "Alle rettigheder forbeholdes."
 
-#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Copyright"
 
-#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Tak til"
 
-#: views/elements/footer.thtml:73
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla linker til disse programmer som en ekstra service og repræsenterer "
@@ -3219,241 +3755,190 @@ msgstr ""
 "spørgsmål, klager eller krav vedrørende programmerne skal sendes til "
 "softwareudgiveren."
 
-#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Skift"
 
-#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Juridiske betingelser"
 
-#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Andre sprog:"
 
-#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Privatlivspolitik"
 
-#: views/addons/display.thtml:379
 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:110
+#. Plural in this context means many of the add-on type
 msgid "general_addontype_dict_plural"
 msgstr "Ordbøger"
 
-#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Udvidelse"
 
-# Plural in this context means many of the add-on type
-#: models/addontype.php:108
+#. Plural in this context means many of the add-on type
 msgid "general_addontype_extension_plural"
 msgstr "Udvidelser"
 
-#: 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:113
+#. Plural in this context means many of the add-on type
 msgid "general_addontype_lpaddon_plural"
 msgstr "Sprogpakker (tilføjelse)"
 
-#: 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:112
+#. Plural in this context means many of the add-on type
 msgid "general_addontype_lpapp_plural"
 msgstr "Sprogpakker (program)"
 
-#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
-# Plural in this context means many of the add-on type
-#: models/addontype.php:114
+#. Plural in this context means many of the add-on type
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
 
-#: models/addontype.php:91
 msgid "general_addontype_search"
-msgstr "Søgemaskine"
+msgstr "Søgetjeneste"
 
-# Plural in this context means many of the add-on type
-#: models/addontype.php:111
+#. Plural in this context means many of the add-on type
 msgid "general_addontype_search_plural"
-msgstr "Søgemaskiner"
+msgstr "Søgetjenester"
 
-#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Tema"
 
-# Plural in this context means many of the add-on type
-#: models/addontype.php:109
+#. Plural in this context means many of the add-on type
 msgid "general_addontype_theme_plural"
 msgstr "Temaer"
 
-#: views/elements/header.thtml:111 views/elements/header.thtml:122
+#. %1$s is the application name.  Example:  Firefox
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Tilbage til startsiden for %1$s Add-ons"
 
-#: views/elements/header.thtml:87
 msgid "header_main_firefox_header"
 msgstr "Firefox Add-ons"
 
-#: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Tilføjelser"
 
-#: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
-msgstr "Seamonkey Add-ons"
+msgstr "SeaMonkey Add-ons"
 
-#: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird Add-ons"
 
-#: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird Add-ons"
 
-#: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Tilføjelser"
 
-#: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
 msgid "header_navlink_login"
 msgstr "Log ind"
 
-#: views/elements/header.thtml:147
 msgid "header_navlink_logout"
 msgstr "Log ud"
 
-#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Min konto"
 
-#: views/elements/header.thtml:150
 msgid "header_navlink_register"
 msgstr "Registrer"
 
-#: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/fyf_promotion.thtml:46
-#: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
-#: views/addons/browse_thumbs.thtml:60
+#. %s is the add-on name
 #, php-format
 msgid "img_preview_of"
 msgstr "Skærmbillede af %s"
 
-#: views/elements/install.thtml:229
+#. %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 ind</a> for at installere denne tilføjelse. <a href=\"%2"
 "$s\">Hvorfor</a>?"
 
-#: views/elements/install.thtml:71
+#. %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 "Tilføj til %s %s"
+msgstr "Tilføj til %1$s %2$s"
 
-#: views/elements/install.thtml:146 views/elements/install.thtml:164
-#: views/elements/install.thtml:197 views/elements/install.thtml:220
+#. %1 is the add-on name, %2 is the app name
 #, php-format
 msgid "install_button_title"
 msgstr "Tilføj %1$s til %2$s"
 
-#: views/elements/install.thtml:158
+#. %1$s is the add-on name
 #, php-format
 msgid "install_download"
 msgstr "Download %1$s"
 
-#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Denne tilføjelse er ikke tilgængelig."
 
-#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Liste over sprogpakker og ordbøger."
 
-#: views/addons/dictionaries.thtml:47
 msgid "langtools_download_dictionary"
 msgstr "Download ordbog"
 
-#: views/addons/dictionaries.thtml:48
 msgid "langtools_download_langpack"
 msgstr "Download sprogpakke"
 
-#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Ordbøger & sprogpakker"
 
-#: views/addons/dictionaries.thtml:44
 msgid "langtools_install_dictionary"
 msgstr "Installer ordbog"
 
-#: views/addons/dictionaries.thtml:45
 msgid "langtools_install_langpack"
 msgstr "Installer sprogpakke"
 
-#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Ordbog"
 
-#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Sprogpakke"
 
-#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Sprog"
 
-#: 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/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Dato"
 
-#: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Downloads"
 
-#: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Navn"
 
-#: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Bedømmelse"
 
-#: 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"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3463,928 +3948,729 @@ msgstr "Sugar"
 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:680
-#: controllers/components/amo.php:682
 msgid "nav_category_dicts_langpacks"
 msgstr "Ordbøger & sprogpakker"
 
-#: controllers/components/amo.php:715 controllers/components/amo.php:717
 msgid "nav_category_plugins"
 msgstr "Plugins"
 
-#: views/elements/addon_categories.thtml:57
-#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:686
 msgid "nav_category_themes"
 msgstr "Temaer"
 
-#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "Find tilføjelser til andre programmer"
 
-#: views/helpers/addons_html.php:214
+#. In a user list: user 1, user 2, "others"
 msgid "other_users"
 msgstr "andre"
 
-#: controllers/pages_controller.php:90
 msgid "page_title_appversions"
 msgstr "Application Versions"
 
-#: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Tak til"
 
-#: controllers/pages_controller.php:94
-msgid "page_title_experimental_addons"
-msgstr "Eksperimentelle tilføjelser"
-
-#: controllers/pages_controller.php:113
-#, fuzzy
 msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
+msgstr "Ofte stillede spørgsmål"
 
-#: controllers/pages_controller.php:96
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
 msgid "page_title_policy"
 msgstr "Add-ons Policy"
 
-#: controllers/pages_controller.php:105
 msgid "page_title_privacy"
 msgstr "Mozilla Privacy Policy"
 
-#: controllers/pages_controller.php:107
 msgid "page_title_review_guide"
 msgstr "Retningslinjer for anmeldelser"
 
-#: controllers/pages_controller.php:109
 msgid "page_title_sandbox"
 msgstr "Sandkassegodkendelsessystemet"
 
-#: controllers/pages_controller.php:111
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
-#: 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 "Valid Application Versions"
 
-#: 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 "
 "least one of the below applications supported. Only the versions listed "
 "below are allowed for these applications."
 
-#: views/pages/appversions.thtml:92
+#. %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."
 
-#: views/pages/appversions.thtml:92
+#. 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"
 
-#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/experimental_addons.thtml:56
-msgid "pages_experimental_addons_backbutton"
-msgstr "Tilbage til forrige side"
-
-#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Sandbox Information Page"
 
-#: views/elements/pagination.thtml:53
 msgid "pagination_next_page"
 msgstr "næste"
 
-#: views/helpers/pagination.php:199
+#. %1 is page number, %2 is total page count
 #, 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"
 
-#: views/elements/recaptcha.thtml:65
 msgid "recaptcha_enter_both_words"
 msgstr ""
-"Indtast <strong>begge ord</strong> herunder <strong>adskilt af et mellemrum</"
-"strong>."
+"Indtast <strong>begge ord</strong> herunder <strong>adskilt af et "
+"mellemrum</strong>."
 
-#: views/elements/recaptcha.thtml:83
 msgid "recaptcha_enter_here"
 msgstr "Skriv ordene her:"
 
-#: views/elements/recaptcha.thtml:74
 msgid "recaptcha_enter_whatyouhear"
 msgstr "Indtast hvad du hører."
 
-#: views/elements/recaptcha.thtml:77
+#. %1 is the link switching refreshing the captcha
+#. %2 is the link switching to a text captcha
 msgid "recaptcha_hardtohear_text"
 msgstr ""
-"Hvis det er svære at høre, kan du <a href=\"%1$s\">lytte til noget andet</a> "
-"eller <a href=\"%2$s\">bruge tekst i stedet</a>."
+"Hvis det er svære at høre, kan du <a href=\"%1$s\">lytte til noget "
+"andet</a> eller <a href=\"%2$s\">bruge tekst i stedet</a>."
 
-#: views/elements/recaptcha.thtml:68
+#. %1 is the link switching refreshing the captcha
+#. %2 is the link switching to an audio captcha
 msgid "recaptcha_hardtoread_text"
 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."
+"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:100
 msgid "recaptcha_label"
 msgstr "Er du et menneske eller en robot?"
 
-#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Hvad er dette?"
 
-#: controllers/reviews_controller.php:556
 msgid "review_flag_error"
 msgstr "Der opstod en fejl under rapporteringen af denne anmeldelse!"
 
-#: models/reviews_moderation_flag.php:69
 msgid "review_flag_reason_bug_support"
 msgstr "Fejlplaceret fejlrapport eller support-spørgsmål"
 
-#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Rapporter denne anmeldelse (vælg en begrundelse)"
 
-#: models/reviews_moderation_flag.php:67
 msgid "review_flag_reason_language"
 msgstr "Upassende sprogbrug"
 
-#: models/reviews_moderation_flag.php:71
 msgid "review_flag_reason_other"
 msgstr "Andet (angiv hvad)"
 
-#: models/reviews_moderation_flag.php:65
 msgid "review_flag_reason_spam"
 msgstr "Spam eller på anden måde ikke en anmeldelse"
 
-#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
 msgid "review_flag_success"
 msgstr "Tak; denne anmeldelse er rapporteret til redaktørerne."
 
-#: views/reviews/display.thtml:41
 msgid "review_flag_this"
 msgstr "Rapporter denne anmeldelse"
 
-#: views/reviews/display.thtml:42
 msgid "review_flag_this_titletip"
 msgstr ""
 "Er denne anmeldelse upassende, unøjagtig eller spam? Klik her for at "
 "rapportere den til redaktørerne."
 
-#: views/reviews/add.thtml:48
+#. %1 is the URL of the support section, %2 for the review guidelines
 msgid "review_guidelines_short"
 msgstr ""
-"<p>Bemærk disse råd:</p><ul><li>Skriv som hvis du fortalte en ven om din "
-"oplevelse af tilføjelsen. Vær specifik og giv nyttige detaljer, så som ting "
-"du synes godt og dårligt om, hvor nemt det er at bruge tilføjelsen, og "
-"hvilke ulemper den har. Undgå generelle kommentarer som fx at kalde "
-"tilføjelsen \"god\" eller \"dårlig\" med mindre du kan give begrundelser.</"
-"li><li>Lad være med at rapportere fejl eller spørge om hjælp i din "
-"anmeldelse. Din e-mail-adresse er ikke synlig for udviklerne af tilføjelsen, "
-"og de kan have behov for at kontakte dig for at løse problemet. Se <a href="
-"\"%1$s\">supportsektionen</a> for at finde ud af hvor du kan få hjælp til "
-"denne tilføjelse.</li><li>Hold anmeldelsen i et høfligt sprog og indtast "
-"ikke personlig information.</li></ul><p>Læs vores <a href=\"%2$s"
-"\">retningslinjer for anmeldelser</a>, hvis du vil vide mere om "
-"brugeranmeldelser af tilføjelser.</p>"
-
-#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
-#: views/reviews/review_added.thtml:47
+"<p>Bemærk disse råd:</p><ul><li>Skriv som hvis du fortalte en ven "
+"om din oplevelse af tilføjelsen. Vær specifik og giv nyttige detaljer, "
+"så som ting du synes godt og dårligt om, hvor nemt det er at bruge tilføjelsen, og "
+"hvilke ulemper den har. Undgå generelle kommentarer som fx at kalde tilføjelsen \"god"
+"\" eller \"dårlig\" med mindre du kan give begrundelser.</"
+"li><li>Lad være med at rapportere fejl eller spørge om hjælp i din anmeldelse. Din e-mail-adresse er ikke "
+"synlig for udviklerne af tilføjelsen, og de kan have behov for at kontakte dig for "
+"at løse problemet. Se <a href=\"%1$s\">supportsektionen</a> for at "
+"finde ud af hvor du kan få hjælp til denne tilføjelse.</li><li>Hold "
+"anmeldelsen i et høfligt sprog og indtast ikke "
+"personlig information.</li></ul><p>Læs vores <a href=\"%2$s\">retningslinjer "
+"for anmeldelser</a>, hvis du vil vide mere om brugeranmeldelser af tilføjelser.</p>"
+
+#. %1 is the add-on name
 #, php-format
 msgid "reviews_header"
 msgstr "Anmeldelser af %s"
 
-#: controllers/addons_controller.php:261
 msgid "rss_featuredaddons"
 msgstr "Udmærkede tilføjelser"
 
-#: controllers/addons_controller.php:259
 msgid "rss_newestaddons"
 msgstr "Nyeste tilføjelser"
 
-#: controllers/addons_controller.php:260
 msgid "rss_updatedaddons"
 msgstr "Opdaterede tilføjelser"
 
-#: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "Søgning er deaktiveret i øjeblikket. Prøv igen senere."
 
-#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "Alle tilføjelser"
 
-#: 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/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Søg efter tilføjelser"
 
-#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Klik for at indtaste søgeord"
 
-#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "i"
 
-#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Alle søgemaskiner"
 
-#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Gennemse søgemaskiner"
 
-#: views/search/index.thtml:70
+#. %s is a number
 #, 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:178
 msgid "search_pagetitle"
 msgstr "Søg i tilføjelser"
 
-#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Feed med søgeresultater"
 
-#: controllers/search_controller.php:234
+#. %s is the terms the user is searching for (a string)
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Søgeresulteter for: %s"
 
-#: views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Administrationsværktøjer"
 
-#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Udviklingsværktøjer"
 
-#: views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editor Tools"
 
-#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Velkommen"
 
-#: views/addons/home.thtml:162
+#. %s is the user's name
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Velkommen %s"
 
-#: views/elements/pitch.thtml:50 views/elements/pitch.thtml:55
 msgid "sidebar_pitch_dictionary"
 msgstr "en ordbog"
 
-#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Anbefalede tilføjelser"
 
-#: views/elements/pitch.thtml:61
 msgid "sidebar_pitch_looking_for"
 msgstr "Jeg leder efter:"
 
-#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Nyeste tilføjelser"
 
-#: views/elements/pitch.thtml:49
 msgid "sidebar_pitch_search"
 msgstr "en søgetjeneste"
 
-#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Abonner på"
 
-#: views/elements/pitch.thtml:48 views/elements/pitch.thtml:54
 msgid "sidebar_pitch_theme"
 msgstr "et tema"
 
-#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Opdaterede tilføjelser"
 
-#: 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
+#. %1$s is a number
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Ikke bedømt endnu"
 
-#: views/elements/stars.thtml:54
+#. %1 is the number of stars this add-on has
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Bedømmelse: %s ud af 5 stjerner"
 
-#: views/statistics/addon.thtml:59
 msgid "statistics_addon_dashboard_link"
 msgstr "Dashboard Home"
 
-#: views/statistics/addon.thtml:58
 msgid "statistics_addon_developertools_link"
 msgstr "Developer Tools"
 
-#: views/statistics/addon.thtml:53
 msgid "statistics_addon_switch"
 msgstr "Switch Add-on"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. This is a date format.
+#. http://php.net/strftime
 msgid "statistics_date_shortmonth"
 msgstr "%b. %e"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. This is a date format.
+#. http://php.net/strftime
 msgid "statistics_date_shortmonthwithyear"
 msgstr "%b. %e, %Y"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:147 views/statistics/addon.thtml:158
+#. This is a date format.
+#. http://php.net/strftime
 msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %b. %e"
 
-#: controllers/components/stats.php:517
+#. %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"
 
-#: controllers/components/stats.php:498
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s released"
 
-#: views/statistics/addon.thtml:71
 msgid "statistics_help_close_link"
 msgstr "Close"
 
-#: views/statistics/addon.thtml:60
 msgid "statistics_help_link"
 msgstr "Help"
 
-#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "or, select another add-on"
 
-#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "or, select an add-on with public statistics"
 
-#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Select one of your add-ons to view its statistics"
 
-#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Select an add-on to view its statistics"
 
-#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Select an add-on with public statistics"
 
-#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Statistics Dashboard"
 
-#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "View Statistics"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
-#, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "none"
 
-#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Remove this plot"
 
-#: controllers/statistics_controller.php:224
-#, fuzzy
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
-#, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:225
-#, fuzzy
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s found in range"
 
-#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Add Plot"
 
-#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Add another plot to this graph"
 
-#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Hide Total Count"
 
-#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Show Total Count"
 
-#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "View Data (CSV)"
 
-#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Get a Comma Separated Values file of this data"
 
-#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Hide %s Events"
 
-#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Show %s Events"
 
-#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Overlay add-on release dates on the plots"
 
-#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Hide Firefox Events"
 
-#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Show Firefox Events"
 
-#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Overlay Firefox release dates on the plots"
 
-#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Collapse Graph"
 
-#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expand Graph"
 
-#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Resize the graph"
 
-#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Active Daily Users"
 
-#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Custom"
 
-#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operating System"
 
-#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Add-on Status"
 
-#: controllers/statistics_controller.php:227
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Summary"
 
-#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Add-on Version"
 
-#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Application"
 
-#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Operating System"
 
-#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Add-on Status"
 
-#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Unknown"
 
-#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Add-on Version"
 
-#: views/statistics/addon.thtml:104
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "There is not yet enough data to display this graph. Please check back later."
 
-#: views/statistics/addon.thtml:116
 msgid "statistics_notice_data_none"
 msgstr ""
 "We don't have any data for your add-on yet. Please check back in a few days."
 
-#: views/statistics/addon.thtml:41
 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."
 
-#: views/statistics/addon.thtml:122
 msgid "statistics_notice_disabled"
 msgstr ""
 "The Statistics Dashboard is currently disabled. Please check back later."
 
-#: views/statistics/addon.thtml:109
 msgid "statistics_notice_nojavascript"
 msgstr "JavaScript is required to view the Statistics Dashboard graphs."
 
-#: views/statistics/addon.thtml:44
 msgid "statistics_notice_settings_updated"
 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:216
 msgid "statistics_pagetitle"
 msgstr "Statistics Dashboard"
 
-#: views/statistics/addon.thtml:85
 msgid "statistics_plot_legend_adu"
 msgstr "Active Daily Users"
 
-#: views/statistics/addon.thtml:81
 msgid "statistics_plot_legend_downloads"
 msgstr "Daily Downloads"
 
-#: views/statistics/addon.thtml:93
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Zoom In"
 
-#: views/statistics/addon.thtml:92
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Zoom in one month"
 
-#: views/statistics/addon.thtml:96
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Zoom Out"
 
-#: views/statistics/addon.thtml:95
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out one month"
 
-#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Daily summary of statistics for %1$s"
 
-#: views/statistics/addon.thtml:200
 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:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistics for %1$s"
 
-#: 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:45
 msgid "statistics_settings_access_heading"
 msgstr "Dashboard Access"
 
-#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Private"
 
-#: 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:49
 msgid "statistics_settings_access_public"
 msgstr "Public"
 
-#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Anyone can view this add-on's statistics"
 
-#: views/statistics/addon.thtml:239
 msgid "statistics_settings_change_link"
 msgstr "Change Settings"
 
-#: views/statistics/addon.thtml:241
 msgid "statistics_settings_confidential"
 msgstr "Please treat this information as confidential."
 
-#: views/statistics/addon.thtml:233
 msgid "statistics_settings_currently_private"
 msgstr "This dashboard is currently <b>private</b>."
 
-#: views/statistics/addon.thtml:229
 msgid "statistics_settings_currently_public"
 msgstr "This dashboard is currently <b>public</b>."
 
-#: views/statistics/addon.thtml:234
 msgid "statistics_settings_locked_alt"
 msgstr "Locked"
 
-#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Return to Dashboard"
 
-#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Save Settings"
 
-#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Statistics Dashboard Settings for %1$s"
 
-#: views/statistics/addon.thtml:230
 msgid "statistics_settings_unlocked_alt"
 msgstr "Unlocked"
 
-#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "App"
 
-#: 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 "Uk"
 
-#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
 msgid "statistics_summary_downloads_average"
 msgstr "Average Daily Downloads"
 
-#: views/statistics/rss/summary.thtml:39
 msgid "statistics_summary_downloads_heading"
 msgstr "Downloads"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Last Day Count"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in the last 7 days"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
 msgid "statistics_summary_downloads_total"
 msgstr "Total Downloads"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Since %1$s"
 
-#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
 msgid "statistics_summary_nodata"
 msgstr "No data yet"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
 msgid "statistics_summary_updatepings_average"
 msgstr "Average Daily Active Users"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Change from previous count"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s on %2$s"
 
-#: views/statistics/rss/summary.thtml:45
 msgid "statistics_summary_updatepings_heading"
 msgstr "Active Daily Users"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
 msgid "statistics_summary_updatepings_total"
 msgstr "Active Daily Users"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "On %1$s"
 
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Statistics"
 
-#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Alle temaer"
 
-#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Gennemse temaer"
 
-#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Skift e-mail-adresse"
 
-#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Skift adgangskode"
 
-#: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Bekræftelseskoden er sendt igen!"
 
-#: views/users/delete.thtml:49
+#. %1 is the email address, %2 is the URL of the user registration page
 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>."
+"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:95
 msgid "user_del_community_sad"
 msgstr "Fællesskabet omkring Mozilla Add-ons er kede af at se dig gå."
 
-#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Bekræft adgangskode"
 
-#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Slet min konto nu"
 
-#: views/users/delete.thtml:62
+#. %1 is the URL of the user's info page
 msgid "user_del_error_addons"
 msgstr ""
 "Du kan ikke slette din konto, hvis du står listet som en <a href=\"%1$s"
-"\">forfatter af en eller flere tilføjelser</a>. For at slette din konto er "
-"du nødt til at få en anden  person i din udviklergruppe til at slette dig "
-"fra listen over forfattere til  dine tilføjelser. Derefter kan du slette din "
-"konto her."
+"\">forfatter af en eller flere tilføjelser</a>. For at slette din konto er du nødt til at få en anden "
+" person i din udviklergruppe til at slette dig fra listen over forfattere til "
+" dine tilføjelser. Derefter kan du slette din konto her."
 
-#: views/users/delete.thtml:69
+#. %1 is a link to the amo-editors mailing list
 msgid "user_del_error_addons_more_questions"
-msgstr ""
-"Har du yderligere spørgsmål, kan du kontakte %1$s for mere information."
+msgstr "Har du yderligere spørgsmål, kan du kontakte %1$s for mere information."
 
-#: 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:78
 msgid "user_del_error_password"
 msgstr "Kontoen blev ikke slettet, da den angivne adgangskode er forkert."
 
-#: views/users/delete.thtml:83
+#. %1 is a link to the amo-admins mailing list
 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."
+"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:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Bekræft sletning af konto"
 
-#: views/users/delete.thtml:93
+#. %1 is the user's email address
 msgid "user_del_header_delete_account"
 msgstr "Slet kontoen %1$s"
 
-#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Farvel!"
 
-#: 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:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
-"Ved at klikke på \"slet\" vil du slette din konto <strong>permanent</"
-"strong>. Dette betyder:"
+"Ved at klikke på \"slet\" vil du slette din konto <strong>permanent"
+"</strong>. Dette betyder:"
 
-#: 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."
+"Dine anmeldelser og bedømmelser vil ikke blive slettet, men de vil ikke længere være "
+"knyttet til dig."
 
-#: views/users/delete.thtml:97
+#. %1 is a link to the amo-editors mailing list
 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."
+"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:123
 msgid "user_del_understand_permanent"
 msgstr "Jeg forstår at dette trin ikke kan annulleres."
 
-#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Slettet bruger"
 
-#: views/users/edit.thtml:58 views/users/edit.thtml:59
+#. %1 is the new email address
 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."
+"æ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:183
 msgid "user_edit_delete_user"
 msgstr "Slet konto"
 
-#: views/users/email/confirm_plain.thtml:6
+#. 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 ""
@@ -4397,35 +4683,35 @@ msgstr ""
 "\n"
 "%1$s\n"
 "\n"
-"Når du har aktiveret din konto, kan du smide denne e-mail væk.\n"
+"NÃ¥r du har aktiveret din konto, kan du smide denne e-mail "
+"væk.\n"
 "\n"
 "Tak fordi du tilmeldte dig %2$s Add-ons\n"
 "-- %2$s Add-ons"
 
-#: views/users/email/emailchange_plain.thtml:6
-#: views/users/email/emailchange_plain.thtml:8
+#. %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"
 "\n"
-"For at bekræfte din nye adresse, bedes du klikke på linket herunder eller "
-"kopiere det hele ind i din browsers adresselinje:\n"
+"For at bekræfte din nye adresse, bedes du klikke på linket herunder eller kopiere det hele "
+"ind i din browsers adresselinje:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Du har to døgn til at bekræfte din nye adresse. Hvis du alligevel ikke "
-"ønsker at ændre din adresse, kan du bare ignorere denne e-mail.\n"
+"Du har to døgn til at bekræfte din nye adresse. Hvis du alligevel ikke ønsker at "
+"ændre din adresse, kan du bare ignorere denne e-mail.\n"
 "\n"
 "Tak!\n"
 "-- %2$s Add-ons"
 
-#: controllers/users_controller.php:168
 #, php-format
 msgid "user_email_confirm_subject"
 msgstr "Tak fordi du tilmeldte dig %s Add-ons"
 
-#: views/users/email/pwreset_plain.thtml:5
+#. This is the password reset email
+#. %1 is the pw reset URL, %2 is the application
 #, php-format
 msgid "user_email_pwreset"
 msgstr ""
@@ -4437,207 +4723,158 @@ msgstr ""
 "\n"
 "%1$s\n"
 "\n"
-"Har du ikke anmodet om denne e-mail, skal du ikke foretage dig noget "
-"yderligere.\n"
+"Har du ikke anmodet om denne e-mail, skal du ikke foretage dig noget yderligere.\n"
 "\n"
 "Tak,\n"
 "-- %2$s Add-ons"
 
-#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Nulstil din adgangskode til %s Add-ons"
 
-#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Fejl!"
 
-#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#. %1 is the application name
 #, php-format
 msgid "user_emailchange_subject"
 msgstr "Bekræft ændring af e-mail-adresse hos %1$s Add-ons"
 
-#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Succes!"
 
-#: views/users/emailchange.thtml:52
+#. %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."
+"Din e-mail-adresse blev ændret. Fra nu af skal du bruge "
+"%1$s for at logge ind."
 
-#: 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: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:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "E-mail-adresse"
 
-#: 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: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:93 views/users/edit.thtml:126
-#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Website URL"
 
-#: 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:322
 msgid "user_form_login"
 msgstr "Brugerlogin"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Ny adgangskode"
 
-#: 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:150
 msgid "user_form_oldpassword"
 msgstr "Gammel adgangskode"
 
-#: 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:63
 msgid "user_form_password"
 msgstr "Adgangskode"
 
-#: controllers/users_controller.php:93
 msgid "user_form_registration"
 msgstr "Registrering af ny bruger"
 
-#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Husk mig på denne computer"
 
-#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Vis sandkasse?"
 
-#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Gem"
 
-#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Log ind"
 
-#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Registrer"
 
-#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Bruger af %s Add-ons siden"
 
-#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Opret ny brugerkonto"
 
-#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Kompatibilitet vedrørende tilføjelser (anbefales kraftigt)"
 
-#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Kommende begivenheder og konkurrencer"
 
-#: 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: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:"
+"begivenheder relateret til tilføjelser. Vælg hvad du er interesseret i herunder:"
 
-#: 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:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Der var fejl i de indtastede ændringer. Ret dem venligst og indsend igen."
 
-#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profil opdateret."
 
-#: views/users/pwreset.thtml:65
 #, php-format
 msgid "user_pwreset_for_email"
 msgstr "Adgangskode nulstillet for %s"
 
-#: controllers/users_controller.php:226
 msgid "user_pwreset_header"
 msgstr "Adgangskode nulstillet"
 
-#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Har du glemt din adgangskode?"
 
-#: 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:293
 msgid "user_pwreset_okay"
 msgstr "Adgangskoden blev nulstillet."
 
-#: views/users/pwreset.thtml:82
 msgid "user_pwreset_submit_changepw"
 msgstr "Indsend ændring af adgangskode"
 
-#: views/users/pwreset.thtml:57
 msgid "user_pwreset_submit_sendlink"
 msgstr "Send link til ændring af adgangskode"
 
-#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
 
-#: views/users/activatefirst.thtml:49
+#. %1 is the user's email address, %2 is the current app
 #, php-format
 msgid "user_register_click_confirm_link"
 msgstr ""
 "Et link til aktivering af din brugerkonto er sendt af sted via e-mail til "
-"din adresse, %1$s. Du skal klikke på linket i denne e-mail, før du kan logge "
-"ind på %2$s Add-ons."
+"din adresse, %1$s. Du skal klikke på linket i denne e-mail, før du kan logge ind på %2$s Add-ons."
 
-#: views/users/register_complete.thtml:50
+#. %1 is the user's email address
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -4645,15 +4882,13 @@ msgstr ""
 "Før du kan logge ind, skal du aktivere kontoen ved at klikke på linket i e-"
 "mailen."
 
-#: views/users/activatefirst.thtml:51
 msgid "user_register_confirmation_link_text"
 msgstr "sende bekræftelsesmeddelelsen igen"
 
-#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Tillykke! Din brugerkonto er nu oprettet."
 
-#: views/users/activatefirst.thtml:51
+#. %1 is the link to the "resend confirmation code" page
 #, php-format
 msgid "user_register_resend_confirmation_link"
 msgstr ""
@@ -4661,76 +4896,61 @@ msgstr ""
 "maiservice ikke markerede den som \"spam\". Har du behov for det, kan vi %1"
 "$s til din e-mail-adresse, som står herover."
 
-#: views/users/register_complete.thtml:52
+#. %1 is the link to the Mozilla Add-ons front page
 #, php-format
 msgid "user_register_welcome"
 msgstr "Tak fordi du registrerede dig og velkommen til %1$s!"
 
-#: 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:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Beskeder"
 
-#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Brugerprofil"
 
-#: controllers/users_controller.php:209
 msgid "user_verified_okay"
 msgstr "Godkendt!"
 
-#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Slet konto"
 
-#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Redigering af brugerkonto"
 
-#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Tilføjelser fra %1$s"
 
-#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Navn"
 
-#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Brugerprofil"
 
-#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "E-mail-adresser"
 
-#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Hjemmeside"
 
-#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Kaldenavn"
 
-#: 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:110
-#, fuzzy
+#. %1 is the user's name
 msgid "users_info_reviews_by_user"
-msgstr "Reviews by %s"
+msgstr "Anmeldelser skrevet af %s"
 
-#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Log ind"
 
-#: views/users/login.thtml:53
+#. %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 ""
@@ -4738,7 +4958,8 @@ msgstr ""
 "allerede en konto hos Mozilla Add-ons, bedes du logge ind, eller du kan <a "
 "href=\"%1$s\">lære mere om sandkassen.</a>"
 
-#: views/users/login.thtml:56
+#. %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 ""
@@ -4746,10 +4967,8 @@ msgstr ""
 "Mozilla Add-ons, bedes du logge ind, eller du kan <a href=\"%1$s\">lære mere "
 "om sandkassen.</a>"
 
-#: controllers/users_controller.php:223 controllers/users_controller.php:225
 msgid "users_pwreset_pagetitle"
 msgstr "Nulstilling af adgangskode"
 
-#: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Registrering af ny bruger"
diff --git a/site/app/locale/da/pages/experimental_addons.thtml b/site/app/locale/da/pages/experimental_addons.thtml
deleted file mode 100644
index 3a5ae1f..0000000
--- a/site/app/locale/da/pages/experimental_addons.thtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<h1>Eksperimentelle tilføjelser</h1>
-
-
-<h2>Hvad er en eksperimentel tilføjelse?</h2>
-
-<p>Eksperimentelle tilføjelser er henvendt til avancerede brugere, som kan teste tilføjelserne, før de godkendes og gøres tilgængelige for alle andre. Mange af disse tilføjelser kan være prototyper. Eksperimentelle tilføjelser kan være alpha- eller betaversioner eller kan have en kvalitet, ydeevne eller funktionalitet, som ikke er klar til færdig udgivelse.</p>
-
-<p>Vær forsigtig ved installation af eksperimentelle tilføjelser, da de ikke er testet af en redaktør og kan beskadige din computer.</p>
-
-<h2>Hvordan kan jeg genkende en eksperimentel tilføjelse, når jeg ser en på websiden?</h2>
-
-<p>Eksperimentelle tilføjelser er markeret med teksten "eksperimentel", og du kan kun installere dem, når du er logget ind.</p>
-
-
-<h2>Hvorfor skal jeg logge ind for at installere eksperimentelle tilføjelser?</h2>
-
-<p>Hjemmesiden kræver at brugere logger ind for at installere eksperimentelle tilføjelser som en påmindelse om, at man er ved at gøre noget risikofyldt.</p>
-
-
-<h2>Behøver jeg at logge ind eller oprette en brugerkonto for at installere en offentlig tilføjelse?</h2>
-
-<p>Nej. Hjemmesiden kræver ikke, at du har en brugerkonto, eller at du er logget ind for at installere en offentlig tilføjelse.</p>
-
diff --git a/site/app/locale/de/LC_MESSAGES/messages.po b/site/app/locale/de/LC_MESSAGES/messages.po
index 671fe03..1b630c9 100644
--- a/site/app/locale/de/LC_MESSAGES/messages.po
+++ b/site/app/locale/de/LC_MESSAGES/messages.po
@@ -20,6 +20,10 @@ msgstr ""
 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 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
@@ -48,38 +52,34 @@ msgstr "Öffentliche Seite"
 msgid "a_header_sandbox"
 msgstr "Sandkasten"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Hinzugefügt am %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Aktualisiert am %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "Downloads insgesamt"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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
+#. %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"
@@ -96,21 +96,22 @@ msgstr "pro Seite"
 msgid "addon_list_sortby"
 msgstr "Sortieren nach:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s ist für %2$s nicht verfügbar."
 
-# %1 is the addon name
+#. %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
@@ -119,7 +120,7 @@ msgstr "%1$s ist für %2$s nicht verfügbar."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Zurück zu %1$s..."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -138,6 +139,7 @@ msgstr "Bewertungstext"
 msgid "addon_review_add_submit"
 msgstr "Abschicken"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -171,22 +173,24 @@ msgstr "Ja"
 msgid "addon_review_delete_header"
 msgstr "Bewertung löschen"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Die Bewertung wurde gelöscht."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Bewertung für %s editieren"
 
-# %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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 ""
 "Fehler beim Melden dieser Bewertung: Der Beschreibungstext darf nur zwischen "
 "10 und 100 Zeichen lang sein. Ihre Beschreibung umfasste %1$s Zeichen."
 
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -197,7 +201,7 @@ msgstr ""
 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.
+#. %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"
@@ -205,16 +209,16 @@ msgid_plural "addon_review_others_by_user"
 msgstr[0] "%1$s vorherige Bewertung von %2$s für dieses Add-on anzeigen."
 msgstr[1] "%1$s vorherige Bewertungen von %2$s für dieses Add-on anzeigen."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Bewertungen für %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -228,13 +232,13 @@ msgstr "Entwickler-Antwort:"
 msgid "addon_review_saved_successfully"
 msgstr "Die Bewertung wurde erfolgreich gespeichert!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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
+#. %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
@@ -257,11 +261,13 @@ msgstr "Vorheriges Add-on"
 msgid "addon_version_permalink"
 msgstr "Direkter Link zu dieser Version"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "Die neueste Version, die kompatibel ist mit: "
+#. %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 "Die neueste Version, die mit %1$s %2$s kompatibel ist"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Anzeigen"
 
@@ -269,29 +275,28 @@ msgstr "Anzeigen"
 msgid "addons_author_tooltip"
 msgstr "Das Profil des Autors anzeigen"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
-#, fuzzy
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
-msgstr "Browse all Themes :: %1$s Add-ons"
+msgstr "Alle Themes anzeigen :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
-#, fuzzy
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
-msgstr "Browse %1$s Themes :: %2$s Add-ons"
+msgstr "Alle %1$s Themes anzeigen :: %2$s Add-ons"
 
 #: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Eine Bewertung schreiben"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Weitere Details"
 
@@ -299,11 +304,11 @@ msgstr "Weitere Details"
 msgid "addons_display_categories"
 msgstr "Kategorien"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "Detaillierte Bewertung"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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"
@@ -312,94 +317,100 @@ msgstr "Nicht so gut"
 msgid "addons_display_edit_review"
 msgstr "Ihre Bewertung editieren"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Dieses Add-on hat eine Datenschutzerklärung."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Entwickler-Kommentare"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Homepage"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Bewertungen"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Hilfe"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Okay"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Ausführliche Beschreibung"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Weitere Bilder"
 
-# %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:421
-#, fuzzy
+#. %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] "Weitere Add-ons von %1$s"
-msgstr[1] "Other add-ons by these authors"
+msgstr[1] "Weitere add-ons von diesen Autoren"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
 "Unterstützung für diese Erweiterung gibt der Entwickler unter der E-Mail-"
 "Adresse %s."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "Unterstützung für diese Erweiterung gibt der Entwickler unter %s oder unter "
 "der E-Mail-Adresse %s."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Bewertung"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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 "
@@ -407,51 +418,51 @@ msgstr ""
 "nicht, und deshalb kann dieser Sie nicht erreichen, wenn das zur Lösung des "
 "Problems notwendig ist."
 
-# %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "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:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Speichern"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Alle Bewertungen anzeigen (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Alle Versionen anzeigen"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Gesamte Versionsgeschichte"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Quelltext anzeigen"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Statistiken"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Was halten Sie davon?"
 
@@ -461,7 +472,7 @@ msgstr "Kompatibel mit:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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"
@@ -472,10 +483,11 @@ msgstr "von"
 msgid "addons_home_feature_head"
 msgstr "Empfohlenes Add-on:"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -491,7 +503,9 @@ msgstr "Neueste:"
 msgid "addons_home_other_applications"
 msgstr "Andere Anwendungen"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -501,19 +515,20 @@ msgstr "Andere Anwendungen"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -610,6 +625,7 @@ msgstr "für Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "für Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -630,12 +646,13 @@ msgstr ""
 "Multimedia-Dateien. Plugins unterscheiden sich ein wenig von Erweiterungen, "
 "die existierende Funktionen des Browsers verändern oder neue hinzufügen."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Übliche Plugins für %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
@@ -646,6 +663,7 @@ msgstr "Plugins"
 msgid "addons_plugins_support_documentation"
 msgstr "Benutzer-Dokumentation: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -653,25 +671,25 @@ msgstr ""
 "%1$s hat einen Endbenutzer-Lizenzvertrag. Bevor Sie es installieren können, "
 "müssen Sie diesem zustimmen:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Vorschaubilder für %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Empfohlene Add-ons"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Empfohlene Add-ons"
 
@@ -679,6 +697,7 @@ msgstr "Empfohlene Add-ons"
 msgid "addons_searchengines_additional_resources"
 msgstr "Weiterführende Links"
 
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
@@ -696,35 +715,35 @@ msgstr ""
 "es deaktiviert. Bitte aktivieren Sie JavaScript, bevor Sie versuchen, eine "
 "der untenstehenden Suchmaschinen zu installieren."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %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 "Im %2$s erfahren Sie, wie Sie Ihr eigenes %1$s können."
 
-# link path to search plugins instructions, relative to devmo
+#. 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 "/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:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "Suchmaschinen-Plugin erstellen"
 
-# %1 is the link to mycroft.mozdev.org
+#. %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 "Viele weitere Suchmaschinen können Sie auf %1$s finden."
 
-# link text to mycroft.mozdev.org
+#. 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:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Suchmaschinen-Plugins"
 
@@ -738,7 +757,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Deaktiviert"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Unvollständige Version"
 
@@ -777,11 +796,12 @@ msgstr ""
 "angezeigt. Sie sollten jedoch stets die neueste Version eines Add-ons "
 "installieren."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Versionsgeschichte mit Entwickler-Kommentaren"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Versionsgeschichte von %1$s"
@@ -794,6 +814,7 @@ msgstr "Gruppe hinzufügen"
 msgid "admin_group_delete_pagetitle"
 msgstr "Gruppen löschen"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -919,16 +940,20 @@ msgstr "Versionsüberprüfung nicht beachten"
 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: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: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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -941,23 +966,23 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Aktualisieren Sie Firefox</a>, um dieses "
 "Add-on zu verwenden"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Add-ons nach Name"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Neueste Add-ons"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Beliebte Add-ons"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Add-ons nach Bewertung"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Aktualisierte Add-ons"
 
@@ -989,7 +1014,7 @@ msgstr "Nach Aktualität"
 msgid "category_extra_mostpopular"
 msgstr "Nach Beliebtheit"
 
-# %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"
@@ -999,167 +1024,160 @@ msgstr "Alle %1$s anzeigen"
 msgid "collection_not_found"
 msgstr "Liste nicht gefunden!"
 
+#. %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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
-#, fuzzy
 msgid "compatibility_dashboard_center_header"
-msgstr "Add-on Compatibility Center"
+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: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."
+"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:107
-#, fuzzy
 msgid "compatibility_dashboard_loading"
-msgstr "Loading data..."
+msgstr "Daten werden geladen..."
 
 #: views/compatibility/dashboard.thtml:41
-#, fuzzy
 msgid "compatibility_dashboard_main_link"
-msgstr "Back to Main"
+msgstr "Zurück zur Hauptseite"
 
 #: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
-#, fuzzy
 msgid "compatibility_dashboard_report"
-msgstr "Add-on Compatibility Report"
+msgstr "Add-on-Kompatibilitäts-Report"
 
 #: 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"
+msgstr "Informationen für Add-on-Entwickler"
 
 #: views/compatibility/developers.thtml:64
-#, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
-msgstr "Adjust maxVersion without uploading"
+msgstr "maxVersion anpassen ohne Hochladen"
 
 #: views/compatibility/dashboard.thtml:128
-#, fuzzy
 msgid "compatibility_developers_check_status"
-msgstr "Check Status of My Add-ons"
+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: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."
+"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:118
-#, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
 #: views/compatibility/developers.thtml:71
-#, fuzzy
 msgid "compatibility_developers_no_addons"
-msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
+msgstr "Sie haben keine Add-ons auf Mozilla Add-ons hochgeladen."
 
 #: views/compatibility/dashboard.thtml:137
 #: views/compatibility/developers.thtml:53
-#, fuzzy
 msgid "compatibility_developers_results"
-msgstr "Add-on Status Check Results"
+msgstr "Ergebnisse der Add-on-Statusprüfung"
 
 #: views/compatibility/dashboard.thtml:141
-#, fuzzy
 msgid "compatibility_developers_retrieving"
-msgstr "Retrieving status of hosted add-ons..."
+msgstr "Status Ihrer Add-ons wird geladen..."
 
+#. %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
-#, fuzzy
 msgid "compatibility_developers_user_count"
-msgstr "%1$s %2$s users (%3$s&#37; of total)"
+msgstr "%1$s %2$s Benutzer (%3$s&#37; von allen)"
 
 #: 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."
+"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:98
-#, fuzzy
 msgid "compatibility_report_detailed_link"
-msgstr "View Detailed Report"
+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: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."
+"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:85
-#, fuzzy
 msgid "compatibility_report_legend_alpha"
-msgstr "Alpha Versions"
+msgstr "Alpha-Versionen"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
-#, fuzzy
 msgid "compatibility_report_legend_alpha_description"
-msgstr "Add-ons compatible with an alpha version of %1$s"
+msgstr "Add-ons, die mit einer Alpha-Version von %1$s kompatibel sind"
 
 #: views/compatibility/dashboard.thtml:89
-#, fuzzy
 msgid "compatibility_report_legend_beta"
-msgstr "Beta Versions"
+msgstr "Beta-Versionen"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: 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"
+msgstr "Add-ons, die mit einer Beta-Version von %1$s kompatibel sind"
 
 #: views/compatibility/dashboard.thtml:93
-#, fuzzy
 msgid "compatibility_report_legend_latest"
-msgstr "Latest Version"
+msgstr "Neueste Version"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: 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"
+msgstr "Add-ons, die mit den neuesten Versionen von %1$s kompatibel sind"
 
 #: views/compatibility/dashboard.thtml:81
-#, fuzzy
 msgid "compatibility_report_legend_other"
-msgstr "Other Versions"
+msgstr "Andere Versionen"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
-#, fuzzy
 msgid "compatibility_report_legend_other_description"
-msgstr "Add-ons not compatible with any version of %1$s"
+msgstr "Add-ons, die mit keiner Version von %1$s kompatibel sind"
 
 #: views/compatibility/dashboard.thtml:66
-#, fuzzy
 msgid "compatibility_report_title"
-msgstr "Add-on Compatibility Report"
+msgstr "Add-on-Kompatibilitäts-Report"
 
 #: 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"
+msgstr "Informationen für Add-on-Benutzer"
 
 #: views/compatibility/dashboard.thtml:48
-#, fuzzy
 msgid "compatibility_view_report"
-msgstr "View Compatibility Report"
+msgstr "Kompatibilitäts-Report anzeigen"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: 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:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "Wiki-Seite"
 
@@ -1201,26 +1219,35 @@ msgstr ""
 "\"http://creativecommons.org/licenses/by/2.5/deed.de\">Creative Commons "
 "Attribution 2.5 Lizenz</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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"
 
-# date and time format string (strftime)
+#. 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.%m.%Y %H:%M"
@@ -1246,14 +1273,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 msgstr "Statistische Auswertung"
 
+#. %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
+#, 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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 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"
@@ -1301,36 +1356,36 @@ msgstr "Schritt 5: Erfolreicher Abschluss"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ãœbermittlungshilfe"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Add-on wurde erfolgreich deaktiviert"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Add-on bearbeiten"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Add-on wurde erfolgreich aktiviert"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Add-on-Beschreibung"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "Endbenutzer-Lizenzerklärung"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Add-on-Homepage"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Add-on-Name"
 
@@ -1339,40 +1394,298 @@ msgstr "Add-on-Name"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Vorschauuntertitel"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Datenschutzerklärung"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Add-on-Zusammenfassung"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Support-E-Mail"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "Support-URL"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Versionshinweise"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Add-on nominieren"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Add-on wurde erfolgreich nominiert!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1397,7 +1710,7 @@ msgstr ""
 "Moderator. Ãœber den Abschluss dieses Prozesses werden Sie per E-Mail "
 "informiert."
 
-# %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"
@@ -1407,7 +1720,7 @@ msgstr "%s können Sie mehr über das Sandkastenprinzip zur Bewertung erfahren."
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "Hier"
 
-# %1 is the "nominate" link
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1430,16 +1743,16 @@ msgstr ""
 "Da Ihrem Add-on vertraut wird, wurde es automatisch für die öffentlichen "
 "Seiten genehmigt."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Add-on hochladen"
 
-#: controllers/developers_controller.php:2375
+#: 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
+#. %1 is the link to the preview upload page
 #: views/developers/add_step5.thtml:71
 #, php-format
 msgid "devcp_addon_upload_preview"
@@ -1450,7 +1763,7 @@ msgstr ""
 msgid "devcp_addon_upload_preview_link"
 msgstr "eine Vorschau hochladen"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1479,10 +1792,102 @@ msgstr "Weiter"
 msgid "devcp_change_addontype"
 msgstr "Add-on-Typ ändern:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "Entwicklerkommentare aktualisiert."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Vorschau hinzufügen"
@@ -1575,6 +1980,7 @@ msgstr "Dieser Entwickler hat keine Support-URL hinterlegt."
 msgid "devcp_details_trusted"
 msgstr "Vertraut"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1605,6 +2011,7 @@ msgstr ""
 "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"
@@ -1625,11 +2032,58 @@ msgstr ""
 "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"
+
+#: views/developers/discuss.thtml:57
+msgid "devcp_discuss_allreplies_header"
+msgstr "Alle Antworten"
+
+#. 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 ""
+"Beim Speichern Ihrer Antwort ist ein Fehler aufgetreten. Bitte kontaktieren "
+"Sie %1$s wegen dieses Problems."
+
+#. %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 ""
+"Ein Mozilla Add-ons Editor hat um weitere Informationen hinsichtlich der "
+"Version %2$s Ihres Add-ons %1$s gebeten."
+
+#. %1 is the add-on name
+#: views/developers/discuss.thtml:43
+msgid "devcp_discuss_pagetitle"
+msgstr "Mehr Informationen zur Bewertung von %1$s abgeben"
+
+#. submit button text
+#: views/developers/discuss.thtml:79
+msgid "devcp_discuss_submit_reply"
+msgstr "Antwort abschicken"
+
+#: views/developers/discuss.thtml:72
+msgid "devcp_discuss_success_message"
+msgstr ""
+"Ihre Antwort wurde erfolgreich gespeichert. Die anderen Teilnehmer an dieser "
+"Diskussion werden davon per E-Mail in Kenntnis gesetzt."
+
+#. 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 "geschrieben von %1$s am %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Entwickler hinzufügen"
@@ -1642,10 +2096,297 @@ msgstr "E-Mail-Adresse des Entwicklers"
 msgid "devcp_edit_author_remove"
 msgstr "Löschen"
 
+#: 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 "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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
+#, 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 "Entwickler"
@@ -1711,6 +2452,206 @@ msgstr "Zielsprache"
 msgid "devcp_edit_locale_disambiguation_explanation"
 msgstr "kurzer weiterer Hinweis (etwa Name des Dialekts)"
 
+#: 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 "Aktualisieren"
@@ -1721,11 +2662,66 @@ 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
+#, fuzzy
+msgid "devcp_editbox_authors"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Empfohlene Add-ons"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1734,7 +2730,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Eine wartende Bewertung"
 msgstr[1] "Wartende Bewertungen (%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
 #, php-format
@@ -1743,7 +2739,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Ein nominiertes Add-on"
 msgstr[1] "Nominierte Add-ons (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1756,8 +2752,8 @@ msgstr[1] "Wartende Updates (%s)"
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "Ausgewählte Dateien werden gelöscht."
 
-# %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"
@@ -1783,29 +2779,30 @@ msgstr "Hinweise an die Moderatoren"
 msgid "devcp_editversion_submit_update"
 msgstr "Ãœbermitteln"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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 "
@@ -1815,21 +2812,35 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Bitte beachten Sie auch %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 "diese Seite"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, fuzzy, php-format
+msgid "devcp_error_file_exists"
+msgstr ""
+"Eine Version dieses Add-ons existiert bereits. Um sie zu ersetzen, löschen "
+"Sie bitte zunächst die Datei %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"
@@ -1837,7 +2848,7 @@ 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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Nicht alle GUIDs stimmen überein."
 
@@ -1866,6 +2877,8 @@ msgstr "Überschreitet die maximale Upload-Größe"
 msgid "devcp_error_http_nofile"
 msgstr "Noch keine Datei hochgeladen"
 
+#. %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"
@@ -1873,15 +2886,16 @@ msgstr ""
 "Diese Dateinamen-Erweiterung (%s) ist für ein Icon nicht erlaubt. Bitte "
 "verwenden Sie eine der folgenden: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Keine install.rdf gefunden."
 
@@ -1889,21 +2903,26 @@ 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:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Bitte wählen Sie einen Add-on-Typ."
 
+#. %$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 "%s ist keine gültige Version für %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "Die ID dieses Add-ons ist ungültig: %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"
@@ -1924,6 +2943,7 @@ msgstr ""
 "Die Version dieses Add-ons ist ungültig: Versionsnummern dürfen keine "
 "Leerstellen beinhalten."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1933,6 +2953,7 @@ msgstr "Der folgende Fehler trat beim Parsen der Datei install.rdf auf: %s"
 msgid "devcp_error_move_file"
 msgstr "Datei konnte nicht verschoben werden"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1955,15 +2976,15 @@ 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:2718
+#: 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:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "Sie können keine Vorabversion eines Add-ons nominieren."
 
-#: controllers/developers_controller.php:2704
+#: 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."
@@ -1976,6 +2997,8 @@ msgstr "Bitte wählen Sie mindestens eine Kategorie aus."
 msgid "devcp_error_one_user"
 msgstr "Dieses Add-on muss mindestens einen Entwickler haben."
 
+#. %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"
@@ -1983,13 +3006,13 @@ msgstr ""
 "Diese Dateinamen-Erweiterung (%s) ist für eine Vorschau nicht erlaubt. Bitte "
 "verwenden Sie eine der folgenden: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Sie haben keine Berechtigung dieses Add-on zu aktualisieren."
 
@@ -2005,7 +3028,7 @@ 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Bitte laden Sie eine Datei hoch."
@@ -2226,7 +3249,7 @@ msgstr "Meine Add-ons"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Lokalisierte Felder"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2271,33 +3294,68 @@ msgstr "Add-on hochladen"
 msgid "devcp_myaddons_title"
 msgstr "Entwickler"
 
+#. %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 "Zurück zu den 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 "%s nominieren"
 
-# %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 "Automatisch erkannter Add-on-Typ: %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 ""
 "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)
+#. %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"
@@ -2313,9 +3371,14 @@ msgstr ""
 "Die Ernennung dieser Grafik zur Standardvorschau entfernt den Status der "
 "Standardvorschau von der derzeitigen Standardvorschau."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2344,6 +3407,60 @@ msgstr "Vorschau bearbeiten"
 msgid "devcp_preview_updated_successfully"
 msgstr "Vorschau erfolgreich aktualisiert."
 
+#: 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 ""
@@ -2355,10 +3472,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Vorschau hinzufügen"
 
+#: 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 "Vorschau bearbeiten"
 
+#: 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 "Vorschaudatei"
@@ -2367,6 +3494,34 @@ msgstr "Vorschaudatei"
 msgid "devcp_previews_label_makedefault"
 msgstr "Diese Grafik zur Standardvorschau machen."
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Vorschau löschen"
@@ -2383,45 +3538,160 @@ msgstr "Vorschau bearbeiten"
 msgid "devcp_previews_submit_upload"
 msgstr "Vorschau hochladen"
 
+#: 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 "Falsch?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Sind Sie sicher, dass Sie diese Datei löschen möchten?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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 "
 "Entwickler vor dem weitern Vorgehen."
 
+#: 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 "Die Überarbeitung meiner derzeitigen Add-on-Informationen überspringen"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> aktive tägliche Nutzer"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> Downloads insgesamt"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Downloads pro Woche"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "Das Ãœbermitteln von Add-ons ist momentan deaktiviert. Bitte versuchen Sie es "
@@ -2429,13 +3699,13 @@ msgstr ""
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Ich akzeptiere"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Ich lehne ab"
 
@@ -2451,11 +3721,11 @@ msgstr "Deaktiviert"
 msgid "devcp_summary_header_trusted"
 msgstr "Vertraut"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Neueste 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"
@@ -2466,7 +3736,7 @@ msgstr ""
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "hier"
 
-# %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"
@@ -2476,30 +3746,669 @@ msgstr "Bitte stellen Sie sicher, dass Sie %s für Ihr Theme hochladen."
 msgid "devcp_theme_upload_preview_link"
 msgstr "eine Vorschau"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Bitte lesen Sie %s für weitere Informationen."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "diese Seite"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Version bearbeiten"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Version erfolgreich aktualisiert."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Dieses Add-on ist deaktiviert."
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "Dieses Add-on ist momentan nicht zur Veröffentlichung nominiert."
+
+#: controllers/components/editors.php:213
+msgid "editor_review_error_file_not_pending"
+msgstr "Diese Datei wartet gegenwärtig nicht auf Freischaltung."
+
+#. Actions are, for example: approving or rejecting
+#: controllers/components/editors.php:79
+#: controllers/components/editors.php:182
+msgid "editor_review_error_no_action"
+msgstr "Bitte wählen Sie eine Aktion aus."
+
+#: controllers/components/editors.php:192
+msgid "editor_review_error_no_applications"
+msgstr ""
+"Bitte geben Sie die Anwendungen ein, mit denen Sie das Add-on getestet haben."
+
+#. 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 "Bitte geben Sie einen Kommentar ein."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Bitte wählen Sie mindestens eine Datei aus."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr ""
+"Bitte wählen Sie die Betriebssysteme aus, mit denen Sie getestet haben."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filtern"
@@ -2508,7 +4417,7 @@ msgstr "Filtern"
 msgid "editorcp_logs_filter_by"
 msgstr "Nach Typ/Aktion filtern"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Bewertungslogbuch"
 
@@ -2560,6 +4469,7 @@ msgstr "Kommentare verstecken"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Kommentare zeigen"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2569,7 +4479,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Moderationslogbuch"
 
@@ -2593,24 +4503,24 @@ msgstr "Aktuellste Moderationen"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Bewertungen gesamt"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Add-on moderieren"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Bitte vervollständigen Sie die folgenden Felder:"
 
-#: controllers/editors_controller.php:461
+#: 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:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Selbstmoderation ist nicht erlaubt."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Externe Software"
 
@@ -2622,39 +4532,39 @@ msgstr "Empfehlung hinzufügen"
 msgid "editors_featured_add_feature_submit"
 msgstr "Hinzufügen"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Erfolgreich hinzugefügt."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Entfernen fehlgeschlagen."
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Erfolgreich entfernt."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Empfohlene Add-ons"
 
@@ -2687,39 +4597,40 @@ 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
+#. %1 is the queue mode
 #: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 Tag"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 Stunde"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 Minute"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Moderatorenwerkzeuge"
 
-#: controllers/editors_controller.php:286
+#. %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 "nur %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Vorveröffentlichung"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2733,21 +4644,25 @@ msgstr "Löschen"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Moderationsauftrag"
 
+#: views/editors/review.thtml:153
+msgid "editors_review_action_info"
+msgstr "Mehr Infos anfordern"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Veröffentlichen"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Intensive Untersuchung anfordern"
 
@@ -2755,33 +4670,41 @@ msgstr "Intensive Untersuchung anfordern"
 msgid "editors_review_action_sandbox"
 msgstr "Im Sandkasten belassen"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Bewertungen bearbeiten"
 
-#: views/editors/review.thtml:167
+#: views/editors/review.thtml:176
+msgid "editors_review_details_info_request"
+msgstr ""
+"Verwenden Sie dieses Formular, um vom Autor mehr Informationen anzufordern. "
+"Der Autor bekommt dann eine E-Mail und kann an dieser Stelle auf die Frage "
+"antworten. Wenn der Autor das getan hat, erhalten Sie einen Hinweis per E-"
+"Mail."
+
+#: 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:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Das Add-on wird im Sandkasten belassen"
 
-#: views/editors/review.thtml:159
+#: 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:162
+#: 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:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Im Falle von Unsicherheit über die Sicherheit des Add-ons, "
@@ -2809,15 +4732,15 @@ msgstr "Kategorien:"
 msgid "editors_review_header_compatibility"
 msgstr "Kompatibilität:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Beschreibung"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Entwicklerkommentare"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "Endbenutzer-Lizenzvereinbarung (EULA)"
 
@@ -2825,85 +4748,108 @@ msgstr "Endbenutzer-Lizenzvereinbarung (EULA)"
 msgid "editors_review_header_files"
 msgstr "Dateien:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Add-on-Historie"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Nominierungs-Nachricht"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Vorschaubilder"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Datenschutzerklärung"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Moderiere %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Hinweise an den Moderator"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Zusammenfassung"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Versionshinweise"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Antwort"
+
+#: views/elements/developers/editors_review_history_item.thtml:78
+msgid "editors_review_history_info_request"
+msgstr "Info-Anforderung"
+
+#: views/elements/developers/editors_review_history_item.thtml:62
+#: views/editors/reviewlog.thtml:77
 msgid "editors_review_history_nominated_adminreview"
 msgstr "Untersuchung durch Admin"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Nominierung genehmigt/Öffentlich"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Nominierung abgelehnt/Sandkasten"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Es wurden bisher keine Moderationen für dieses Add-on durchgeführt."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Untersuchung durch Admin"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Update genehmigt/Öffentlich"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Update abgelehnt/Sandkasten"
 
-#: views/editors/review.thtml:198
+#. 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] "Antwort zeigen/verstecken (%1$s)"
+msgstr[1] "Antworten zeigen/verstecken (%1$s)"
+
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Anwendungen:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "oder wählen Sie eine Antwortvorlage:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Kommentare:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Betriebssysteme:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Nach oben"
 
@@ -2911,7 +4857,7 @@ msgstr "Nach oben"
 msgid "editors_review_next_link"
 msgstr "weiter &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Keine Vorschau gefunden."
 
@@ -2919,41 +4865,47 @@ msgstr "Keine Vorschau gefunden."
 msgid "editors_review_previous_link"
 msgstr "&laquo; zurück"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %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>Nr. %1$s</strong> von %2$s Add-ons in der Liste"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Aktion ausführen"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Aktion"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Kommentare"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Datum"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Moderator"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Version/Datei"
 
-#: controllers/editors_controller.php:411
+#: 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:422
 msgid "editors_reviewed_successfully"
 msgstr "Moderation erfolgreich übermittelt"
 
@@ -2977,7 +4929,7 @@ msgstr "Aktion"
 msgid "editors_reviews_in_reply_to"
 msgstr "Antwort auf:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Moderationen erfolgreich übermittelt!"
 
@@ -2989,23 +4941,23 @@ msgstr "Im Moment sind keine Bewertungen zu moderieren."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Moderation übermitteln"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Seitenabhängig"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Neu"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Aktualisiert"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Getestete Anwendungen"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Getestete Betriebssysteme"
 
@@ -3046,17 +4998,20 @@ msgstr "Betriebssystemart"
 msgid "editors_th_submissiontypes"
 msgstr "Ãœbermittelungstypen"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s Tage"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s Stunden"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s Minuten"
@@ -3065,23 +5020,24 @@ msgstr "%s Minuten"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Zugriff verweigert"
 
 #: views/errors/error401.thtml:52
 msgid "error_access_denied_message"
 msgstr ""
-"Sie haben nicht die erforderlichen Berechtigungen, um diese Seite angezigt "
+"Sie haben nicht die erforderlichen Berechtigungen, um diese Seite angezeigt "
 "zu bekommen."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3091,18 +5047,19 @@ msgstr ""
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Add-on nicht gefunden!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Dieses Add-on kann hier nicht angezeigt werden."
 
@@ -3110,7 +5067,7 @@ 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:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Keine Add-ons in dieser Kategorie gefunden!"
 
@@ -3132,24 +5089,25 @@ msgstr "Dies ist keine korrekte E-Mail-Adresse!"
 msgid "error_field_required"
 msgstr "Dieses Feld darf nicht leer sein."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Datei nicht gefunden!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Dateifehler: %s existiert nicht."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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 ""
@@ -3168,16 +5126,18 @@ msgstr ""
 "Dies ist keine gültige URL. Erlaubte URLs sehen etwa wie folgt aus: http://"
 "example.com/meine_seite."
 
+#. %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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3195,7 +5155,7 @@ msgstr "Hinweis"
 msgid "error_preview_notfound"
 msgstr "Vorschau nicht gefunden!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Sie müssen eine Bewertung abgeben."
 
@@ -3248,8 +5208,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Benutzername oder Passwort falsch!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Version nicht gefunden!"
 
@@ -3261,13 +5221,14 @@ msgstr "Falsches Passwort!"
 msgid "feature_learnmore"
 msgstr "Mehr erfahren"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Erfahren Sie mehr über %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3279,6 +5240,40 @@ msgstr[1] "%s Bewertungen"
 msgid "feature_view_more_from_category"
 msgstr "Mehr aus"
 
+#. 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 "Zurück zum 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
+msgid "file_browser_link_expand_all"
+msgstr "Alle Verzeichnisse ausklappen"
+
+#. 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 "Zurück zur Bewertungsseite"
+
+#. 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 :: Datei-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
+msgid "file_browser_toggle_expand_collapse"
+msgstr "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Alle Rechte vorbehalten."
@@ -3315,7 +5310,7 @@ msgstr "Andere Sprachen:"
 msgid "footer_privacy_policy"
 msgstr "Datenschutzhinweise"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Speichern"
 
@@ -3323,7 +5318,7 @@ msgstr "Speichern"
 msgid "general_addontype_dict"
 msgstr "Wörterbuch"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Wörterbücher"
@@ -3332,7 +5327,7 @@ msgstr "Wörterbücher"
 msgid "general_addontype_extension"
 msgstr "Erweiterung"
 
-# 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Erweiterungen"
@@ -3341,7 +5336,7 @@ msgstr "Erweiterungen"
 msgid "general_addontype_lpaddon"
 msgstr "Sprachpaket (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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Sprachpakete (Add-on)"
@@ -3350,7 +5345,7 @@ msgstr "Sprachpakete (Add-on)"
 msgid "general_addontype_lpapp"
 msgstr "Sprachpaket (Anwendung)"
 
-# 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Sprachpakete (Anwendung)"
@@ -3359,7 +5354,7 @@ msgstr "Sprachpakete (Anwendung)"
 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
@@ -3368,7 +5363,7 @@ msgstr "Plugins"
 msgid "general_addontype_search"
 msgstr "Suchmaschine"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Suchmaschinen"
@@ -3377,11 +5372,12 @@ msgstr "Suchmaschinen"
 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Themes"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3412,12 +5408,12 @@ msgid "header_navlink_addons"
 msgstr "Add-ons"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Ausloggen"
 
@@ -3425,38 +5421,42 @@ msgstr "Ausloggen"
 msgid "header_navlink_myaccount"
 msgstr "Mein Konto"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Neu anmelden"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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.
+#. %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 ""
 "<a href=\"%1$s\">Einloggen</a> zum Installieren. <a href=\"%2$s\">Warum?</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 "Zu %s %s hinzufügen"
 
-# %1 is the add-on name, %2 is the app name
+#. %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 "%1$s zu %2$s hinzufügen"
 
+#. %1$s is the add-on name
 #: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3479,7 +5479,7 @@ msgid "langtools_download_langpack"
 msgstr "Sprachpaket herunterladen"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Wörterbücher und Sprachpakete"
 
@@ -3535,7 +5535,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3568,7 +5572,7 @@ msgstr "Themes"
 msgid "other_apps_tooltip"
 msgstr "Add-ons für andere Anwendungen finden"
 
-# In a user list: user 1, user 2, "others"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "andere"
@@ -3581,36 +5585,34 @@ msgstr "Anwendungs-Versionen"
 msgid "page_title_credits"
 msgstr "Danksagungen"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Experimentelle Add-ons"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
+msgstr "Häufig gestellte Fragen"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox: Häufige Fragen"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Add-ons-Richtlinien"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Datenschutzhinweise"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Bewertungs-Richtlinien"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Das \"Sandkasten\"-System"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Hilfe beim Hochladen"
 
@@ -3629,6 +5631,7 @@ msgstr ""
 "besitzen, welche mindestens eine der folgenden Anwendungen zu unterstützen "
 "hat. Nur die aufgelisteten Versionen der Anwendungen sind erlaubt."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3636,6 +5639,8 @@ msgstr ""
 "Falls die von Ihnen unterstützte Anwendung keine install.rdf verlangt, so "
 "müssen Sie trotzdem diese mit den %s erklärten Eigenschaften hinzufügen."
 
+#. 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 "hier"
@@ -3644,7 +5649,6 @@ msgstr "hier"
 msgid "pages_appversions_versions"
 msgstr "Versionen"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Zurück zur vorherigen Seite"
 
@@ -3656,7 +5660,7 @@ msgstr "Der Sandkasten - Wissenswertes"
 msgid "pagination_next_page"
 msgstr "nächste Seite"
 
-# %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"
@@ -3680,8 +5684,8 @@ msgstr "Geben Sie Ihre Antwort hier ein:"
 msgid "recaptcha_enter_whatyouhear"
 msgstr "Bitte geben Sie ein, was Sie hören."
 
-# %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 ""
@@ -3689,8 +5693,8 @@ msgstr ""
 "anderes anhören</a> oder <a href=\"%2$s\">zurück zu einer Text-Abfrage "
 "wechseln</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
 msgid "recaptcha_hardtoread_text"
 msgstr ""
@@ -3706,7 +5710,7 @@ msgstr "Sind Sie ein Mensch?"
 msgid "recaptcha_whatsthis"
 msgstr "Was ist das?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Fehler beim Markieren dieser Bewertung!"
 
@@ -3731,7 +5735,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam oder anderweitiger Inhalt, der keine Bewertung ist"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Danke; diese Bewertung wurde zur Moderation markiert."
 
@@ -3745,7 +5749,7 @@ msgstr ""
 "Ist diese Bewertung unpassend, ungenau oder Spam? Klicken Sie hier, um sie "
 "zur Überprüfung durch einen Moderator zu markieren."
 
-# %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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3766,21 +5770,22 @@ msgstr ""
 "li></ul><p>Bitte lesen Sie die <a href=\"%2$s\">Richtlinien für Bewertungen</"
 "a> für genauere Informationen über Add-on-Bewertungen von Benutzern.</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 "Bewertungen für %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Empfohlene Add-ons"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Die neuesten Add-ons"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Aktualisierte Add-ons"
 
@@ -3819,6 +5824,7 @@ msgstr "Alle Suchmaschinen"
 msgid "search_landing_browse_search_engines"
 msgstr "Alle Suchmaschinen durchsuchen"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3838,12 +5844,13 @@ msgstr "Add-on-Suche"
 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:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Suchergebnisse für: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Administration"
 
@@ -3851,7 +5858,7 @@ msgstr "Administration"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Entwickler"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Moderatoren"
 
@@ -3859,6 +5866,7 @@ msgstr "Moderatoren"
 msgid "sidebar_navlink_welcome"
 msgstr "Herzlich Willkommen"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3896,6 +5904,7 @@ msgstr "Themes"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Aktualisierte Add-ons"
 
+#. %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
@@ -3907,7 +5916,7 @@ msgstr "%1$s KB"
 msgid "stars_not_yet_rated"
 msgstr "Noch nicht bewertet"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3925,24 +5934,32 @@ msgstr "Entwickler"
 msgid "statistics_addon_switch"
 msgstr "Add-on wechseln"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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."
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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:147 views/statistics/addon.thtml:158
+#: 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 "%1$s erstellt"
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3985,10 +6002,9 @@ msgstr "Statistische Auswertung"
 msgid "statistics_index_view_button"
 msgstr "Statistiken anzeigen"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
-#, fuzzy
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
-msgstr "View this table in CSV format"
+msgstr "Diese Tabelle im CSV-Format anzeigen"
 
 #: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
@@ -3999,117 +6015,118 @@ msgid "statistics_js_dropdowns_removeplot"
 msgstr "Diesen Graph entfernen"
 
 #: controllers/statistics_controller.php:224
-#, fuzzy
 msgid "statistics_js_groupby_selector_date"
-msgstr "Group by: Day"
+msgstr "Gruppieren nach: Tag"
 
-#: controllers/statistics_controller.php:226
-#, fuzzy
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
-msgstr "Group by: Month"
+msgstr "Gruppieren nach: Monat"
 
 #: controllers/statistics_controller.php:225
-#, fuzzy
 msgid "statistics_js_groupby_selector_week"
-msgstr "Group by: Week"
+msgstr "Gruppieren nach: Woche"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Vergleichen nach: Woche"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s im Bereich gefunden"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Graph hinzufügen"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Weiteren Graph zur Grafik hinzufügen"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Gesamtzahl ausblenden"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Gesamtzahl anzeigen"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Gesamtzahl hier aufzeichnen"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Daten anzeigen (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Zeigt eine kommaseparierte Liste dieser Daten"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "%s-Ereignisse ausblenden"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "%s-Ereignisse anzeigen"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Firefox-Ereignisse ausblenden"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Firefox-Ereignisse anzeigen"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Grafik verkleinern"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Grafik erweitern"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Größe der Grafik ändern"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Tägliche Nutzer"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Anwendung"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Benutzerdefiniert"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Betriebssystem"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Status des Add-on"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Zusammenfassung"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Version des Add-ons"
 
@@ -4133,13 +6150,13 @@ msgstr "Unbekannt"
 msgid "statistics_longnames_version"
 msgstr "Version des Add-ons"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "Momemtan liegen nicht genügend Daten für die Generierung dieser Grafik vor. "
 "Bitte versuchen Sie es später noch einmal."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "Wir verfügen noch nicht über Daten für Ihr Add-on. Bitte versuchen Sie es in "
@@ -4152,13 +6169,13 @@ msgstr ""
 "derzeitigen Daten unvollständig sein können. Bitte versuchen Sie es in ein "
 "paar Minuten noch einmal."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr ""
 "Die statistische Auswertung ist momentan deaktiviert. Bitte versuchen Sie es "
 "später noch einmal."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "Für die statistische Auswertung wird JavaScript benötigt."
 
@@ -4173,36 +6190,36 @@ msgstr "Ihre Einstellungen wurden aktualisiert."
 msgid "statistics_pagetitle"
 msgstr "Statistische Auswertung"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Tägliche Nutzer"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Tägliche Downloads"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Hineinzoomen"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Um einen Monat hereinzommen"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Herauszoomen"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Um einen Monat herauszoomen"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Tägliche Zusammenfassung der Statistiken für %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "RSS-Feed der Zusammenfassung"
 
@@ -4243,23 +6260,23 @@ msgstr "Öffentlich"
 msgid "statistics_settings_access_public_description"
 msgstr "Jeder kann auf die Add-on-Statistiken zugreifen"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Einstellungen ändern"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Bitte beachten Sie diese Einstellung als vertraulich"
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Die Statistiken sind derzeit <b>privat</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Die Statistiken sind derzeit <b>öffentlich</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "privat"
 
@@ -4276,7 +6293,7 @@ msgstr "Einstellungen speichern"
 msgid "statistics_settings_title"
 msgstr "Einstellungen der statistischen Auswertung für %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "öffentlich"
 
@@ -4300,7 +6317,7 @@ msgstr "Uk"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Durchschnitt Downloads pro Tag"
 
@@ -4308,37 +6325,37 @@ msgstr "Durchschnitt Downloads pro Tag"
 msgid "statistics_summary_downloads_heading"
 msgstr "Downloads"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Am letzten gezählten Tag"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in den letzten sieben Tagen"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Downloads insgesamt"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Seit %1$s"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Noch keine Daten"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Durchschnitt tägliche Nutzer"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Veränderung"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s am %2$s"
@@ -4347,17 +6364,17 @@ msgstr "%1$s am %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Aktive tägliche Nutzer"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Aktive tägliche Nutzer"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Für %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Statistiken für %1$s"
@@ -4382,7 +6399,7 @@ msgstr "Passwort ändern"
 msgid "user_confirmationcode_resent"
 msgstr "Bestätigungscode erneut versandt!"
 
-# %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:49
 msgid "user_del_account_deleted"
 msgstr ""
@@ -4402,7 +6419,7 @@ msgstr "Passwort bestätigen"
 msgid "user_del_deletenow"
 msgstr "Löschen Sie mein Benutzerkonto jetzt"
 
-# %1 is the URL of the user's info page
+#. %1 is the URL of the user's info page
 #: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4412,7 +6429,7 @@ msgstr ""
 "von der Autorenliste entfernen. Danach werden Sie dazu in der Lage sein, "
 "hier Ihr Konto zu löschen."
 
-# %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "Wenn Sie noch Fragen haben, kontaktieren Sie bitte %1$s."
@@ -4428,7 +6445,7 @@ 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
+#. %1 is a link to the amo-admins mailing list
 #: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4440,7 +6457,7 @@ msgstr ""
 msgid "user_del_header_confirm_deletion"
 msgstr "Löschung bestätigen"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Benutzerkonto \"%1$s\" löschen"
@@ -4465,7 +6482,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4483,7 +6500,7 @@ msgstr ""
 msgid "user_deleted_nickname"
 msgstr "Gelöschter Benutzer"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4496,9 +6513,9 @@ msgstr ""
 msgid "user_edit_delete_user"
 msgstr "Benutzerkonto löschen"
 
-# 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4517,7 +6534,7 @@ msgstr ""
 "Danke, dass Sie sich bei %2$s Add-ons angemeldet haben!\n"
 "-- das %2$s Add-ons Team"
 
-# %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4542,8 +6559,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Danke, dass Sie sich bei %1$s Add-ons angemeldet haben"
 
-# 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
 #, php-format
 msgid "user_email_pwreset"
@@ -4572,7 +6589,7 @@ msgstr "Zurücksetzen Ihres %s Add-ons-Passworts"
 msgid "user_emailchange_error"
 msgstr "Fehler!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4582,7 +6599,7 @@ msgstr "Bitte bestätigen Sie Ihre E-Mail-Adressänderung bei %1$s Add-ons"
 msgid "user_emailchange_success"
 msgstr "Erfolgreich durchgeführt!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4752,7 +6769,7 @@ msgstr "Link per E-Mail senden"
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
 
-# %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"
@@ -4761,7 +6778,7 @@ msgstr ""
 "bestätigen. Bevor Sie sich einloggen können, müssen Sie den in der Mail "
 "enthaltenen Link aufrufen, um Ihr Konto zu aktivieren."
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4778,7 +6795,7 @@ msgstr "erneut zuschicken lassen"
 msgid "user_register_congratulations"
 msgstr "Glückwunsch, Ihr Benutzerkonto wurde erfolgreich angelegt!"
 
-# %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"
@@ -4788,7 +6805,7 @@ msgstr ""
 "ggf. im dafür vorgesehenen Ordner gelandet ist. Wenn es nötig ist, können "
 "Sie sich die E-Mail an ihre o.g. Adresse %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4848,18 +6865,17 @@ msgstr "Spitzname"
 msgid "users_info_pagetitle"
 msgstr "Benutzer-Info über %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
-#, fuzzy
 msgid "users_info_reviews_by_user"
-msgstr "Reviews by %s"
+msgstr "Bewertungen von %s"
 
 #: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Benutzer-Login"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4868,8 +6884,8 @@ msgstr ""
 "Sie bereits ein Konto bei Mozilla Add-ons haben, so melden Sie sich bitte "
 "an, oder <a href=\"%1$s\">erfahren Sie mehr über den Sandkasten.</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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4886,3 +6902,52 @@ msgstr "Passwort zurücksetzen"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Benutzerkonto anlegen"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Die neueste Version, die kompatibel ist mit: "
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "addon_recommended"
+#~ msgstr "Dieses Add-on wird von Mozilla empfohlen"
+
+#~ msgid "recaptcha_enter_numbers"
+#~ msgstr "Bitte geben Sie die <strong>Zahlen</strong>, die Sie hören, ein."
+
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to a text captcha
+#~ msgid "recaptcha_hardtohear"
+#~ msgstr ""
+#~ "Falls dies schwer zu verstehen ist, können Sie <a href=\"%1$s\">andere "
+#~ "Zahlen</a> ausprobieren oder zurück zu <a href=\"%2$s\">einer Text-"
+#~ "Abfrage wechseln</a>."
+
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to an audio captcha
+#~ msgid "recaptcha_hardtoread"
+#~ msgstr ""
+#~ "Falls dies schwer zu lesen ist, können Sie sich <a href=\"%1$s\">andere "
+#~ "Wörter anzeigen lassen</a> oder sich stattdessen <a href=\"%2$s\">Zahlen "
+#~ "ansagen lassen</a>."
diff --git a/site/app/locale/de/pages/experimental_addons.thtml b/site/app/locale/de/pages/experimental_addons.thtml
deleted file mode 100644
index c7feb21..0000000
--- a/site/app/locale/de/pages/experimental_addons.thtml
+++ /dev/null
@@ -1,36 +0,0 @@
-<h1>Experimentelle Add-ons</h1>
-
-<h2>Was ist ein experimentelles Add-on?</h2>
-
-<p>Experimentelle Add-ons sind für fortgeschrittene Benutzer bestimmt, die
-Add-ons testen möchten, bevor diese öffentlich verfügbar gemacht werden oder
-auf ihre Qualität überprüft wurden. Viele dieser Add-ons sind Protoypen.
-Experimentelle Add-ons können im Alpha-, Beta- oder Vorveröffentlichungs-Status
-sein und variieren daher hinsichtlich Qualität, Leistung und Funktionalität.</p>
-
-<p>Experimentelle Add-ons sollten nur vorsichtig verwendet werden, denn sie
-wurden noch nicht von einem Editor überprüft und könnten daher potentiell
-Probleme enthalten, die die Einstellung oder Leistung Ihres Computers
-beeinträchtigen können.</p>
-
-
-<h2>Wie kann ich erkennen, dass ein Add-on experimentell ist?</h2>
-
-<p>Experimentelle Add-ons sind mit einem "experimentell"-Hinweis versehen, und
-um sie zu installieren, muss man sich am System anmelden.</p>
-
-
-<h2>Warum muss ich mich einloggen, um ein experimentelles Add-on zu installieren?</h2>
-
-<p>Die Add-ons-Webseite erfordert, dass sich ein Benutzer anmeldet, um experimentelle
-Add-ons zu installieren, um daran zu erinnern, dass dieser Schritt ein gewisses
-Risiko beinhaltet, und nur vorgenommen werden sollte, wenn man sich dessen
-bewusst ist.</p>
-
-
-<h2>Muss ich mich einloggen, oder einen Benutzernamen einrichten, wenn ich ein
-öffentliches Add-ons installieren möchte?</h2>
-
-<p>Nein. Sie müssen sich nicht an der Add-ons-Webseite anmelden oder einen
-Benutzernamen einrichten, wenn Sie ein öffentliches Add-on installieren möchten.</p>
-
diff --git a/site/app/locale/el/LC_MESSAGES/messages.po b/site/app/locale/el/LC_MESSAGES/messages.po
index c867d16..1bca9f6 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-02-14 17:26+0200\n"
+"PO-Revision-Date: 2009-03-09 15:31+0200\n"
 "Last-Translator: Γιώ�γος Φιωτάκης <fiotakis@otenet.gr>\n"
 "Language-Team: el-GR <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,85 +17,68 @@ msgstr ""
 msgid "a_cancel_installation"
 msgstr "Ακ��ωση εγκατάστασης"
 
-#: 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
+#. 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 "Λήψη τώ�α %s"
 
-#: views/addons/policy.thtml:78
-#: views/addons/policy.thtml:79
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Αποδοχή και λήψη"
 
-#: views/addons/policy.thtml:81
-#: views/addons/policy.thtml:83
+#: 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/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
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Π�οστέθηκε"
-
-#: views/elements/addon_listitem.thtml:145
-#: views/elements/feature.thtml:111
-#: views/addons/display.thtml:103
-#: views/addons/browse_thumbs.thtml:87
+#. %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 "Ενημε�ώθηκε %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Έκδοση %s"
 
-#: views/elements/addon_listitem.thtml:136
-#: views/elements/feature.thtml:103
-#: views/addons/display.thtml:115
-#: views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "συνολικές λήψεις"
 
-#: views/elements/addon_listitem.thtml:136
-#: views/elements/feature.thtml:103
-#: views/addons/display.thtml:114
-#: views/addons/display.thtml:118
+#: 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:118
-#: views/addons/browse.thtml:75
+#. %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"
@@ -111,39 +94,35 @@ msgstr "ανά σελίδα"
 msgid "addon_list_sortby"
 msgstr "Ταξινόμηση κατά :"
 
-#: views/elements/addon_listitem.thtml:69
-#: views/elements/feature.thtml:89
-#: views/addons/display.thtml:51
-#: views/addons/browse_thumbs.thtml:67
+#: 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/elements/addon_listitem.thtml:72
-#: views/addons/browse_thumbs.thtml:70
+#: 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:57
 msgid "addon_not_available_for_platform"
 msgstr "Δεν είναι διαθέσιμο το %1$s για %2$s."
 
 # %1 is the addon 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
+#. %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 "Πίσω στο %1$s..."
 
 # %1 is the addon name
-#: views/reviews/flag.thtml:58
-#: views/reviews/add.thtml:127
+#. %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"
@@ -161,6 +140,7 @@ msgstr "Αξιολόγηση:"
 msgid "addon_review_add_submit"
 msgstr "Υποβολή αξιολόγησης"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -170,8 +150,7 @@ msgstr "Π�οσθήκη αξιολόγησης για το %s"
 msgid "addon_review_add_title_field"
 msgstr "Τίτλος/πε�ίληψη:"
 
-#: views/reviews/display.thtml:81
-#: views/reviews/display.thtml:165
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Διαγ�αφή"
 
@@ -195,46 +174,58 @@ msgstr "�αι"
 msgid "addon_review_delete_header"
 msgstr "Διαγ�αφή αξιολόγησης"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Διαγ�άφτηκε με επιτυχία η αξιολόγηση."
 
+#. %s is the name of the add-on
 #: 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:534
+#. %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:49
 msgid "addon_review_in_moderation"
-msgstr "Σημείωση: Π�ιν εμφανιστεί στο κοινό, η αξιολόγησή σας θα επεξε�γαστεί από κάποιον συντάκτη μας."
+msgstr ""
+"Σημείωση: Π�ιν εμφανιστεί στο κοινό, η αξιολόγησή σας θα επεξε�γαστεί από "
+"κάποιον συντάκτη μας."
 
 #: 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: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
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -248,33 +239,28 @@ msgstr "Απάντηση δημιου�γο�:"
 msgid "addon_review_saved_successfully"
 msgstr "Ευχα�ιστο�με! η αξιολόγησή σας αποθηκε�θηκε με επιτυχία"
 
-#: views/addons/display.thtml:285
-#: views/addons/display.thtml:288
-#: views/reviews/display.thtml:72
-#: views/reviews/display.thtml:75
+#: 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:77
-#: views/reviews/delete.thtml:49
+#. %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 "από το χ�ήστη %1$s στις %2$s (βαθμολόγηση %3$s)"
 
 #: views/addons/category_landing.thtml:138
-#: views/addons/category_landing.thtml:139
-#: views/addons/home.thtml:113
+#: 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/category_landing.thtml:129 views/addons/home.thtml:103
 #: views/addons/home.thtml:104
 msgid "addon_slider_tooltip_previous"
 msgstr "Π�οηγο�μενο π�όσθετο"
@@ -283,33 +269,39 @@ msgstr "Π�οηγο�μενο π�όσθετο"
 msgid "addon_version_permalink"
 msgstr "Μόνιμος δεσμός αυτής της έκδοσης."
 
-#: views/addons/versions.thtml:123
-#: views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-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:118
+msgid "addon_versions_getlatestversion"
+msgstr "Η πιο π�όσφατη συμβατή έκδοση  με τον %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Μετάβαση"
 
-#: views/elements/fyf_promotion.thtml:51
-#: 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:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "Πε�ιήγηση σε όλα τα θέματα :: Π�όσθετα %1$s"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "Πε�ιήγηση σε θέματα: %1$s :: Π�όσθετα %2$s"
 
@@ -317,7 +309,7 @@ msgstr "Πε�ιήγηση σε θέματα: %1$s :: Π�όσθετα %2$s"
 msgid "addons_display_add_review"
 msgstr "Π�οσθήκη αξιολόγησης"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Αναλυτικές λεπτομέ�ειες"
 
@@ -325,12 +317,11 @@ msgstr "Αναλυτικές λεπτομέ�ειες"
 msgid "addons_display_categories"
 msgstr "Κατηγο�ίες"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "λεπτομε�ής αξιολόγηση"
 
-#: views/addons/display.thtml:368
-#: views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Δε μου α�έσει"
@@ -339,145 +330,158 @@ msgstr "Δε μου α�έσει"
 msgid "addons_display_edit_review"
 msgstr "Επεξε�γασία αξιολόγησης"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Αυτό το π�όσθετο συνοδε�εται από ξεχω�ιστή πολιτική απο��ήτου."
 
-#: views/addons/display.thtml:367
-#: views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Σχόλια δημιου�γο�"
 
-#: views/addons/display.thtml:208
-#: views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Α�χική σελίδα"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Αξιολογήσεις"
 
-#: views/addons/display.thtml:225
-#: views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Υποστή�ιξη"
 
-#: views/addons/display.thtml:369
-#: views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Μου α�έσει"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Αναλυτική πε�ιγ�αφή"
 
-#: views/addons/display.thtml:371
-#: views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 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:421
+#. %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] "Άλλα π�όσθετα από:  %1$s"
 msgstr[1] "Άλλα π�όσθετα απ' αυτο�ς τους δημιου�γο�ς"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
-msgstr "Υποστή�ιξη γι' αυτή την επέκταση θα β�είτε στη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου %s."
+msgstr ""
+"Υποστή�ιξη γι' αυτή την επέκταση θα β�είτε στη διε�θυνση ηλεκτ�ονικο� "
+"ταχυδ�ομείου %s."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr "Υποστή�ιξη γι' αυτή την επέκταση θα β�είτε στο %s ή στη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου %s."
+msgstr ""
+"Υποστή�ιξη γι' αυτή την επέκταση θα β�είτε στο %s ή στη διε�θυνση "
+"ηλεκτ�ονικο� ταχυδ�ομείου %s."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Υποστή�ιξη γι' αυτή την επέκταση θα β�είτε στο %s."
 
-#: views/addons/display.thtml:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Βαθμολόγηση"
 
-#: views/addons/display.thtml:370
-#: views/reviews/add.thtml:107
+#: 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:387
-#: views/addons/display.thtml:390
+#: 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:405
+#. %1 is the review guidelines link
+#: 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:396
-#: views/addons/display.thtml:400
+#. %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 "Δείτε το <a href=\"%1$s\">τμήμα υποστή�ιξης</a> για πλη�οφο�ίες σχετικά με το που θα  β�είτε βοήθεια γι' αυτό το π�όσθετο."
+msgstr ""
+"Δείτε το <a href=\"%1$s\">τμήμα υποστή�ιξης</a> για πλη�οφο�ίες σχετικά με "
+"το που θα  β�είτε βοήθεια γι' αυτό το π�όσθετο."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Υποβολή"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Δείτε όλες τις αξιολογήσεις (%1$s)"
 
-#: views/addons/display.thtml:195
-#: views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Δείτε όλες τις εκδόσεις"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Ολοκλη�ωμένο ιστο�ικό εκδόσεων"
 
-#: views/addons/display.thtml:335
-#: views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Δείτε τον πηγαίο κώδικα"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Εμφάνιση στατιστικών"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Πώς σας φαίνεται;"
 
@@ -487,32 +491,27 @@ msgstr "Συμβατό με:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129
-#: views/elements/feature.thtml:95
-#: views/addons/policy.thtml:62
-#: views/addons/display.thtml:68
+#: 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/searchengines.thtml:54
-#: views/addons/category_landing.thtml:79
+#: 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
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Συνιστο�με"
 
-#: controllers/search_controller.php:211
-#: controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254
-#: controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528
-#: controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897
-#: controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
-msgstr "Τα π�όσθετα επεκτείνουν τον %1$s και σας επιτ�έπουν να π�οσα�μόσετε την πε�ιήγηση στα μέτ�α σας.  Ρίξτε μια ματιά και κάντε τον  %1$s κτήμα σας."
+msgstr ""
+"Τα π�όσθετα επεκτείνουν τον %1$s και σας επιτ�έπουν να π�οσα�μόσετε την "
+"πε�ιήγηση στα μέτ�α σας.  Ρίξτε μια ματιά και κάντε τον  %1$s κτήμα σας."
 
 #: views/addons/home.thtml:201
 msgid "addons_home_newest_header"
@@ -522,44 +521,34 @@ msgstr "�εότε�α:"
 msgid "addons_home_other_applications"
 msgstr "Άλλα π�ογ�άμματα"
 
-#: controllers/developers_controller.php:64
+#. %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:610
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:610
 #: 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/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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214
-#: controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530
-#: controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689
-#: controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776
-#: controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58
-#: controllers/pages_controller.php:123
-#: controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -580,10 +569,8 @@ msgstr "Συνιστο�με:"
 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
+#: 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 "Εμφάνιση όλων"
 
@@ -605,7 +592,11 @@ msgstr "Δείτε όλα τα π�όσθετα που ενημε�ώθηκαν
 
 #: 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/install.thtml:107
 msgid "addons_install_in_sunbird_title"
@@ -621,6 +612,8 @@ msgstr ""
 "κουμπί «Εγκατάσταση» και αφο� εντοπίσετε/επιλέξετε το α�χείο που αποθηκε�σατε "
 "κάντε κλικ στο «OK».</li></ol>"
 
+msgstr "<ol><li>κάντε δεξί κλικ πα�ακάτω και επιλέξτε «Αποθήκευση δεσμο� ως...» για να αποθηκε�σετε το α�χείο στο δίσκο σας.</li><li>Στον Mozilla Thunderbird, ανοίξτε τα «Π�όσθετα» μέσα από το μενο� «Ε�γαλεία».</li><li>Κάντε κλικ στο κουμπί «Εγκατάσταση» και αφο� εντοπίσετε/επιλέξετε το α�χείο που αποθηκε�σατε κάντε κλικ στο «OK».</li></ol>"
+
 #: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Εγκατάσταση στον Thunderbird"
@@ -633,12 +626,9 @@ msgstr "π�οβολή πει�αματικών π�όσθετων"
 msgid "addons_options_submit"
 msgstr "Μετάβαση"
 
-#: 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: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 "Από"
@@ -647,20 +637,23 @@ msgstr "Από"
 msgid "addons_plugins_for_linux"
 msgstr "για Linux"
 
-#: views/addons/plugins.thtml:113
-#: views/addons/plugins.thtml:145
+#: 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
+#: 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 "Αυτή η σελίδα αναφέ�ει με�ικές μόνο από τις πιο συνηθισμένες και δημοφιλείς π�όσθετες λειτου�γίες. Για πε�ισσότε�ες πλη�οφο�ίες σχετικά με άλλες π�όσθετες λειτου�γίες, διαθέσιμες για πε�ιηγητές της οικογένειας Mozilla, επισκεφθείτε το  %1$s"
+msgstr ""
+"Αυτή η σελίδα αναφέ�ει με�ικές μόνο από τις πιο συνηθισμένες και δημοφιλείς "
+"π�όσθετες λειτου�γίες. Για πε�ισσότε�ες πλη�οφο�ίες σχετικά με άλλες "
+"π�όσθετες λειτου�γίες, διαθέσιμες για πε�ιηγητές της οικογένειας Mozilla, "
+"επισκεφθείτε το  %1$s"
 
 #: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
@@ -668,141 +661,148 @@ msgstr "Ψάχνετε για μια Ï€Ï�όσθετη λειτουÏ�γία ποÏ
 
 #: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
-msgstr "Οι π�όσθετες λειτου�γίες βοηθο�ν τον πε�ιηγητή να εκτελέσει συγκεκ�ιμένες λειτου�γίες, όπως την εμφάνιση  ειδικών τ�πων γ�αφικών ή την αναπα�αγωγή α�χείων πολυμέσων. Οι π�όσθετες λειτου�γίες είναι ελαφ�ώς διαφο�ετικές από τις επεκτάσεις, οι οποίες τ�οποποιο�ν ή π�οσθέτουν χα�ακτη�ιστικά."
+msgstr ""
+"Οι π�όσθετες λειτου�γίες βοηθο�ν τον πε�ιηγητή να εκτελέσει συγκεκ�ιμένες "
+"λειτου�γίες, όπως την εμφάνιση  ειδικών τ�πων γ�αφικών ή την αναπα�αγωγή "
+"α�χείων πολυμέσων. Οι π�όσθετες λειτου�γίες είναι ελαφ�ώς διαφο�ετικές από "
+"τις επεκτάσεις, οι οποίες τ�οποποιο�ν ή π�οσθέτουν χα�ακτη�ιστικά."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Δημοφιλείς π�όσθετες λειτου�γίες για τον %1$s"
 
-#: controllers/components/amo.php:724
-#: controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Π�όσθετες λειτου�γίες"
 
-#: 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: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:68
 #, php-format
 msgid "addons_policy_eula_require"
-msgstr "Το %s απαιτεί να αποδεχτείτε το πα�ακάτω Συμφωνητικό Αδειδότησης Τελικο� Χ�ήστη για να ξεκκινήσει η εγκατάσταση:"
+msgstr ""
+"Το %s απαιτεί να αποδεχτείτε το πα�ακάτω Συμφωνητικό Αδειδότησης Τελικο� "
+"Χ�ήστη για να ξεκκινήσει η εγκατάσταση:"
 
 # %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Εικόνες π�οεπισκόπησης για το %s"
 
-#: views/addons/recommended.thtml:50
-#: controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 msgid "addons_recommended_introduction"
-msgstr "Με τόσα πολλά διαθέσιμα π�όσθετα, σίγου�α θα υπά�χει κάτι που να σας ται�ιάζει. Για να ξεκκινήσετε, ιδο� μια λίστα με τα πιο δημοφιλή! "
+msgstr ""
+"Με τόσα πολλά διαθέσιμα π�όσθετα, σίγου�α θα υπά�χει κάτι που να σας "
+"ται�ιάζει. Για να ξεκκινήσετε, ιδο� μια λίστα με τα πιο δημοφιλή! "
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Συνιστώμενα π�όσθετα"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Συνιστώμενα π�όσθετα"
 
-#: views/addons/searchengines.thtml:147
-#: views/addons/searchengines.thtml:164
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Π�όσθετοι πό�οι"
 
 # link text devmo
-#: views/addons/searchengines.thtml:153
-#: views/addons/searchengines.thtml:169
+#. link text devmo
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Κέντ�ο δημιου�γών Mozilla"
 
 #: 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:150
-#: views/addons/searchengines.thtml:167
+#. %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 "Μάθετε πώς να %1$s στο %2$s."
 
 # link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:152
-#: views/addons/searchengines.thtml:168
+#. 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 "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 # link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:151
-#: views/addons/searchengines.thtml:168
+#. link text for "make your own" (opensearch engine)
+#: 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:148
-#: views/addons/searchengines.thtml:166
+#. %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 "Πε�ιηγηθείτε σε πε�ισσότε�ες μηχανές αναζήτησης στο %1$s"
 
 # link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:149
-#: views/addons/searchengines.thtml:166
+#. 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:755
-#: controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Μηχανές αναζήτησης"
 
-#: views/addons/searchengines.thtml:154
-#: views/addons/searchengines.thtml:171
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
-msgstr "Ευχα�ιστο�με ειδικά τους συντελεστές του εγχει�ήματος Mycroft για τη δουλειά τους σχετικά με τις μηχανές αναζήτησης του Firefox."
+msgstr ""
+"Ευχα�ιστο�με ειδικά τους συντελεστές του εγχει�ήματος Mycroft για τη δουλειά "
+"τους σχετικά με τις μηχανές αναζήτησης του Firefox."
 
-#: 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: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; Υποψηφιότητα για το δημόσιο χώ�ο"
 
-#: controllers/components/amo.php:195
-#: controllers/components/amo.php:226
+#: controllers/components/amo.php:195 controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "Στο Sandbox; αναμονή αξιολόγησης"
 
-#: controllers/components/amo.php:199
-#: controllers/components/amo.php:228
+#: controllers/components/amo.php:199 controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Δημόσιος χώ�ος"
 
-#: controllers/components/amo.php:193
-#: controllers/components/amo.php:225
+#: controllers/components/amo.php:193 controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "Στο Sandbox"
 
@@ -810,8 +810,7 @@ msgstr "Στο Sandbox"
 msgid "addons_status_unknown"
 msgstr "Άγνωστο"
 
-#: views/elements/fyf_promotion.thtml:50
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Μάθετε πε�ισσότε�α για το π�όσθετο"
 
@@ -821,14 +820,17 @@ msgstr "Συνιστάται π�οσοχή για τις παλαιότε�ες
 
 #: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
-msgstr "Αυτές οι εκδόσεις υπά�χουν για αναφο�ά και πει�αματικο�ς σκοπο�ς. Σας συμβουλε�ουμε να χ�ησιμοποιείτε πάντα την πιο π�όσφατα ενημε�ωμένη έκδοση ενός π�όσθετου."
+msgstr ""
+"Αυτές οι εκδόσεις υπά�χουν για αναφο�ά και πει�αματικο�ς σκοπο�ς. Σας "
+"συμβουλε�ουμε να χ�ησιμοποιείτε πάντα την πιο π�όσφατα ενημε�ωμένη έκδοση "
+"ενός π�όσθετου."
 
-#: views/addons/versions.thtml:50
-#: controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Ιστο�ικό αλλαγών εκδόσεων "
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Ιστο�ικό εκδόσεων %1$s "
@@ -841,6 +843,7 @@ msgstr "Π�οσθήκη ομάδας"
 msgid "admin_group_delete_pagetitle"
 msgstr "Διαγ�αφή ομάδας"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -850,8 +853,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 "Μη έγκυ�ο αναγνω�ιστικό ομάδας"
 
@@ -859,8 +861,7 @@ 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 "Η ομάδα αποθηκε�θηκε"
 
@@ -872,8 +873,7 @@ msgstr "Πε�ισσότε�α"
 msgid "advanced_search_form_any_time"
 msgstr "Χω�ίς ό�ιο"
 
-#: views/elements/search.thtml:95
-#: views/elements/search.thtml:108
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Χω�ίς ό�ιο"
 
@@ -969,44 +969,53 @@ msgstr "αγνόηση ελέγχου έκδοσης"
 msgid "app_compat_older_firefox_only"
 msgstr "Αυτό το π�όσθετο λειτου�γεί με παλιότε�ες εκδόσεις του Firefox."
 
+#. %1$s and %2$s are URLs
 #: 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: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: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:61
 msgid "app_compat_update_firefox"
-msgstr "<a href=\"http://getfirefox.com\">Ενημε�ώστε τον Firefox</a> για να χ�ησιμοποιήσετε αυτό το π�όσθετο."
+msgstr ""
+"<a href=\"http://getfirefox.com\">Ενημε�ώστε τον Firefox</a> για να "
+"χ�ησιμοποιήσετε αυτό το π�όσθετο."
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Π�όσθετα κατά όνομα"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "�εότε�α π�όσθετα"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Δημοφιλή π�όσθετα"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Π�όσθετα κατά βαθμολογία"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 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 "Τ�έχουσα κατηγο�ία"
 
@@ -1035,8 +1044,8 @@ msgid "category_extra_mostpopular"
 msgstr "Π�ώτα τα πιο δημοφιλή"
 
 # %1 is the category name
-#: views/addons/searchengines.thtml:135
-#: views/addons/category_landing.thtml:51
+#. %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"
@@ -1045,14 +1054,24 @@ msgstr "Εμφάνιση όλων σε %1$s"
 msgid "collection_not_found"
 msgstr "Δε β�έθηκε η συλλογή!"
 
+#. %s is a date in the _('date') format
+#: views/elements/collections_interactive_addon.thtml:85
+#, php-format
+msgid "collections_interactive_addon_added"
+msgstr "Π�οστέθηκε"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
-msgstr "Π�οετοιμαστείτε για την έκδοση του %1$s με τα ε�γαλεία και τις πλη�οφο�ίες που διαθέτουμε για την κοινότητα π�όσθετων του %2$s  και θα β�είτε πα�ακάτω."
+msgstr ""
+"Π�οετοιμαστείτε για την έκδοση του %1$s με τα ε�γαλεία και τις πλη�οφο�ίες "
+"που διαθέτουμε για την κοινότητα π�όσθετων του %2$s  και θα β�είτε πα�ακάτω."
 
 #: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
@@ -1062,8 +1081,7 @@ msgstr "Φό�τωση δεδομένων..."
 msgid "compatibility_dashboard_main_link"
 msgstr "Πίσω στην κεντ�ική"
 
-#: views/compatibility/dashboard.thtml:104
-#: views/compatibility/report.thtml:41
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Αναφο�ά συμβατότητας π�όσθετου"
 
@@ -1081,9 +1099,14 @@ msgstr "Π�οσα�μογή του maxVersion χω�ίς αποστολή"
 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: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:118
 msgid "compatibility_developers_mdclogo_alt"
@@ -1102,26 +1125,38 @@ msgstr "Αποτελέσματα ελέγχου κατάστασης Ï€Ï�όσθÎ
 msgid "compatibility_developers_retrieving"
 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:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s χ�ήστες του %2$s  (%3$s&#37; του συνόλου)"
 
 #: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
-msgstr "Τα πα�ακάτω π�όσθετα αποτελο�ν το 95% των π�όσθετων σε χ�ήση που γνω�ίζει ο ο�γανισμός Mozilla και είναι ταξινομημένα κατά ποσοστό χ�ηστών."
+msgstr ""
+"Τα πα�ακάτω π�όσθετα αποτελο�ν το 95% των π�όσθετων σε χ�ήση που γνω�ίζει ο "
+"ο�γανισμός Mozilla και είναι ταξινομημένα κατά ποσοστό χ�ηστών."
 
 #: 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: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:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Δοκιμαστικές εκδόσεις άλφα"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Π�όσθετα συμβατά με  δοκιμαστική έκδοση άλφα του %1$s"
@@ -1130,14 +1165,18 @@ msgstr "ΠÏ�όσθετα συμβατά με  δοκιμαστική έκδοσÎ
 msgid "compatibility_report_legend_beta"
 msgstr "Δοκιμαστικές εκδόσεις βήτα"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
-msgstr "Π�όσθετα συμβατά με δοκιμαστικές βήτα ή υποψήφιες για κυκλοφο�ία εκδόσεις του %1$s"
+msgstr ""
+"Π�όσθετα συμβατά με δοκιμαστικές βήτα ή υποψήφιες για κυκλοφο�ία εκδόσεις "
+"του %1$s"
 
 #: 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:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Π�όσθετα που συμβαδίζουν με τις πιο π�όσφατες εκδόσεις του %1$s"
@@ -1146,6 +1185,7 @@ msgstr "Π�όσθετα που συμβαδίζουν με τις πιο π�ό
 msgid "compatibility_report_legend_other"
 msgstr "Άλλες εκδόσεις"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Π�όσθετα που δεν είναι συμβατά με καμία έκδοση του %1$s"
@@ -1155,8 +1195,7 @@ msgid "compatibility_report_title"
 msgstr "Αναφο�ά συμβατότητας π�όσθετου"
 
 #: views/compatibility/dashboard.thtml:50
-#: views/compatibility/dashboard.thtml:148
-#: views/compatibility/users.thtml:40
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Πλη�οφο�ίες για τους χ�ήστες του π�όσθετου"
 
@@ -1164,18 +1203,21 @@ msgstr "ΠληÏ�οφοÏ�ίες για τους χÏ�ήστες του Ï€Ï�όσθÎ
 msgid "compatibility_view_report"
 msgstr "Π�οβολή αναφο�άς συμβατότητας"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Για πλη�οφο�ίες σχετικές με συνεισφο�ές, πα�ακαλο�με δείτε τη %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "σελίδα wiki"
 
 #: views/pages/credits.thtml:97
 msgid "credits_intro"
-msgstr "Ο ο�γανισμός Mozilla ευχα�ιστεί τους ακόλουθους ανθ�ώπους για τη συνεισφο�ά τους στο έ�γο addons.mozilla.org:"
+msgstr ""
+"Ο ο�γανισμός Mozilla ευχα�ιστεί τους ακόλουθους ανθ�ώπους για τη συνεισφο�ά "
+"τους στο έ�γο addons.mozilla.org:"
 
 #: views/pages/credits.thtml:101
 msgid "credits_section_developers"
@@ -1203,38 +1245,44 @@ msgstr "Λογισμικό και γ�αφικά"
 
 #: 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: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>."
 
 # 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/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147
-#: 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:104
-#: views/addons/display.thtml:286
-#: views/addons/display.thtml:290
-#: 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
+#: 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)
+#. 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, %I:%M %p"
@@ -1260,18 +1308,52 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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. Η επόμενη έκδοση του Firefox θα εκδοθεί σ�ντομα από τον ο�γανισμό Mozilla, οπότε σας πα�ακαλο�με να δοκιμάσετε το π�όσθετό σας  με τη νέα έκδοση και να ελέγξετε τη συμβατότητά του. Μπο�είτε να β�είτε πε�ισσότε�ες πλη�οφο�ίες <a href=\"%2$s\">εδώ</a>. Αυτή είναι μια απλή ειδοποίηση, μπο�είτε να υποβάλετε κανονικά αυτή την έκδοση στο addons.mozilla.org."
+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"
@@ -1309,36 +1391,36 @@ msgstr "Βήμα 5ο: Επιτυχία"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Βοήθεια υποβολής"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Το π�όσθετο απενε�γοποιήθηκε επιτυχώς"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Επεξε�γασία π�όσθετου"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Το π�όσθετο ενε�γοποιήθηκε επιτυχώς"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Πε�ιγ�αφή π�όσθετου"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "Συμφωνητικό αδειοδότησης τελικο� χ�ήστη"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Α�χική σελίδα π�όσθετου"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Όνομα π�όσθετου"
 
@@ -1347,44 +1429,306 @@ msgstr "Όνομα π�όσθετου"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Λεζάντα π�οεπισκόπησης"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Πολιτική απο��ήτου"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Σ�νοψη π�όσθετου"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Διε�θυνση ηλ. ταχυδ�ομείου υποστή�ιξης"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL υποστή�ιξης"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Σημειώσεις έκδοσης"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Υποψηφιότητα π�όσθετου"
 
-#: controllers/developers_controller.php:2729
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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 για να επιστ�έψετε στον πίνακα ελέγχου δημιου�γών."
+msgstr ""
+"Επισκεφθείτε τη σελίδα %1$s για να κάνετε αλλαγές στην εισαγωγή σας, ή %2$s "
+"για να επιστ�έψετε στον πίνακα ελέγχου δημιου�γών."
 
 #: views/developers/add_step5.thtml:76
 msgid "devcp_addon_submission_makechanges_devcp_link"
@@ -1396,23 +1740,34 @@ msgstr "Επεξε�γασία π�όσθετου"
 
 #: views/developers/add_step5.thtml:57
 msgid "devcp_addon_submission_pending"
-msgstr "Η έκδοση αυτή έχει τοποθετηθεί στο sandbox και αναμένεται αξιολόγησή της από τους ελεγκτές του καθώς και από κάποιον συντάκτη π�όσθετων του ο�γανισμο� Mozilla. Θα ενημε�ωθείτε με μήνυμα ηλ. ταχυδ�ομείου όταν π�αγματοποιηθο�ν οι ενέ�γειες αυτές."
+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."
+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 για το π�όσθετό σας και να πε�άσει από μια διαδικασία αξιολόγησης."
+msgstr ""
+"Αυτή η έκδοση έχει τοποθετηθεί στο sandbox και θα μπο�εί να χ�ησιμοποιηθεί "
+"μόνο από έμπει�ους χ�ήστες. Για να εμφανιστεί στο δημόσιο χώ�ο, θα π�έπει να "
+"υποβάλετε  %s για το π�όσθετό σας και να πε�άσει από μια διαδικασία "
+"αξιολόγησης."
 
 #: views/developers/add_step5.thtml:60
 msgid "devcp_addon_submission_sandboxed_nominate_link"
@@ -1424,28 +1779,34 @@ msgstr "Η υποβολή του Ï€Ï�οσθέτου σας ολοκληÏ�ώθηÎ
 
 #: views/developers/add_step5.thtml:54
 msgid "devcp_addon_submission_trusted_public"
-msgstr "Επειδή το π�όσθετό σας θεω�είται έμπιστο, αυτή η έκδοση εγκ�ίθηκε αυτόματα για το δημόσιο χώ�ο."
+msgstr ""
+"Επειδή το π�όσθετό σας θεω�είται έμπιστο, αυτή η έκδοση εγκ�ίθηκε αυτόματα "
+"για το δημόσιο χώ�ο."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Υποβολή π�όσθετου"
 
-#: controllers/developers_controller.php:2375
+#: 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 για να αυξήσετε το ενδιαφέ�ον σχετικά με το π�όσθετό σας."
+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"
@@ -1455,24 +1816,18 @@ msgstr "Δε β�έθηκε ο δημιου�γός [%s]"
 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
+#: 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
+#: 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
+#: 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 "Επόμενο"
 
@@ -1480,10 +1835,102 @@ msgstr "Επόμενο"
 msgid "devcp_change_addontype"
 msgstr "Αλλαγή τ�που π�όσθετου:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "Ενημε�ώθηκαν τα σχόλια δημιου�γο�."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Π�οσθήκη εικόνας π�οεπισκόπησης"
@@ -1562,7 +2009,8 @@ msgstr "Διε�θυνση ηλ. ταχυδ�ομείου υποστή�ιξης
 
 #: views/developers/details.thtml:71
 msgid "devcp_details_supportemail_none"
-msgstr "Ο δημιου�γός δεν πα�έχει διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου για υποστή�ιξη."
+msgstr ""
+"Ο δημιου�γός δεν πα�έχει διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου για υποστή�ιξη."
 
 #: views/developers/details.thtml:72
 msgid "devcp_details_supporturl"
@@ -1576,8 +2024,8 @@ msgstr "Ο δημιου�γός δεν πα�έχει url υποστή�ιξης
 msgid "devcp_details_trusted"
 msgstr "Έμπιστο"
 
-#: views/developers/details.thtml:84
-#: views/developers/versions.thtml:65
+#. %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 "Έκδοση %s"
@@ -1600,8 +2048,14 @@ msgstr "Θέλετε σίγου�α να απενε�γοποιηθεί αυτό
 
 #: views/developers/disable.thtml:56
 msgid "devcp_disable_disable_description"
-msgstr "Η απενε�γοποίηση αυτο� του π�όσθετου θα το αποκ��ψει από τη δυνατότητα αναζήτησης και την πα�ουσίαση. Δεν θα είναι δυνατή η λήψη του από τον ιστότοπο και δε θα εμφανίζεται στους ελέγχους ενημε�ώσεων από την πλευ�ά των χ�ηστών. Το π�όσθετο θα διαγ�αφεί αλλά θα έχετε τη δυνατότητα να επιστ�έψετε εδώ και να το ενε�γοποιήσετε εκ νέου όταν επιθυμείτε."
+msgstr ""
+"Η απενε�γοποίηση αυτο� του π�όσθετου θα το αποκ��ψει από τη δυνατότητα "
+"αναζήτησης και την πα�ουσίαση. Δεν θα είναι δυνατή η λήψη του από τον "
+"ιστότοπο και δε θα εμφανίζεται στους ελέγχους ενημε�ώσεων από την πλευ�ά των "
+"χ�ηστών. Το π�όσθετο θα διαγ�αφεί αλλά θα έχετε τη δυνατότητα να επιστ�έψετε "
+"εδώ και να το ενε�γοποιήσετε εκ νέου όταν επιθυμείτε."
 
+#. %s is the name of an add-on
 #: views/developers/disable.thtml:55
 #, php-format
 msgid "devcp_disable_disable_title"
@@ -1617,15 +2071,67 @@ msgstr "Θέλετε σίγουÏ�α να ενεÏ�γοποιηθεί αυτό Ï„Î
 
 #: views/developers/disable.thtml:49
 msgid "devcp_disable_enable_description"
-msgstr "Η ενε�γοποιήση του π�όσθετου σημαίνει ότι θα εμφανίζεται ξανά στις αναζητήσεις και τις πα�ουσιάσεις. Θα είναι δυνατή η λήψη του και από τον ιστότοπο αλλά και μέσω του συστήματος ελέγχου για ενημε�ώσεις π�όσθετων του πε�ιηγητή."
+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/edit.thtml:65
-#: views/developers/edit.thtml:71
+#: views/developers/discuss.thtml:68
+msgid "devcp_discuss_addreply_header"
+msgstr "Π�οσθήκη απάντησης"
+
+#: views/developers/discuss.thtml:57
+msgid "devcp_discuss_allreplies_header"
+msgstr "Απαντήσεις"
+
+#. 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 ""
+"Πα�ουσιάστηκε σφάλμα κατά την αποθήκευση της απάντησης σας. Πα�ακαλο�με "
+"επικοινωνήστε με τη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου %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."
+
+#. %1 is the add-on name
+#: views/developers/discuss.thtml:43
+msgid "devcp_discuss_pagetitle"
+msgstr ""
+"Πα�αθέστε πε�ισσότε�ες πλη�οφο�ίες για την αξιολόγηση του π�όσθετου %1$s"
+
+#. submit button text
+#: views/developers/discuss.thtml:79
+msgid "devcp_discuss_submit_reply"
+msgstr "Υποβολή απάντησης"
+
+#: views/developers/discuss.thtml:72
+msgid "devcp_discuss_success_message"
+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
+msgid "devcp_discuss_writtenby"
+msgstr "Συντάχθηκε από  %1$s στις %2$s"
+
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Π�οσθήκη δημιου�γο�"
 
@@ -1637,10 +2143,297 @@ msgstr "ΔιεÏ�θυνση ηλεκτÏ�ονικοÏ� ταχυδÏ�ομείου δÎ
 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 "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+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 "Δημιου�γοί"
@@ -1704,7 +2497,209 @@ msgstr "Επιθυμητή τοπική ��θμιση γλώσσας"
 
 #: views/developers/edit.thtml:126
 msgid "devcp_edit_locale_disambiguation_explanation"
-msgstr "σ�ντομες συμπλη�ωματικές πλη�οφο�ίες (όπως πχ το όνομα μιας τοπικής διαλέκτου)"
+msgstr ""
+"σ�ντομες συμπλη�ωματικές πλη�οφο�ίες (όπως πχ το όνομα μιας τοπικής "
+"διαλέκτου)"
+
+#: 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"
@@ -1712,13 +2707,71 @@ 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»"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">simple locale "
+"name</a>, όπως «el-GR»"
+
+#: views/elements/developers/editbox.thtml:46
+#, fuzzy
+msgid "devcp_editbox_authors"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+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
 #, php-format
@@ -1728,6 +2781,7 @@ msgstr[0] "%s επιμελημένη αξιολόγηση"
 msgstr[1] "%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
 #, php-format
@@ -1737,6 +2791,7 @@ msgstr[0] "%s υποψήφιο π�όσθετο"
 msgstr[1] "%s υποψήφια π�όσθετα"
 
 # %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1751,6 +2806,8 @@ 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"
@@ -1776,51 +2833,75 @@ msgstr "Σημειώσεις στο συντάκτη της αξιολόγηση
 msgid "devcp_editversion_submit_update"
 msgstr "Ενημέ�ωση"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: controllers/developers_controller.php:1992
 msgid "devcp_error_addonname_not_unique"
-msgstr "Το όνομα του π�οαθέτου σας υπά�χει ήδη στη βάση δεδομένων. Πα�ακαλο�με σιγου�ευτείτε πως: <br /><li>Ται�ιάζουν τα GUID. Η πιο συχνή αιτία αυτο� του σφάλματος είναι GUID που δεν ται�ιάζουν.</li><li>Δεν έχετε διπλότυπη εγγ�αφή στη βάση δεδομένων. Αν έχετε, θα π�έπει να ενημε�ώσετε την εγγ�αφή ή να την διαγ�άψετε και να π�οσπαθήσετε ξανά.</li>"
-
+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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Πα�ακαλο�με δείτε για αναφο�ά %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 "αυτή τη σελίδα"
 
-#: controllers/developers_controller.php:2013
+#: controllers/developers_controller.php:2098
 msgid "devcp_error_describe_changes"
-msgstr "Πα�ακαλο�με πε�ιγ�άψτε τις αλλαγές που έχουν γίνει στην ενημε�ωμένη έκδοση του π�όσθετου."
+msgstr ""
+"Πα�ακαλο�με πε�ιγ�άψτε τις αλλαγές που έχουν γίνει στην ενημε�ωμένη έκδοση "
+"του π�όσθετου."
 
+#. %1$s is the name of the file
+#: controllers/components/developers.php:658
+#, fuzzy, php-format
+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 "Η π�οέκταση α�χείου (%s) δεν επιτ�έπεται για αυτό τον τ�πο π�όσθετου. Πα�ακαλο�με επιλέξτε μια από τις ακόλουθες: %s"
+msgstr ""
+"Η π�οέκταση α�χείου (%s) δεν επιτ�έπεται για αυτό τον τ�πο π�όσθετου. "
+"Πα�ακαλο�με επιλέξτε μια από τις ακόλουθες: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Δεν ται�ιάζουν όλα τα GUID των α�χείων"
 
@@ -1849,18 +2930,24 @@ msgstr "Υπε�βαίνει το μέγιστο μέγεθος αποστολή
 msgid "devcp_error_http_nofile"
 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:401
 #, php-format
 msgid "devcp_error_icon_extension"
-msgstr "Η π�οέκταση α�χείου (%s) δεν επιτ�έπεται για α�χείο εικονιδίου. Πα�ακαλο�με επιλέξτε μία από τις ακόλουθες: %s"
+msgstr ""
+"Η π�οέκταση α�χείου (%s) δεν επιτ�έπεται για α�χείο εικονιδίου. Πα�ακαλο�με "
+"επιλέξτε μία από τις ακόλουθες: %s"
 
-#: controllers/developers_controller.php:1723
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
 #, php-format
 msgid "devcp_error_identical_version_exists"
-msgstr "Υπά�χει ήδη μια ταυτόσημη έκδοση (%s) για το π�όσθετο και την πλατφό�μα αυτή."
+msgstr ""
+"Υπά�χει ήδη μια ταυτόσημη έκδοση (%s) για το π�όσθετο και την πλατφό�μα αυτή."
 
-#: controllers/developers_controller.php:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Δεν υπά�χει α�χείο install.rdf."
 
@@ -1868,43 +2955,58 @@ msgstr "Δεν υπά�χει α�χείο install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "Τα ακόλουθα σφάλματα εντοπίστηκαν στο α�χείο install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Πα�ακαλο�με επιλέξτε τ�πο π�όσθετου."
 
+#. %$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 "Δεν είναι έγκυ�ος α�ιθμός έκδοσης το %s για τον %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "Δεν είναι έγκυ�ο το ανανγω�ιστικό (ID) του π�όσθετου: %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 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"
 msgstr "Δεν ήταν δυνατή η μετακκίνηση του α�χείου"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1917,7 +3019,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"
@@ -1927,17 +3031,20 @@ msgstr "Δε β�έθηκε αναγνω�ιστικό (ID) για το π�όσ
 msgid "devcp_error_no_platform"
 msgstr "Δεν έχει επιλεγεί πλατφό�μα"
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
-msgstr "Π�έπει να πα�έχετε τις απα�αίτητες πλη�οφο�ίες για την υποβολή υποψηφιότητας."
+msgstr ""
+"Π�έπει να πα�έχετε τις απα�αίτητες πλη�οφο�ίες για την υποβολή υποψηφιότητας."
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "Δεν μπο�είτε να θέσετε σε υποψηφιότητα την π�οέκδοση ενός π�όσθετου."
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
-msgstr "Μπο�είτε να υποβάλετε υποψηφιότητα μόνο για π�όσθετα που β�ίσκονται ήδη στο sandbox."
+msgstr ""
+"Μπο�είτε να υποβάλετε υποψηφιότητα μόνο για π�όσθετα που β�ίσκονται ήδη στο "
+"sandbox."
 
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
@@ -1947,30 +3054,39 @@ msgstr "Πα�ακαλο�με επιλέξτε τουλάχιστον μια κ
 msgid "devcp_error_one_user"
 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:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
 msgid "devcp_error_saving"
 msgstr "Συνέβη σφάλμα κατά την π�οσπάθεια αποθήκευσης των δεδομένων σας."
 
-#: controllers/developers_controller.php:1696
+#: 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Πα�ακαλο�με αποστείλατε α�χείο."
@@ -1979,8 +3095,7 @@ msgstr "Πα�ακαλο�με αποστείλατε α�χείο."
 msgid "devcp_file_addanother"
 msgstr "Π�οσθήκη α�χείου για διαφο�ετική πλατφό�μα"
 
-#: views/developers/add_step2.thtml:93
-#: views/developers/add_step2.thtml:99
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
 msgid "devcp_form_author_add"
 msgstr "Π�οσθήκη δημιου�γο�"
 
@@ -1990,7 +3105,9 @@ msgstr "Αφαί�εση"
 
 #: views/developers/add_step2.thtml:107
 msgid "devcp_form_categories_nextstep"
-msgstr "Στο επόμενο βήμα θα σας είναι διαθέσιμες κατηγο�ίες για να κατατάξετε το π�όσθετό σας."
+msgstr ""
+"Στο επόμενο βήμα θα σας είναι διαθέσιμες κατηγο�ίες για να κατατάξετε το "
+"π�όσθετό σας."
 
 #: views/developers/add_step2.thtml:105
 msgid "devcp_form_error_categories_unavailable"
@@ -2040,8 +3157,7 @@ msgstr "ΔιεÏ�θυνση ηλεκτÏ�ονικοÏ� ταχυδÏ�ομείου Ï„Î
 msgid "devcp_form_label_authors"
 msgstr "Δημιου�γοί"
 
-#: views/developers/add_step2.thtml:103
-#: views/developers/add_step3.thtml:107
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
 msgid "devcp_form_label_categories"
 msgstr "Κατηγο�ίες"
 
@@ -2077,8 +3193,7 @@ msgstr "Α�χείο εικονιδίου"
 msgid "devcp_form_label_name"
 msgstr "Όνομα"
 
-#: views/developers/add_step1.thtml:75
-#: views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
 #: views/developers/add_step1.thtml:92
 msgid "devcp_form_label_platforms"
 msgstr "Υποστη�ιζόμενες πλατφό�μες"
@@ -2129,7 +3244,9 @@ msgstr "Σημειώσεις για συντάκτες αξιολόγησης"
 
 #: views/developers/add_step3.thtml:114
 msgid "devcp_form_trustedaddon_destination"
-msgstr "Αφο� το π�όσθετό σας θεω�είται έμπιστο, επιλέξτε πο� θέλετε να τοποθετηθεί αυτή η έκδοση:"
+msgstr ""
+"Αφο� το π�όσθετό σας θεω�είται έμπιστο, επιλέξτε πο� θέλετε να τοποθετηθεί "
+"αυτή η έκδοση:"
 
 #: views/developers/add_step3.thtml:119
 msgid "devcp_form_trustedaddon_destination_public"
@@ -2193,10 +3310,16 @@ 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)."
+msgstr ""
+"Με�ικά από τα πεδία της σελίδας έχουν τοπικοποιηθεί και εμφανίζονται στη "
+"μητ�ική γλώσσα του τελικο� χ�ήστη.  Επιλέξτε μια από τις πα�ακάτω τοπικές "
+"�υθμίσεις για να επεξε�γαστείτε τις λεπτομέ�ειες του π�οσθέτου σας σ' αυτή "
+"τη γλώσσα. Αν δεν υπά�χει διαθέσιμη μετάφ�αση για κάποια από τις τοπικές "
+"�υθμίσεις, θα χ�ησιμοποιηθεί η α�χική ��θμιση γλώσσας (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
 #: views/elements/developers/myaddons.thtml:68
@@ -2232,11 +3355,26 @@ msgstr "Υποβολή π�όσθετου"
 msgid "devcp_myaddons_title"
 msgstr "Ε�γαλεία δημιου�γών"
 
+#. %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 "Επιστ�οφή στις λεπτομέ�ειες του π�όσθετου"
 
 # %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
@@ -2244,33 +3382,70 @@ msgid "devcp_nominate_submit_nominate"
 msgstr "Υποψηφιότητα του %s"
 
 # %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: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 "Ο αποχα�ακτη�ισμός αυτής της εικόνας ως α�χικής εικόνας π�οεπισκόπησης θα έχει ως αποτέλεσμα τον αυτόματο ο�ισμό μιας άλλης ως α�χικής."
+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
+#. %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."
+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:69
+#, fuzzy
+msgid "devcp_notice_unsaved_changes"
+msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2299,27 +3474,121 @@ msgstr "Επεξε�γασία εικόνας π�οεπισκόπησης"
 msgid "devcp_preview_updated_successfully"
 msgstr "Η εικόνα π�οεπισκόπησης ενημε�ώθηκε με επιτυχία."
 
+#: 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 "Χ�ησιμοποιήστε την πα�ακάτω φό�μα για να αποστείλετε εικόνες π�οεπισκόπησης του π�οσθέτου σας σε τ�πο α�χείου 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:79
+#, fuzzy
+msgid "devcp_previews_header_caption"
+msgstr "Preview Caption"
+
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "Επεξε�γασία εικόνας π�οεπισκόπησης"
 
+#: 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 "Α�χείο εικόνας π�οεπισκόπησης"
 
-#: 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:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Διαγ�αφή εικόνας π�οεπισκόπησης"
@@ -2336,58 +3605,174 @@ msgstr "Επεξε�γασία εικόνας π�οεπισκόπησης"
 msgid "devcp_previews_submit_upload"
 msgstr "Αποστολή εικόνας π�οεπισκόπησης"
 
+#: 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 "Λάθος;"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Θέλετε να διαγ�αφεί το α�χείο;"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78
-#: views/developers/add_step0.thtml:52
+#: 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>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 "Πα�άβλεψη ενημέ�ωσης τ�εχουσών πλη�οφο�ιών του π�όσθετου"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> ενε�γοί καθημε�ινοί χ�ήστες"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> συνολικές λήψεις"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> εβδομαδιαίες λήψεις"
 
-#: controllers/developers_controller.php:1481
+#: 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 "Η υποβολή π�όσθετων έχει απενε�γοποιηθεί π�ος το πα�όν. Πα�ακαλο�με π�οσπαθήστε ξανά α�γότε�α."
+msgstr ""
+"Η υποβολή π�όσθετων έχει απενε�γοποιηθεί π�ος το πα�όν. Πα�ακαλο�με "
+"π�οσπαθήστε ξανά α�γότε�α."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83
-#: views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Αποδεκτό"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82
-#: views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Μη αποδεκτό"
 
@@ -2403,12 +3788,12 @@ msgstr "Απενε�γοποιημένο"
 msgid "devcp_summary_header_trusted"
 msgstr "Έμπιστο"
 
-#: views/developers/dashboard.thtml:82
-#: views/developers/index.thtml:82
+#: 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"
@@ -2419,6 +3804,7 @@ 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"
@@ -2428,30 +3814,667 @@ msgstr "Πα�ακαλο�με  %s για το θέμα σας."
 msgid "devcp_theme_upload_preview_link"
 msgstr "αποστείλετε εικόνα π�οεπισκόπησης"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Πα�ακαλο�με δείτε %s για οδηγίες."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "αυτή τη σελίδα"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Επεξε�γασία έκδοσης"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Η έκδοση ενημε�ώθηκε με επιτυχία."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Αυτό το π�όσθετο έχει απενε�γοποιηθεί"
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "Αυτό το π�όσθετο δεν είναι υποψήφιο για το δημόσιο χώ�ο."
+
+#: controllers/components/editors.php:213
+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
+msgid "editor_review_error_no_action"
+msgstr "Πα�ακαλο�με επιλέξτε μια ενέ�γεια αξιολόγησης."
+
+#: controllers/components/editors.php:192
+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
+msgid "editor_review_error_no_comments"
+msgstr "Πα�ακαλο�με εισάγετε τα σχόλια αξιολόγησης."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Πα�ακαλο�με επιλέξτε τουλάχιστον ένα α�χείο για αξιολόγηση."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "Πα�ακαλο�με εισάγετε τα λειτου�γικά συστήματα που κάνατε ελέγχους."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Φίλτ�ο"
@@ -2460,8 +4483,7 @@ msgstr "Φίλτ�ο"
 msgid "editorcp_logs_filter_by"
 msgstr "Φιλτ�ά�ισμα κατά τ�πο/ενέ�γεια"
 
-#: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Καταγ�αφή συμβάντων"
 
@@ -2513,6 +4535,7 @@ msgstr "Απόκ�υψη σχόλιων"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Π�οβολή σχόλιων"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2522,8 +4545,7 @@ msgstr "Εμφάνιση εγγ�αφών μεταξ� %s και %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Δεν β�έθηκαν αξιολογήσεις γι' αυτή την πε�ίοδο."
 
-#: views/editors/reviewlog.thtml:42
-#: controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Καταγ�αφή αξιολόγησης"
 
@@ -2547,29 +4569,28 @@ msgstr "Π�όσφατη δ�αστη�ιότητα συντάκτη"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Σ�νολο αξιολογήσεων"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Αξιολόγηση π�όσθετου"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Πα�ακαλο�με συμπλη�ώστε τα ακόλουθα πεδία:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Πα�ακαλο�με επιλέξτε τουλάχιστον ένα α�χείο για αξιολόγηση."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Δεν επιτ�έπεται η αξιολόγηση δικο� σας π�όσθετου."
 
-#: controllers/editors_controller.php:305
+#: 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 "Π�οσθήκη χα�ακτη�ιστικο�"
 
@@ -2577,54 +4598,47 @@ msgstr "Π�οσθήκη χα�ακτη�ιστικο�"
 msgid "editors_featured_add_feature_submit"
 msgstr "Π�οσθήκη"
 
-#: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Το χα�ακτη�ιστικό π�οστέθηκε επιτυχώς."
 
-#: views/editors/featured.thtml:50
-#: controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Αποτυχία αφαί�εσης χα�ακτη�ιστικο�."
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Το χα�ακτη�ιστικό αφαι�έθηκε επιτυχώς."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: 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 "Αφαί�εση χα�ακτη�ιστικο�"
 
@@ -2646,43 +4660,45 @@ msgstr "Πολιτική π�όσθετου"
 
 #: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
-msgstr "Τα φίλτ�α θα πα�αμείνουν ενε�γά για τη συνεδ�ία ή μέχ�ι να εκκαθα�ιστο�ν."
+msgstr ""
+"Τα φίλτ�α θα πα�αμείνουν ενε�γά για τη συνεδ�ία ή μέχ�ι να εκκαθα�ιστο�ν."
 
 # %1 is the queue mode
-#: views/editors/queue.thtml:108
-#: views/admin/flagged_queue.thtml:75
+#. %1 is the queue mode
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Δεν υπά�χουν π�ος το πα�όν π�όσθετα για αξιολόγηση"
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 ημέ�α"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 ώ�α"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 λεπτό"
 
-#: controllers/editors_controller.php:58
-#: controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Πίνακας ελέγχου συντάκτη"
 
-#: controllers/editors_controller.php:286
+#. %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 "μόνο για %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Π�οέκδοση"
 
 # %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2696,19 +4712,25 @@ msgstr "Εκκαθά�ιση"
 msgid "editors_queue_submit_filter"
 msgstr "Φίλτ�ο"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
-msgstr "Όλες οι λίστες αναμονής αξιολογήσεων έχουν π�ος το πα�όν απενε�γοποιηθεί. Πα�ακαλο�με π�οσπαθήστε ξανά α�γότε�α."
+msgstr ""
+"Όλες οι λίστες αναμονής αξιολογήσεων έχουν π�ος το πα�όν απενε�γοποιηθεί. "
+"Πα�ακαλο�με π�οσπαθήστε ξανά α�γότε�α."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Ενέ�γεια αξιολόγησης"
 
+#: views/editors/review.thtml:153
+msgid "editors_review_action_info"
+msgstr "Αίτηση για πε�ισσότε�ες πλη�οφο�ίες"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Π�οώθηση στο δημόσιο χώ�ο"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Αίτηση ανώτε�ης αξιολόγησης"
 
@@ -2716,29 +4738,48 @@ msgstr "Αίτηση ανώτε�ης αξιολόγησης"
 msgid "editors_review_action_sandbox"
 msgstr "Πα�αμονή στο Sandbox"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Αξιολόγηση σχόλιων"
 
-#: views/editors/review.thtml:167
+#: views/editors/review.thtml:176
+msgid "editors_review_details_info_request"
+msgstr ""
+"Χ�ησιμοποιείστε αυτή τη φό�μα για να ζητήσετε πε�ισσότε�ες πλη�οφο�ίες από "
+"τους δημιου�γο�ς. Θα ειδοποιηθο�ν μέσω ηλεκτ�ονικο� ταχυδ�ομείου και θα "
+"μπο�ο�ν να απαντήσουν εδώ. Όταν απαντήσουν, θα ειδοποιηθείτε κι εσείς μέσω "
+"ηλεκτ�ονικο� ταχυδ�ομείου."
+
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
-msgstr "Αυτή η ενέ�γεια θα σημειώσει το π�όσθετο και την πιο π�όσφατη έκδοσή του ως κατάλληλες για τοποθέτηση στο δημόσιο χώ�ο. Οι μελλοντικές εκδόσεις θα πα�αμένουν στο sandbox ώσπου να αξιολογηθο�ν από κάποιον συντάκτη."
+msgstr ""
+"Αυτή η ενέ�γεια θα σημειώσει το π�όσθετο και την πιο π�όσφατη έκδοσή του ως "
+"κατάλληλες για τοποθέτηση στο δημόσιο χώ�ο. Οι μελλοντικές εκδόσεις θα "
+"πα�αμένουν στο sandbox ώσπου να αξιολογηθο�ν από κάποιον συντάκτη."
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Αυτή η ενέ�γεια θα διατη�ήσει το π�όσθετο στο sandbox."
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
-msgstr "Αυτή η ενέ�γεια θα επιτ�έψει σε μια έκδοση που β�ίσκεται π�ος το πα�όν στο sandbox, να εμφανιστεί στο δημόσιο χώ�ο."
+msgstr ""
+"Αυτή η ενέ�γεια θα επιτ�έψει σε μια έκδοση που β�ίσκεται π�ος το πα�όν στο "
+"sandbox, να εμφανιστεί στο δημόσιο χώ�ο."
 
-#: views/editors/review.thtml:162
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
-msgstr "Αυτή η ενέ�γεια θα διατη�ήσει στο sandbox μια έκδοση π�όσθετου που β�ίσκεται ήδη εκεί."
+msgstr ""
+"Αυτή η ενέ�γεια θα διατη�ήσει στο sandbox μια έκδοση π�όσθετου που β�ίσκεται "
+"ήδη εκεί."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
-msgstr "Αν έχετε αμφιβολίες για την ασφάλεια του συγκεκ�ιμένου π�όσθετου, για θέματα πνευματικής ιδιοκτησίας ή για ο,τιδήποτε άλλο θα έπ�επε να ελέγξει ένας διαχει�ιστής, εισάγετε τα σχόλιά σας στην πα�ακάτω πε�ιοχή. Τα σχόλια θα αποσταλο�ν στους διαχει�ιστές μόνο και όχι στο δημιου�γό."
+msgstr ""
+"Αν έχετε αμφιβολίες για την ασφάλεια του συγκεκ�ιμένου π�όσθετου, για θέματα "
+"πνευματικής ιδιοκτησίας ή για ο,τιδήποτε άλλο θα έπ�επε να ελέγξει ένας "
+"διαχει�ιστής, εισάγετε τα σχόλιά σας στην πα�ακάτω πε�ιοχή. Τα σχόλια θα "
+"αποσταλο�ν στους διαχει�ιστές μόνο και όχι στο δημιου�γό."
 
 #: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
@@ -2760,15 +4801,15 @@ msgstr "Κατηγο�ίες:"
 msgid "editors_review_header_compatibility"
 msgstr "Συμβατότητα:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Πε�ιγ�αφή"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Σχόλια δημιου�γο�"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "ΣΑΤΧ (EULA)"
 
@@ -2776,92 +4817,109 @@ msgstr "ΣΑΤΧ (EULA)"
 msgid "editors_review_header_files"
 msgstr "Α�χεία:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Ιστο�ικό στοιχείου"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Μήνυμα υποβολής υποψηφιότητας"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Στιγμιότυπα"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Αξιολόγηση του %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Σημειώσεις για το συντάκτη αξιολόγησης"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Πε�ίληψη"
 
-#: views/editors/review.thtml:240
+#: 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
+msgid "editors_review_history_info_reply"
+msgstr "Απάντηση"
+
+#: views/elements/developers/editors_review_history_item.thtml:78
+msgid "editors_review_history_info_request"
+msgstr "Αίτηση πλη�οφο�ιών"
+
+#: views/elements/developers/editors_review_history_item.thtml:62
 #: views/editors/reviewlog.thtml:77
-#: views/editors/review.thtml:295
 msgid "editors_review_history_nominated_adminreview"
 msgstr "Αξιολόγηση διαχει�ιστή"
 
+#: views/elements/developers/editors_review_history_item.thtml:56
 #: views/editors/reviewlog.thtml:71
-#: views/editors/review.thtml:289
 msgid "editors_review_history_nominated_approved"
 msgstr "Η υποψηφιότητα εγκ�ίθηκε/δημόσιος χώ�ος"
 
+#: views/elements/developers/editors_review_history_item.thtml:59
 #: views/editors/reviewlog.thtml:74
-#: views/editors/review.thtml:292
 msgid "editors_review_history_nominated_denied"
 msgstr "Η υποψηφιότητα απο��ίφθηκε/Sandbox"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Δε β�έθηκαν παλαιότε�ες αξιολογήσεις."
 
+#: views/elements/developers/editors_review_history_item.thtml:73
 #: views/editors/reviewlog.thtml:88
-#: views/editors/review.thtml:306
 msgid "editors_review_history_pending_adminreview"
 msgstr "Αξιολόγηση διαχει�ιστή"
 
+#: views/elements/developers/editors_review_history_item.thtml:67
 #: views/editors/reviewlog.thtml:82
-#: views/editors/review.thtml:300
 msgid "editors_review_history_pending_approved"
 msgstr "Εγκ�ίθηκε/δημόσιος χώ�ος"
 
+#: views/elements/developers/editors_review_history_item.thtml:70
 #: views/editors/reviewlog.thtml:85
-#: views/editors/review.thtml:303
 msgid "editors_review_history_pending_denied"
 msgstr "Απο��ίφθηκε/Sandbox"
 
-#: views/editors/review.thtml:198
+#. 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] "Π�οβολή/απόκ�υψη απάντησης (%1$s)"
+msgstr[1] "Π�οβολή/απόκ�υψη απαντήσεων (%1$s)"
+
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Εφα�μογές:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "ή επιλέξτε μια τυποποιημένη απόκ�ιση:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Σχόλια:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Λειτου�γικά συστήματα:"
 
-#: views/editors/review.thtml:268
-#: views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Κο�υφή"
 
@@ -2869,7 +4927,7 @@ msgstr "Κο�υφή"
 msgid "editors_review_next_link"
 msgstr "επόμ. &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Δε β�έθηκε αξιολόγηση."
 
@@ -2877,41 +4935,49 @@ msgstr "Δε β�έθηκε αξιολόγηση."
 msgid "editors_review_previous_link"
 msgstr "&laquo; π�οηγ."
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> από %2$s σε αναμονή"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Ενέ�γεια επεξε�γασίας"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Ενέ�γεια"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Σχόλια"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Ημε�ομηνία"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Συντάκτης αξιολόγησης"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Έκδοση/Α�χείο"
 
-#: controllers/editors_controller.php:411
+#: views/editors/review.thtml:213
+msgid "editors_review_update_notify_once"
+msgstr ""
+"�α ειδοποιηθώ την επόμενη φο�ά που θα ενημε�ωθεί το π�όσθετο. (Ισχ�ει για "
+"μια μόνο φο�ά, δεν θα σταλεί μήνυμα ειδοποίησης για άλλες μελλοντικές "
+"ενημε�ώσεις)"
+
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Η αξιολόγηση επεξε�γάστηκε με επιτυχία."
 
@@ -2927,6 +4993,14 @@ msgstr "ΑφαίÏ�εση σημείωσης - ΔιατήÏ�ηση αξιολόγÎ
 msgid "editors_reviews_action_skip"
 msgstr "Πα�άβλεψη"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: views/editors/reviews_queue.thtml:100
 msgid "editors_reviews_header_action"
 msgstr "Ενέ�γεια"
@@ -2935,7 +5009,7 @@ msgstr "Ενέ�γεια"
 msgid "editors_reviews_in_reply_to"
 msgstr "Σε απάντηση του:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Οι αξιολογήσεις επεξε�γάστηκαν με επιτυχία!"
 
@@ -2947,23 +5021,23 @@ msgstr "Δεν υπάÏ�χουν αξιολογήσεις για έλεγχο Ï€Ï
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Επεξε�γασία αξιολογήσεων"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Συσχετιζόμενο με ιστοχώ�ο"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "�έο"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Ενημε�ωμένο"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Ελεγμένη εφα�μογή"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Ελεγμένο λειτου�γικό σ�στημα"
 
@@ -2971,8 +5045,7 @@ msgstr "Ελεγμένο λειτου�γικό σ�στημα"
 msgid "editors_th_additional_info"
 msgstr "Π�όσθετες πλη�οφο�ίες"
 
-#: views/editors/featured.thtml:63
-#: views/editors/queue.thtml:73
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Π�όσθετο"
@@ -3005,30 +5078,30 @@ msgstr "Πλατφό�μες"
 msgid "editors_th_submissiontypes"
 msgstr "Τ�ποι υποβληθέντων"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s ημέ�ες"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ώ�ες"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: 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:610
-#: controllers/components/amo.php:611
-#: controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
+#: controllers/components/amo.php:611 controllers/components/amo.php:612
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Απαγο�ε�εται η π�όσβαση"
 
@@ -3036,12 +5109,13 @@ msgstr "Απαγο�ε�εται η π�όσβαση"
 msgid "error_access_denied_message"
 msgstr "Δεν είστε εξουσιοδοτημένος να δείτε αυτή τη σελίδα."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3051,22 +5125,19 @@ msgstr "Δεν είστε εξουσιοδοτημένος να δείτε αυÏ
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339
-#: controllers/api_controller.php:123
-#: controllers/api_controller.php:759
-#: controllers/api_controller.php:894
-#: controllers/api_controller.php:925
-#: controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
+#: controllers/api_controller.php:759 controllers/api_controller.php:894
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Δε β�έθηκε το π�όσθετο!"
 
-#: controllers/files_controller.php:83
-#: controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Δεν μπο�εί να εμφανιστεί εδώ αυτό το π�όσθετο."
 
@@ -3074,7 +5145,7 @@ msgstr "Δεν μποÏ�εί να εμφανιστεί εδώ αυτό το Ï€Ï�Ï
 msgid "error_addon_selfreview"
 msgstr "Δεν επιτ�έπεται να αξιολογήσετε το π�όσθετο σας."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Δεν υπά�χουν π�όσθετα σε αυτή την κατηγο�ία!"
 
@@ -3082,94 +5153,79 @@ msgstr "Δεν υπά�χουν π�όσθετα σε αυτή την κατηγ
 msgid "error_collection_feed_notfound"
 msgstr "Δεν β�έθηκε το α�χείο �οής του π�όσθετου"
 
-#: views/users/register.thtml:60
-#: views/users/edit.thtml:176
-#: views/developers/add_step2.thtml:117
-#: controllers/api_controller.php:907
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117 controllers/api_controller.php:907
 msgid "error_email_invalid"
 msgstr "Δεν είναι έγκυ�η η διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου."
 
-#: 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/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:91
-#: controllers/files_controller.php:94
-#: controllers/files_controller.php:152
-#: controllers/files_controller.php:165
-#: controllers/files_controller.php:174
-#: controllers/files_controller.php:192
-#: controllers/editors_controller.php:509
+#: 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 "Δε β�έθηκε το α�χείο!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Σφάλμα α�χείου: δεν υπά�χει το %s."
 
-#: views/users/register.thtml:49
-#: views/users/edit.thtml:84
-#: views/reviews/add.thtml:84
-#: controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
-#: 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:104
 msgid "error_invalid_captcha"
 msgstr "Λάθος λέξη, πα�ακαλο�με π�οσπαθήστε ξανά!"
 
-#: views/users/register.thtml:95
-#: views/users/edit.thtml:128
-#: views/developers/add_step2.thtml:112
-#: views/developers/add_step2.thtml:122
+#: 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:254
-#: controllers/users_controller.php:542
-#: controllers/users_controller.php:642
+#: 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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470
-#: controllers/api_controller.php:900
-#: controllers/addons_controller.php:87
-#: controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Λείπει το ό�ισμα: %s"
 
-#: controllers/components/amo.php:506
-#: controllers/components/amo.php:531
+#: 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
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
 msgid "error_notice"
 msgstr "Ειδοποίηση"
 
@@ -3177,8 +5233,7 @@ msgstr "Ειδοποίηση"
 msgid "error_preview_notfound"
 msgstr "Δε β�έθηκε στιγμιότυπο!"
 
-#: views/addons/display.thtml:373
-#: views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Π�έπει να επιλέξετε βαθμολογία."
 
@@ -3186,62 +5241,59 @@ msgstr "Π�έπει να επιλέξετε βαθμολογία."
 msgid "error_user_already_confirmed"
 msgstr "Ο λογα�ιασμός χ�ήστη έχει ήδη επιβεβαιωθεί."
 
-#: 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: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:70
+#: 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:60
-#: views/users/edit.thtml:172
+#: 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:580
-#: controllers/users_controller.php:581
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
-msgstr "Ο χ�όνος για αλλαγή διε�θυνσης ηλεκτ�ονικο� ταχυδ�ομείου έχει λήξει. Πα�ακαλο�με αλλάξτε ξανά τη διε�θυνση στο π�οφίλ χ�ήστη και κάντε κλικ στο δεσμό που θα β�είτε στο μήνυμα επιβεβαίωσης μόλις το πα�αλάβετε."
+msgstr ""
+"Ο χ�όνος για αλλαγή διε�θυνσης ηλεκτ�ονικο� ταχυδ�ομείου έχει λήξει. "
+"Πα�ακαλο�με αλλάξτε ξανά τη διε�θυνση στο π�οφίλ χ�ήστη και κάντε κλικ στο "
+"δεσμό που θα β�είτε στο μήνυμα επιβεβαίωσης μόλις το πα�αλάβετε."
 
-#: views/users/register.thtml:86
-#: views/users/edit.thtml:119
+#: 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:260
-#: controllers/users_controller.php:592
+#: 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:68
 msgid "error_username_or_pw_wrong"
 msgstr "Λάθος όνομα χ�ήστη ή κωδικός!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Δε β�έθηκε η έκδοση!"
 
-#: views/users/delete.thtml:118
-#: views/users/edit.thtml:152
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Έχετε εισάγει λάθος κωδικό!"
 
@@ -3250,15 +5302,15 @@ msgid "feature_learnmore"
 msgstr "Μάθετε πε�ισσότε�α"
 
 # %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Μάθετε πε�ισσότε�α για το %1$s"
 
-#: views/elements/addon_listitem.thtml:132
-#: views/elements/feature.thtml:99
-#: views/addons/display.thtml:98
-#: views/addons/browse_thumbs.thtml:100
+#. %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"
@@ -3269,6 +5321,40 @@ msgstr[1] "%1$s αξιολογήσεις"
 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
+msgid "file_browser_link_addon"
+msgstr "Πίσω στο π�όσθετο"
+
+#. 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 "Ανάπτυξη όλων"
+
+#. 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 "Πίσω στην αξιολόγηση"
+
+#. 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 :: Πε�ιήγηση α�χείων :: Π�όσθετα %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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Με την επιφ�λαξη παντός δικαιώματος."
@@ -3283,7 +5369,11 @@ msgstr "Μνεία"
 
 #: views/elements/footer.thtml:73
 msgid "footer_disclaimer"
-msgstr "Ο ο�γανισμός Mozilla πα�έχει τους δεσμο�ς αυτο�ς σαν μια π�όσθετη υπη�εσία και δεν αντιπ�οσωπε�ει τις εφα�μογές ή οποιαδήποτε πλη�οφο�ία σχετικά με αυτές. Οποιαδήποτε ε�ώτηση, πα�άπονο ή ισχυ�ισμός σχετικά με τις εφα�μογές θα π�έπει να απευθ�νεται στον αντίστοιχο κατασκευαστή λογισμικο�."
+msgstr ""
+"Ο ο�γανισμός Mozilla πα�έχει τους δεσμο�ς αυτο�ς σαν μια π�όσθετη υπη�εσία "
+"και δεν αντιπ�οσωπε�ει τις εφα�μογές ή οποιαδήποτε πλη�οφο�ία σχετικά με "
+"αυτές. Οποιαδήποτε ε�ώτηση, πα�άπονο ή ισχυ�ισμός σχετικά με τις εφα�μογές "
+"θα π�έπει να απευθ�νεται στον αντίστοιχο κατασκευαστή λογισμικο�."
 
 #: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
@@ -3301,7 +5391,7 @@ msgstr "Άλλες γλώσσες:"
 msgid "footer_privacy_policy"
 msgstr "Πολιτική απο��ήτου"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Αποθήκευση"
 
@@ -3310,6 +5400,7 @@ 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Λεξικά"
@@ -3319,6 +5410,7 @@ 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Επεκτάσεις"
@@ -3328,6 +5420,7 @@ 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Πακέτα γλώσσας (π�όσθετου)"
@@ -3337,6 +5430,7 @@ 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Πακέτα γλώσσας (εφα�μογής)"
@@ -3346,6 +5440,7 @@ 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Π�όσθετες λειτου�γίες"
@@ -3355,6 +5450,7 @@ 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:111
 msgid "general_addontype_search_plural"
 msgstr "Μηχανές αναζήτησης"
@@ -3364,12 +5460,13 @@ 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Θέματα"
 
-#: views/elements/header.thtml:111
-#: views/elements/header.thtml:122
+#. %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 "Επιστ�οφή στην α�χική σελίδα των π�όσθετων του %1$s"
@@ -3399,13 +5496,12 @@ msgid "header_navlink_addons"
 msgstr "Π�όσθετα"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72
-#: views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Αποσ�νδεση"
 
@@ -3413,39 +5509,45 @@ msgstr "Αποσ�νδεση"
 msgid "header_navlink_myaccount"
 msgstr "Ο λογα�ιασμός μου"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Εγγ�αφή"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81
-#: views/elements/feature.thtml:84
+#: 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
+#. %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 "<a href=\"%1$s\">Συνδεθείτε</a> για να εγκαταστήσετε αυτό το π�όσθετο. <a href=\"%2$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/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/install.thtml:146
-#: views/elements/install.thtml:164
-#: views/elements/install.thtml:197
-#: views/elements/install.thtml:220
+#. %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 "Π�οσθήκη του %1$s στο %2$s"
 
+#. %1$s is the add-on name
 #: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3467,10 +5569,8 @@ msgstr "Λήψη λεξικο�"
 msgid "langtools_download_langpack"
 msgstr "Λήψη πακέτου γλώσσας"
 
-#: views/elements/addon_categories.thtml:54
-#: views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701
-#: controllers/addons_controller.php:894
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Λεξικά & πακέτα γλώσσας"
 
@@ -3494,12 +5594,9 @@ msgstr "Πακέτο γλώσσας"
 msgid "langtools_tableheader_language"
 msgstr "Γλώσσα"
 
-#: 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
+#: 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 "Κάντε κλικ εδώ για επιστ�οφή στην α�χική σελίδα."
 
@@ -3529,7 +5626,7 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3544,20 +5641,27 @@ msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
 #: views/elements/addon_categories.thtml:53
-#: views/elements/addon_categories.thtml:54
-#: controllers/components/amo.php:680
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:680
 #: controllers/components/amo.php:682
 msgid "nav_category_dicts_langpacks"
 msgstr "Λεξικά & πακέτα γλωσσών"
 
-#: controllers/components/amo.php:715
-#: controllers/components/amo.php:717
+# %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 στη διε�θυνση ηλ. ταχυδ�ομείου που "
+"αναφέ�θηκε πα�απάνω."
+
+#: controllers/components/amo.php:715 controllers/components/amo.php:717
 msgid "nav_category_plugins"
 msgstr "Π�όσθετες λειτου�γίες"
 
 #: views/elements/addon_categories.thtml:57
-#: views/elements/addon_categories.thtml:58
-#: controllers/components/amo.php:686
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:686
 msgid "nav_category_themes"
 msgstr "Θέματα"
 
@@ -3566,6 +5670,7 @@ 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:214
 msgid "other_users"
 msgstr "άλλα"
@@ -3578,35 +5683,34 @@ msgstr "Εκδόσεις εφα�μογών"
 msgid "page_title_credits"
 msgstr "Μνεία"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Πει�αματικά π�όσθετα"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
 msgstr "Συχνές ε�ωτήσεις"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Συχνές ε�ωτήσεις για το «�τ�στε τον Firefox»"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Πολιτική π�όσθετων"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Πολιτική απο��ήτου Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Οδηγίες σ�νταξης αξιολόγησης"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Σ�στημα αξιολογήσεων Sandbox"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Βοήθεια υποβολής"
 
@@ -3614,20 +5718,29 @@ msgstr "Βοήθεια υποβολής"
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:78
-#: controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Έγκυ�ες εκδόσεις εφα�μογής"
 
 #: 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: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:92
 msgid "pages_appversions_required_files_link"
 msgstr "εδώ"
@@ -3636,7 +5749,6 @@ msgstr "εδώ"
 msgid "pages_appversions_versions"
 msgstr "Εκδόσεις"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Πίσω στην π�οηγο�μενη σελίδα"
 
@@ -3649,6 +5761,7 @@ 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"
@@ -3660,7 +5773,9 @@ 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"
@@ -3672,15 +5787,25 @@ 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>."
+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
+#. %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:100
 msgid "recaptcha_label"
@@ -3690,7 +5815,7 @@ msgstr "Είστε άνθ�ωπος;"
 msgid "recaptcha_whatsthis"
 msgstr "Τι είναι αυτό;"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Πα�ουσιάστηκε σφάλμα κατά τη σημείωση της αξιολόγησης!"
 
@@ -3698,8 +5823,7 @@ msgstr "ΠαÏ�ουσιάστηκε σφάλμα κατά τη σημείωση Ï
 msgid "review_flag_reason_bug_support"
 msgstr "Αναφο�ά σφάλματος ή αίτημα υποστή�ιξης αντί για αξιολόγηση."
 
-#: views/reviews/display.thtml:107
-#: views/reviews/display.thtml:190
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Αναφο�ά αξιολόγησης (επιλέξτε ένα λόγο)"
 
@@ -3715,11 +5839,12 @@ msgstr "Άλλος (πα�ακαλο�με εξηγήστε)"
 msgid "review_flag_reason_spam"
 msgstr "Ανεπιθ�μητο ή άσχετο με την αξιολόγηση πε�ιεχόμενο."
 
-#: views/reviews/display.thtml:95
-#: views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: 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"
@@ -3727,42 +5852,62 @@ 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: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>"
-
-#: views/reviews/flag.thtml:54
-#: views/reviews/display.thtml:54
+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:54 views/reviews/display.thtml:54
 #: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Αξιολογήσεις για %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Συνιστώμενα π�όσθετα"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Π�όσφατα π�όσθετα"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Ενημε�ωμένα π�όσθετα"
 
 #: controllers/search_controller.php:99
 msgid "search_disabled"
-msgstr "Η αναζήτηση είναι απενε�γοποιημένη π�ος το πα�όν. Πα�ακαλο�με π�οσπαθήστε ξανά α�γότε�α."
+msgstr ""
+"Η αναζήτηση είναι απενε�γοποιημένη π�ος το πα�όν. Πα�ακαλο�με π�οσπαθήστε "
+"ξανά α�γότε�α."
 
 #: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "όλα τα π�όσθετα"
 
-#: views/elements/search.thtml:170
-#: views/elements/search.thtml:182
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
 #: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "αναζήτηση για π�όσθετα"
@@ -3787,6 +5932,7 @@ msgstr "Όλες τις μηχανές αναζήτησης"
 msgid "search_landing_browse_search_engines"
 msgstr "Πε�ιήγηση στις μηχανές αναζήτησης"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3806,21 +5952,21 @@ msgstr "Αναζήτηση στα π�όσθετα"
 msgid "search_rss_description"
 msgstr "Α�χείο �οής αποτελεσμάτων αναζήτησης"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Αποτελέσματα αναζήτησης για: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Ε�γαλεία διαχει�ιστή"
 
-#: views/elements/header.thtml:146
-#: views/addons/home.thtml:164
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Ε�γαλεία δημιου�γών"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Ε�γαλεία συντακτών"
 
@@ -3828,13 +5974,13 @@ msgstr "Ε�γαλεία συντακτών"
 msgid "sidebar_navlink_welcome"
 msgstr "Καλωσή�θατε"
 
+#. %s is the user's name
 #: 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 "Λεξικό"
 
@@ -3858,8 +6004,7 @@ msgstr "Π�όσθετη λειτου�γία αναζήτησης"
 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 "Θέμα"
 
@@ -3867,10 +6012,9 @@ msgstr "Θέμα"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Ενημε�ωμένα π�όσθετα"
 
-#: views/helpers/localization.php:65
-#: views/developers/editversion.thtml:58
-#: views/developers/versions_edit.thtml:94
-#: views/developers/add_step3.thtml:74
+#. %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"
@@ -3881,6 +6025,7 @@ 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3898,28 +6043,32 @@ msgstr "Ε�γαλεία δημιου�γών"
 msgid "statistics_addon_switch"
 msgstr "Εναλλαγή π�όσθετου"
 
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:167
+#. 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."
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:138
+#. 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"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:147
-#: views/statistics/addon.thtml:158
+#. 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 "Δημιου�γήθηκε το %1$s "
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3961,8 +6110,7 @@ msgstr "Ταμπλό στατιστικών"
 msgid "statistics_index_view_button"
 msgstr "Εμφάνιση στατιστικών"
 
-#: views/statistics/addon.thtml:210
-#: controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Εμφάνιση πίνακα σε μο�φή CSV"
 
@@ -3978,7 +6126,7 @@ msgstr "Αφαί�εση γ�αφήματος"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Ομαδοποίηση κατά: Ημέ�α"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Ομαδοποίηση κατά: Μήνα"
 
@@ -3986,103 +6134,108 @@ msgstr "Ομαδοποίηση κατά: Μήνα"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Ομαδοποίηση κατά : Εβδομάδα"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Σ�γκ�ιση ανά: εβδομάδα"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "β�έθηκαν %s στο διάστημα"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Π�οσθήκη γ�αφήματος"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Π�οσθήκη κι άλλου σχεδίου στο γ�άφημα"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Απόκ�υψη συνολικο� μετ�ητή"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Π�οβολή συνολικο� μετ�ητή"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Σχεδίαση του συνόλου στο γ�άφημα"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Εμφάνιση δεδομένων (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
-msgstr "Πά�τε τα δεδομένα σε α�χείο όπου οι τιμές διαχω�ίζονται με κόμματα (CSV)"
+msgstr ""
+"Πά�τε τα δεδομένα σε α�χείο όπου οι τιμές διαχω�ίζονται με κόμματα (CSV)"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Απόκ�υψη ο�όσημων του %s"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Π�οβολή ο�όσημων του %s"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Ημε�ομηνίες έκδοσης π�όσθετου σε επικάλυψη πάνω στο γ�άφημα"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Απόκ�υψη ο�όσημων του Firefox"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Π�οβολή ο�όσημων του Firefox"
 
-#: controllers/statistics_controller.php:241
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Ημε�ομηνίες έκδοσης του Firefox σε επικάλυψη πάνω στο γ�άφημα"
 
-#: controllers/statistics_controller.php:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Σ�μπτυξη γ�αφήματος"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Ανάπτυξη γ�αφήματος"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Αλλαγή μεγέθους γ�αφήματος"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Ενε�γοί καθημε�ινοί χ�ήστες"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Εφα�μογή"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Π�οσα�μοσμένο"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Λήψεις"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Λειτου�γικό σ�στημα"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Κατάσταση π�όσθετου"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Σ�νοψη"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Έκδοση π�όσθετου"
 
@@ -4106,25 +6259,37 @@ msgstr "Άγνωστη"
 msgid "statistics_longnames_version"
 msgstr "Έκδοση π�όσθετου"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
-msgstr "Δεν υπά�χουν ακόμα α�κετά δεδομένα για να σχεδιαστεί το γ�άφημα. Πα�ακαλο�με δοκιμάστε ξανά α�γότε�α."
+msgstr ""
+"Δεν υπά�χουν ακόμα α�κετά δεδομένα για να σχεδιαστεί το γ�άφημα. Πα�ακαλο�με "
+"δοκιμάστε ξανά α�γότε�α."
 
-#: views/statistics/addon.thtml:116
+#: 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:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
-msgstr "Το ταμπλό στατιστικών είναι απενε�γοποιημένο π�ος το πα�όν. Πα�ακαλο�με π�οσπαθήστε α�γότε�α."
+msgstr ""
+"Το ταμπλό στατιστικών είναι απενε�γοποιημένο π�ος το πα�όν. Πα�ακαλο�με "
+"π�οσπαθήστε α�γότε�α."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
-msgstr "Για να δείτε τα γ�αφήματα του ταμπλό στατιστικών, απαιτείται η ενε�γοποίηση της JavaScript."
+msgstr ""
+"Για να δείτε τα γ�αφήματα του ταμπλό στατιστικών, απαιτείται η ενε�γοποίηση "
+"της JavaScript."
 
 #: views/statistics/addon.thtml:44
 msgid "statistics_notice_settings_updated"
@@ -4137,36 +6302,36 @@ msgstr "Οι �υθμίσεις σας ενημε�ώθηκαν!"
 msgid "statistics_pagetitle"
 msgstr "Ταμπλό στατιστικών"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Ενε�γοί καθημε�ινοί χ�ήστες"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Καθημε�ινές λήψεις"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Εστίαση σε"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Εστίαση κατά ένα μήνα"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Απομάκ�υνση"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Απομάκ�υνση κατά ένα μήνα"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Καθημε�ινή σ�νοψη στατιστικών για %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Α�χείο �οής δεδομένων σ�νοψης"
 
@@ -4181,7 +6346,10 @@ msgstr "Στατιστικά για %1$s"
 
 #: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
-msgstr "Εξ ο�ισμο�, μόνο εσείς και ο ο�γανισμός Mozilla  μπο�είτε να έχετε π�όσβαση στις πλη�οφο�ίες του ταμπλό σας. Μπο�είτε να το ανοίξετε στο κοινό ώστε να μπο�εί να δει ο καθένας τα δεδομένα του π�οσθέτου σας."
+msgstr ""
+"Εξ ο�ισμο�, μόνο εσείς και ο ο�γανισμός Mozilla  μπο�είτε να έχετε π�όσβαση "
+"στις πλη�οφο�ίες του ταμπλό σας. Μπο�είτε να το ανοίξετε στο κοινό ώστε να "
+"μπο�εί να δει ο καθένας τα δεδομένα του π�οσθέτου σας."
 
 #: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
@@ -4193,7 +6361,9 @@ msgstr "Ιδιωτικό"
 
 #: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
-msgstr "Μόνο εσείς και ο ο�γανισμός Mozilla μπο�είτε να δείτε τα στατιστικά αυτο� του π�όσθετου"
+msgstr ""
+"Μόνο εσείς και ο ο�γανισμός Mozilla μπο�είτε να δείτε τα στατιστικά αυτο� "
+"του π�όσθετου"
 
 #: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
@@ -4203,23 +6373,23 @@ msgstr "Δημόσια"
 msgid "statistics_settings_access_public_description"
 msgstr "Τα στατιστικά αυτο� του π�όσθετου είναι σε κοινή θέα"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Αλλαγή �υθμίσεων"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Πα�ακαλο�με διαχει�ιστείτε αυτή την πλη�οφο�ία σαν εμπιστευτική."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Αυτό το ταμπλό είναι <b>ιδιωτικό</b> π�ος το πα�όν."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Αυτό το ταμπλό είναι <b>δημόσιο</b> π�ος το πα�όν."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Κλειδωμένο"
 
@@ -4236,7 +6406,7 @@ msgstr "Αποθήκευση �υθμίσεων"
 msgid "statistics_settings_title"
 msgstr "Ρυθμίσεις ταμπλό στατιστικών για %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Ξεκλειδωμένο"
 
@@ -4260,8 +6430,7 @@ msgstr "Αγν."
 msgid "statistics_shortnames_version"
 msgstr "Εκδ."
 
-#: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Μέσος ό�ος ημε�ήσεων λήψεων"
 
@@ -4269,46 +6438,37 @@ msgstr "Μέσος ό�ος ημε�ήσεων λήψεων"
 msgid "statistics_summary_downloads_heading"
 msgstr "Λήψεις"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149
-#: views/statistics/addon.thtml:169
+#: 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:70
-#: views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s την %2$s"
@@ -4317,20 +6477,17 @@ msgstr "%1$s την %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Ενε�γοί καθημε�ινοί χ�ήστες"
 
-#: views/statistics/rss/summary.thtml:46
-#: views/statistics/addon.thtml:143
+#: 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:147
+#: 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:257
+#: 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 "
@@ -4343,13 +6500,11 @@ msgstr "Όλα τα θέματα"
 msgid "themes_landing_browse_themes"
 msgstr "Πε�ιήγηση στα θέματα"
 
-#: views/users/edit.thtml:99
-#: views/users/edit.thtml:167
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Αλλαγή διε�θυνσης ηλεκτ�ονικο� ταχυδ�ομείου"
 
-#: views/users/edit.thtml:98
-#: views/users/edit.thtml:148
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Αλλαγή κωδικο�"
 
@@ -4358,9 +6513,13 @@ 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: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:95
 msgid "user_del_community_sad"
@@ -4375,33 +6534,51 @@ 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: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:69
 msgid "user_del_error_addons_more_questions"
-msgstr "Αν έχετε π�όσθετες ε�ωτήσεις, πα�ακαλο�με επικοινωνήστε με τη διε�θυνση %1$s για βοήθεια."
+msgstr ""
+"Αν έχετε π�όσθετες ε�ωτήσεις, πα�ακαλο�με επικοινωνήστε με τη διε�θυνση %1$s "
+"για βοήθεια."
 
 #: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
-msgstr "Π�έπει να τσεκά�ετε το πλαίσιο στο «Κατανοώ...» για να να διαγ�άψουμε τον λογα�ιασμό σας."
+msgstr ""
+"Π�έπει να τσεκά�ετε το πλαίσιο στο «Κατανοώ...» για να να διαγ�άψουμε τον "
+"λογα�ιασμό σας."
 
 #: 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:83
 msgid "user_del_error_unknown"
-msgstr "Πα�ουσιάστηκε ένα άγνωστο σφάλμα κατά τη διαγ�αφή του λογα�ιασμο� σας. Πα�ακαλο�με επικοινωνήστε με τη διε�θυνση %1$s γνωστοποιώντας το π�όβλημα και θα τον διαγ�άψουμε εμείς. Ζητάμε συγνώμη για την ταλαιπω�ία."
+msgstr ""
+"Πα�ουσιάστηκε ένα άγνωστο σφάλμα κατά τη διαγ�αφή του λογα�ιασμο� σας. "
+"Πα�ακαλο�με επικοινωνήστε με τη διε�θυνση %1$s γνωστοποιώντας το π�όβλημα "
+"και θα τον διαγ�άψουμε εμείς. Ζητάμε συγνώμη για την ταλαιπω�ία."
 
 #: 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:93
 msgid "user_del_header_delete_account"
 msgstr "Διαγ�αφή του λογα�ιασμο� χ�ήστη %1$s"
@@ -4416,16 +6593,24 @@ msgstr "Δεν θα μποÏ�είτε πια να συνδεθείτε στον Î
 
 #: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
-msgstr "Κάνωντας κλικ στο «Διαγ�αφή...» ο λογα�ιασμός σας θα <strong>διαγ�αφεί ο�ιστικά</strong>. Αυτό σημαίνει πως:"
+msgstr ""
+"Κάνωντας κλικ στο «Διαγ�αφή...» ο λογα�ιασμός σας θα <strong>διαγ�αφεί "
+"ο�ιστικά</strong>. Αυτό σημαίνει πως:"
 
 #: 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:97
 msgid "user_del_specific_problem_editors"
-msgstr "Αν αντιμετωπίζετε κάποιο π�όβλημα που ίσως μπο�ο�με να σας βοηθήσουμε να λ�σετε, μην διαγ�άψετε τον λογα�ιασμό σας άμεσα,  επικοινωνήστε μαζί μας στη διε�θυνση %1$s και θα κάνουμε ό,τι μπο�ο�με για να σας βοηθήσουμε."
+msgstr ""
+"Αν αντιμετωπίζετε κάποιο π�όβλημα που ίσως μπο�ο�με να σας βοηθήσουμε να "
+"λ�σετε, μην διαγ�άψετε τον λογα�ιασμό σας άμεσα,  επικοινωνήστε μαζί μας στη "
+"διε�θυνση %1$s και θα κάνουμε ό,τι μπο�ο�με για να σας βοηθήσουμε."
 
 #: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
@@ -4436,10 +6621,15 @@ msgid "user_deleted_nickname"
 msgstr "Διαγ�αμμένος χ�ήστης"
 
 # %1 is the new email address
-#: views/users/edit.thtml:58
-#: views/users/edit.thtml:59
+#. %1 is the new email address
+#: 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:183
 msgid "user_edit_delete_user"
@@ -4448,35 +6638,49 @@ 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 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: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"
@@ -4488,17 +6692,22 @@ msgstr "Ευχα�ιστο�με για τη συμμετοχή σας στα π
 
 # 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
 #, php-format
 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"
@@ -4513,25 +6722,28 @@ msgid "user_emailchange_error"
 msgstr "Σφάλμα!"
 
 # %1 is the application name
-#: controllers/users_controller.php:513
-#: controllers/users_controller.php:514
+#. %1 is the application name
+#: 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:49
-#: views/users/emailchange.thtml:50
+#: 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:52
 #, php-format
 msgid "user_emailchange_successful_description"
-msgstr "Η διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου σας αλλάχθηκε με επιτυχία. Στο εξής χ�ησιμοποιήστε τη διε�θυνση %1$s για να συνδεθείτε."
+msgstr ""
+"Η διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου σας αλλάχθηκε με επιτυχία. Στο εξής "
+"χ�ησιμοποιήστε τη διε�θυνση %1$s για να συνδεθείτε."
 
-#: views/users/pwreset.thtml:77
-#: views/users/register.thtml:68
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
 #: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Επιβεβαίωση κωδικο�"
@@ -4541,33 +6753,27 @@ msgstr "Επιβεβαίωση κωδικο�"
 msgid "user_form_editprofile"
 msgstr "Επεξε�γασία π�οφίλ χ�ήστη του %s"
 
-#: views/users/pwreset.thtml:52
-#: views/users/login.thtml:81
-#: views/users/register.thtml:58
-#: views/users/edit.thtml:169
+#: 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:73
-#: views/users/edit.thtml:106
+#: 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:89
-#: views/users/edit.thtml:122
+#: 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:93
-#: views/users/edit.thtml:126
+#: 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:79
-#: views/users/edit.thtml:112
+#: views/users/register.thtml:79 views/users/edit.thtml:112
 #: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Επώνυμο"
@@ -4576,13 +6782,11 @@ msgstr "Επώνυμο"
 msgid "user_form_login"
 msgstr "Σ�νδεση χ�ήστη"
 
-#: views/users/pwreset.thtml:72
-#: views/users/edit.thtml:155
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "�έος κωδικός"
 
-#: views/users/register.thtml:84
-#: views/users/edit.thtml:117
+#: views/users/register.thtml:84 views/users/edit.thtml:117
 #: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Ψευδώνυμο"
@@ -4591,13 +6795,11 @@ msgstr "Ψευδώνυμο"
 msgid "user_form_oldpassword"
 msgstr "Παλιός κωδικός"
 
-#: views/users/edit.thtml:100
-#: views/users/edit.thtml:182
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Άλλες ενέ�γειες"
 
-#: views/users/login.thtml:85
-#: views/users/register.thtml:63
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Κωδικός"
 
@@ -4648,15 +6850,23 @@ msgstr "Δεν υπάÏ�χουν Ï€Ï�ος το παÏ�όν ειδοποιήσειÏ
 
 #: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
-msgstr "Κατά και�ο�ς , ο ο�γανισμός  Mozilla μπο�εί να σας στείλει μην�ματα ηλεκτ�ονικο� ταχυδ�ομείου για επε�χόμενες εκδόσεις και εκδηλώσεις σχετικά με τα π�όσθετα. Πα�ακαλο�με επιλέξτε ποια θέματα σας ενδιαφέ�ουν από τα πα�ακάτω:"
+msgstr ""
+"Κατά και�ο�ς , ο ο�γανισμός  Mozilla μπο�εί να σας στείλει μην�ματα "
+"ηλεκτ�ονικο� ταχυδ�ομείου για επε�χόμενες εκδόσεις και εκδηλώσεις σχετικά με "
+"τα π�όσθετα. Πα�ακαλο�με επιλέξτε ποια θέματα σας ενδιαφέ�ουν από τα "
+"πα�ακάτω:"
 
 #: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
-msgstr "Ο ο�γανισμός Mozilla διατη�εί το δικαίωμα να επικοινωνήσει π�οσωπικά μαζί σας για συγκεκ�ιμένα θέματα σχετικά με το π�όσθετο σας."
+msgstr ""
+"Ο ο�γανισμός Mozilla διατη�εί το δικαίωμα να επικοινωνήσει π�οσωπικά μαζί "
+"σας για συγκεκ�ιμένα θέματα σχετικά με το π�όσθετο σας."
 
 #: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
-msgstr "Υπά�χουν σφάλματα στις αλλαγές που κάνατε. Πα�ακαλο�με ελέγξτε τις και υποβάλετέ τες ξανά..."
+msgstr ""
+"Υπά�χουν σφάλματα στις αλλαγές που κάνατε. Πα�ακαλο�με ελέγξτε τις και "
+"υποβάλετέ τες ξανά..."
 
 #: controllers/users_controller.php:523
 msgid "user_profile_saved"
@@ -4697,16 +6907,24 @@ 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 "Στάλθηκε ένας δεσμός για να ενε�γοποιήσετε το λογα�ιασμό σας μέσω ηλ. ταχυδ�ομείου στη διε�θυνση %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: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"
@@ -4717,30 +6935,38 @@ msgid "user_register_congratulations"
 msgstr "Συγχα�ητή�ια! Ο λογα�ιασμός χ�ήστη δημιου�γήθηκε με επιτυχία."
 
 # %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 στη διε�θυνση ηλ. ταχυδ�ομείου που "
+"αναφέ�θηκε πα�απάνω."
+
 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:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Καλωσή�θατε στα %1$s! και ευχα�ιστο�με για την εγγ�αφή σας"
 
-#: views/users/register.thtml:76
-#: views/users/edit.thtml:109
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Απαιτείται όνομα, επώνυμο ή ψευδώνυμο."
 
-#: views/users/edit.thtml:97
-#: views/users/edit.thtml:133
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Ειδοποιήσεις"
 
-#: views/users/edit.thtml:96
-#: views/users/edit.thtml:104
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Π�οφίλ χ�ήστη"
 
@@ -4787,36 +7013,73 @@ msgid "users_info_pagetitle"
 msgstr "Πλη�οφο�ίες για το χ�ήστη: %1$s"
 
 # %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Αξιολογήσεις από %s"
 
-#: controllers/users_controller.php:319
-#: controllers/users_controller.php:321
+#: 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
 #, 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
+#. %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 "Η σελίδα που αναζητήσατε είναι τμήμα του 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 "Εγγ�αφή νέου χ�ήστη"
 
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Η πιο π�όσφατη έκδοση, συμβατή με"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "sidebar_navlink_tools"
+#~ msgstr "Tools"
diff --git a/site/app/locale/el/pages/experimentalAddons.thtml b/site/app/locale/el/pages/experimentalAddons.thtml
deleted file mode 100644
index 4cc8832..0000000
--- a/site/app/locale/el/pages/experimentalAddons.thtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<h1>Πει�αματικά π�όσθετα</h1>
-
-
-<h2>Τι είναι τα πει�αματικά π�όσθετα;</h2>
-
-<p>Τα πει�αματικά π�όσθετα π�οο�ίζονται για χ�ήση από έμπει�ους χ�ήστες ώστε να ελεγθο�ν και να αξιολογηθο�ν π�ιν διατεθο�ν για γενική χ�ήση. Πολλά από τα π�όσθετα αυτά μπο�εί να έχουν τη μο�φή απλά ενός π�ωτότυπου. Τα χα�ακτη�ιστικά, οι επιδόσεις και η ποιότητα τους μπο�εί να αντιστοιχο�ν σε δοκιμαστικές εκδόσεις.</p>
-
-<p>Συνιστάται π�οσοχή στην εγκατάσταση πει�αματικών π�όσθετων εφόσον δεν έχουν ελεχθεί από κάποιον συντάκτη μας και είναι πιθανό να δημιου�γήσουν π�οβλήματα στον υπολογιστή σας.</p>
-
-
-<h2>Πως μπο�ώ να ξέ�ω αν ένα από τα π�όσθετα του ιστότοπου είναι πει�αματικό;</h2>
-
-<p>Τα πει�αματικά π�όσθετα είναι σεσημασμένα με την ετικέτα «Πει�αματικό» και απαιτείται να έχετε συνδεθεί για να τα εγκαταστήσετε.</p>
-
-
-<h2>Γιατί θα π�έπει να συνδεθώ για να εγκαταστήσω ένα πει�αματικό π�όσθετο;</h2>
-
-<p>Ο ιστότοπος των π�όσθετων απαιτεί να έχει συνδεθεί ο χ�ήστης για να εγκαταστήσει ένα πει�αματικό π�όσθετο απλά και μόνο σαν υπενθ�μιση για το ότι π�όκειται να κάνει ένα πιθανό επισφαλές βήμα.</p>
-
-
-<h2>Θα π�έπει να συνδεθώ ή να διαθέτω λογα�ιασμό για να εγκαταστήσω π�όσθετα που β�ίσκονται στο δημόσιο χώ�ο;</h2>
-
-<p>Όχι. Ο ιστότοπος των π�όσθετων δεν απαιτεί να συνδεθείτε ή να έχετε λογα�ιασμό για να εγκαταστήσετε π�όσθετα που β�ίσκονται ήδη στο δημόσιο χώ�ο.</p>
-
diff --git a/site/app/locale/el/pages/experimental_addons.thtml b/site/app/locale/el/pages/experimental_addons.thtml
deleted file mode 100644
index 4cc8832..0000000
--- a/site/app/locale/el/pages/experimental_addons.thtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<h1>Πει�αματικά π�όσθετα</h1>
-
-
-<h2>Τι είναι τα πει�αματικά π�όσθετα;</h2>
-
-<p>Τα πει�αματικά π�όσθετα π�οο�ίζονται για χ�ήση από έμπει�ους χ�ήστες ώστε να ελεγθο�ν και να αξιολογηθο�ν π�ιν διατεθο�ν για γενική χ�ήση. Πολλά από τα π�όσθετα αυτά μπο�εί να έχουν τη μο�φή απλά ενός π�ωτότυπου. Τα χα�ακτη�ιστικά, οι επιδόσεις και η ποιότητα τους μπο�εί να αντιστοιχο�ν σε δοκιμαστικές εκδόσεις.</p>
-
-<p>Συνιστάται π�οσοχή στην εγκατάσταση πει�αματικών π�όσθετων εφόσον δεν έχουν ελεχθεί από κάποιον συντάκτη μας και είναι πιθανό να δημιου�γήσουν π�οβλήματα στον υπολογιστή σας.</p>
-
-
-<h2>Πως μπο�ώ να ξέ�ω αν ένα από τα π�όσθετα του ιστότοπου είναι πει�αματικό;</h2>
-
-<p>Τα πει�αματικά π�όσθετα είναι σεσημασμένα με την ετικέτα «Πει�αματικό» και απαιτείται να έχετε συνδεθεί για να τα εγκαταστήσετε.</p>
-
-
-<h2>Γιατί θα π�έπει να συνδεθώ για να εγκαταστήσω ένα πει�αματικό π�όσθετο;</h2>
-
-<p>Ο ιστότοπος των π�όσθετων απαιτεί να έχει συνδεθεί ο χ�ήστης για να εγκαταστήσει ένα πει�αματικό π�όσθετο απλά και μόνο σαν υπενθ�μιση για το ότι π�όκειται να κάνει ένα πιθανό επισφαλές βήμα.</p>
-
-
-<h2>Θα π�έπει να συνδεθώ ή να διαθέτω λογα�ιασμό για να εγκαταστήσω π�όσθετα που β�ίσκονται στο δημόσιο χώ�ο;</h2>
-
-<p>Όχι. Ο ιστότοπος των π�όσθετων δεν απαιτεί να συνδεθείτε ή να έχετε λογα�ιασμό για να εγκαταστήσετε π�όσθετα που β�ίσκονται ήδη στο δημόσιο χώ�ο.</p>
-
diff --git a/site/app/locale/en_US/LC_MESSAGES/messages.po b/site/app/locale/en_US/LC_MESSAGES/messages.po
index 52e088b..6568de2 100644
--- a/site/app/locale/en_US/LC_MESSAGES/messages.po
+++ b/site/app/locale/en_US/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ 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-04 13:44-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"
@@ -20,6 +20,10 @@ msgstr ""
 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. :(
 #: 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
@@ -48,33 +52,29 @@ msgstr "Public"
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Added %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Updated %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "total downloads"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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"
@@ -96,22 +96,22 @@ msgstr "per page"
 msgid "addon_list_sortby"
 msgstr "Sort by:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 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:57
 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: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
@@ -120,7 +120,7 @@ msgstr "%1$s is not available for %2$s."
 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -139,6 +139,7 @@ msgstr "Review:"
 msgid "addon_review_add_submit"
 msgstr "Submit your review"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -172,23 +173,24 @@ msgstr "Yes"
 msgid "addon_review_delete_header"
 msgstr "Delete Review"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Review deleted successfully."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, 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.
-#: controllers/reviews_controller.php:534
+#. %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 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:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -199,7 +201,7 @@ msgstr ""
 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:135
 #, php-format
 msgid "addon_review_others_by_user"
@@ -207,16 +209,16 @@ msgid_plural "addon_review_others_by_user"
 msgstr[0] "See %1$s previous review submitted by %2$s for this activity."
 msgstr[1] "See %1$s previous reviews submitted by %2$s for this activity."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -230,13 +232,13 @@ msgstr "Developer Reply:"
 msgid "addon_review_saved_successfully"
 msgstr "Your review was saved successfully. Thanks!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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
+#. %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
@@ -259,11 +261,13 @@ msgstr "Previous Activity"
 msgid "addon_version_permalink"
 msgstr "Permanent link to this version"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "The most recent version compatible with"
+#. %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 "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Go"
 
@@ -271,20 +275,20 @@ msgstr "Go"
 msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Activities"
 
-# %s is the name of the category
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Activities"
 
@@ -292,7 +296,7 @@ msgstr "Browse %1$s Themes :: %2$s Activities"
 msgid "addons_display_add_review"
 msgstr "Add a review"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Advanced Details"
 
@@ -300,11 +304,11 @@ msgstr "Advanced Details"
 msgid "addons_display_categories"
 msgstr "Categories"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "detailed review"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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"
@@ -313,142 +317,149 @@ msgstr "Don't like it"
 msgid "addons_display_edit_review"
 msgstr "Edit your review"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "This activity has a privacy policy."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Developer Comments"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Homepage"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Reviews"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Support"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Like it"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Long Description"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 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.
-#: views/addons/display.thtml:421
+#. %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] "Other activities by %1$s"
 msgstr[1] "Other activities by these authors"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Support for this activity is provided by the developer at %s"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
-"Support for this activity is provided by the developer at %s or by sending an "
-"e-mail to %s"
+"Support for this activity is provided by the developer at %1$s or by sending "
+"an e-mail to %2$s"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Support for this activity is provided by the developer at %s"
 
-#: views/addons/display.thtml:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Rate It"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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 "
 "available to activity developers and they may need to contact you to help "
 "resolve your issue."
 
-# %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "See the <a href=\"%1$s\">support section</a> to find out where to get "
 "assistance for this activity."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Save"
 
-#: views/addons/display.thtml:415
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "See All %1$s Activities"
 
-# %1 is the number of reviews
-#: views/addons/display.thtml:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "See all reviews (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "See All Versions"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Complete Version History"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "View the source"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "View statistics"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "What do you think?"
 
@@ -458,7 +469,7 @@ msgstr "Works with:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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"
@@ -469,10 +480,11 @@ msgstr "by"
 msgid "addons_home_feature_head"
 msgstr "We Recommend"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -487,7 +499,9 @@ msgstr "Newest:"
 msgid "addons_home_other_applications"
 msgstr "Other Applications"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -497,19 +511,20 @@ msgstr "Other Applications"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -603,6 +618,7 @@ msgstr "for Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "for Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -622,12 +638,13 @@ msgstr ""
 "graphic formats or playing multimedia files. Plugins are slightly different "
 "from extensions, which modify or add to existing functionality."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Common Plugins for %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
@@ -638,6 +655,7 @@ msgstr "Plugins"
 msgid "addons_plugins_support_documentation"
 msgstr "Support Documentation: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -645,24 +663,24 @@ msgstr ""
 "%s requires that you accept the following End-User License Agreement before "
 "installation can proceed:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Previews for %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 msgid "addons_recommended_introduction"
 msgstr ""
 "With so many great activities 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Recommended Activities"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Recommended Activities"
 
@@ -670,7 +688,7 @@ msgstr "Recommended Activities"
 msgid "addons_searchengines_additional_resources"
 msgstr "Additional Resources"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
@@ -688,35 +706,35 @@ msgstr ""
 "disabled.  Please enable JavaScript before trying to install any of the "
 "search plugins below."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %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 "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: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: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: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
+#. 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:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Search Engines"
 
@@ -726,11 +744,35 @@ msgstr ""
 "Special thanks to the Mycroft Project for their work on Firefox Search "
 "Engines."
 
+#: views/addons/display.thtml:104
+msgid "addons_share_button_text"
+msgstr "Share this"
+
+#: controllers/addons_controller.php:89
+msgid "addons_share_label_delicious"
+msgstr "Add to Delicious"
+
+#: controllers/addons_controller.php:77
+msgid "addons_share_label_digg"
+msgstr "Digg this!"
+
+#: controllers/addons_controller.php:83
+msgid "addons_share_label_facebook"
+msgstr "Post to Facebook"
+
+#: controllers/addons_controller.php:101
+msgid "addons_share_label_friendfeed"
+msgstr "Share on FriendFeed"
+
+#: controllers/addons_controller.php:95
+msgid "addons_share_label_myspace"
+msgstr "Post to MySpace"
+
 #: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
 msgstr "Disabled"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Incomplete Version"
 
@@ -738,15 +780,18 @@ msgstr "Incomplete Version"
 msgid "addons_status_nominated"
 msgstr "In Sandbox; Public Nomination"
 
-#: controllers/components/amo.php:195 controllers/components/amo.php:226
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:195
+#: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "In Sandbox; Pending Review"
 
-#: controllers/components/amo.php:199 controllers/components/amo.php:228
+#: views/pages/js_constants.js.thtml:68 controllers/components/amo.php:199
+#: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Public"
 
-#: controllers/components/amo.php:193 controllers/components/amo.php:225
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:193
+#: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "In Sandbox"
 
@@ -768,11 +813,12 @@ msgstr ""
 "These versions are displayed for reference and testing purposes. You should "
 "always use the latest version of an activity."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Version History with Changelogs"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s Version History"
@@ -785,6 +831,7 @@ msgstr "Add Group"
 msgid "admin_group_delete_pagetitle"
 msgstr "Delete Group"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -902,7 +949,7 @@ msgstr "Type"
 msgid "advanced_search_form_version"
 msgstr "version"
 
-#: views/pages/js_constants.js.thtml:68
+#: views/pages/js_constants.js.thtml:84
 msgid "app_compat_ignore_check"
 msgstr "Ignore version check"
 
@@ -910,16 +957,20 @@ msgstr "Ignore version check"
 msgid "app_compat_older_firefox_only"
 msgstr "This activity is for older versions of Firefox"
 
+#. %1$s and %2$s are URLs
 #: 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: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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -930,23 +981,23 @@ msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Upgrade Firefox</a> to use this activity"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Activities by Name"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Newest Activities"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Popular Activities"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Activities by Rating"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Recently Updated Activities"
 
@@ -978,7 +1029,7 @@ msgstr "Last Updated First"
 msgid "category_extra_mostpopular"
 msgstr "Most Popular First"
 
-# %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"
@@ -988,11 +1039,19 @@ msgstr "See All %1$s"
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
+#. %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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Activity 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:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
@@ -1025,6 +1084,8 @@ msgstr "Adjust maxVersion without uploading"
 msgid "compatibility_developers_check_status"
 msgstr "Check Status of My Activities"
 
+#. %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 ""
@@ -1048,6 +1109,10 @@ msgstr "Activity Status Check Results"
 msgid "compatibility_developers_retrieving"
 msgstr "Retrieving status of hosted activities..."
 
+#. %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 %2$s users (%3$s&#37; of total)"
@@ -1062,6 +1127,8 @@ msgstr ""
 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:69
 msgid "compatibility_report_intro"
 msgstr ""
@@ -1073,6 +1140,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Activities compatible with an alpha version of %1$s"
@@ -1081,6 +1149,7 @@ msgstr "Activities 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
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "Activities compatible with a beta version or release candidate of %1$s"
@@ -1089,6 +1158,7 @@ msgstr "Activities 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
 #: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Activities up-to-date with the latest builds of %1$s"
@@ -1097,6 +1167,7 @@ msgstr "Activities 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
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Activities not compatible with any version of %1$s"
@@ -1114,12 +1185,13 @@ msgstr "Information for Activity Users"
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "For information on contributing, please see our %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wiki page"
 
@@ -1161,26 +1233,31 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: views/pages/credits.thtml:135
+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
 #: views/elements/collections_interactive_addon.thtml:85
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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"
 
-# date and time format string (strftime)
+#. 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 "%B %e, %Y, %I:%M %p"
@@ -1201,14 +1278,38 @@ msgstr "Upload New Version"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 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"
+#: 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: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: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:1318
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 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"
@@ -1256,36 +1357,36 @@ msgstr "Step 5: Success"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Submission Help"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Activity disabled successfully"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Edit Activity"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Activity enabled successfully"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Activity Description"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Activity Homepage"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Activity Name"
 
@@ -1294,40 +1395,256 @@ msgstr "Activity Name"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Preview Caption"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Privacy Policy"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Activity Summary"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Support Email"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "Support URL"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Version Notes"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Nominate Activity"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Activity nominated successfully!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: views/developers/addon_status.thtml:178
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+#: 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:136
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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:170
+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."
+
+#: views/developers/addon_status.thtml:111
+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>."
+
+#: views/developers/addon_status.thtml:108
+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."
+
+#: views/developers/addon_status.thtml:102
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: views/developers/addon_status.thtml:121
+msgid "devcp_addon_status_criteria_prerelease"
+msgstr "Add-on is not marked as pre-release."
+
+#: views/developers/addon_status.thtml:119
+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"
+
+#. %s is the status in a span, e.g. "<span>_('Public')</span>".
+#: views/developers/addon_status.thtml:58
+msgid "devcp_addon_status_header"
+msgstr "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+msgid "devcp_addon_status_header_active"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
+
+#: views/developers/addon_status.thtml:97
+msgid "devcp_addon_status_header_criteria"
+msgstr "Add-on Completion Criteria"
+
+#: views/developers/addon_status.thtml:165
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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:166
+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."
+
+#: 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:126
+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."
+
+#: views/developers/addon_status.thtml:64
+msgid "devcp_addon_status_public"
+msgstr "Public"
+
+#: views/developers/addon_status.thtml:63
+msgid "devcp_addon_status_sandbox"
+msgstr "Sandbox"
+
+#. %s is an email address.
+#: views/developers/addon_status.thtml:89
+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
+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
+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
+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
+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
+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 "%s Status"
+
+#: 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"
@@ -1350,7 +1667,7 @@ msgstr ""
 "sandbox testers and a SugarLabs Activities 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
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1360,7 +1677,7 @@ 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
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1383,16 +1700,16 @@ msgstr ""
 "Because your activity is trusted, this version has automatically been approved "
 "for the public area."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Submit Activity"
 
-#: controllers/developers_controller.php:2375
+#: controllers/developers_controller.php:2460
 msgid "devcp_addon_updated_successfully"
 msgstr "Activity 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
 #, php-format
 msgid "devcp_addon_upload_preview"
@@ -1402,7 +1719,7 @@ msgstr "You may wish to %s to increase interest in your activity."
 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"
@@ -1431,10 +1748,86 @@ msgstr "Next"
 msgid "devcp_change_addontype"
 msgstr "Change activity type:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "Developer Comments updated."
 
+#: views/developers/dashboard.thtml:68
+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>
+#: views/developers/dashboard.thtml:69
+msgid "devcp_dashboard_addontype_status"
+msgstr "%1$s currently %2$s and %3$s"
+
+#: views/developers/dashboard.thtml:67
+msgid "devcp_dashboard_change_status"
+msgstr "Change Status"
+
+#. %s is the addons email address.
+#: views/developers/dashboard.thtml:99
+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 "Add-on Status: %s"
+
+#: views/developers/dashboard.thtml:43
+msgid "devcp_dashboard_header_main"
+msgstr "Developer Dashboard"
+
+#: views/developers/dashboard.thtml:110
+msgid "devcp_dashboard_header_welcome"
+msgstr "Welcome to the Developer Dashboard"
+
+#: views/developers/dashboard.thtml:68
+msgid "devcp_dashboard_inactive"
+msgstr "Inactive"
+
+#. %s is a date in the _('date') format
+#: views/developers/dashboard.thtml:65
+msgid "devcp_dashboard_last_edited"
+msgstr "Last edited on %s"
+
+#: views/developers/dashboard.thtml:111
+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 "Get Started"
+
+#: views/developers/dashboard.thtml:82
+msgid "devcp_dashboard_versions"
+msgstr "Versions and Files"
+
+#: views/developers/dashboard.thtml:91
+msgid "devcp_dashboard_versions_new"
+msgstr "Upload a new version"
+
+#. %s is the preview ID number.
+#: 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:1340
+msgid "devcp_delete_previews_success"
+msgstr "Preview %s has been deleted successfully."
+
+#: controllers/developers_controller.php:1032
+msgid "devcp_delete_version_priv_error"
+msgstr "You do not have privileges to delete versions or files."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Add Preview"
@@ -1527,6 +1920,7 @@ msgstr "No support url provided by developer."
 msgid "devcp_details_trusted"
 msgstr "Trusted"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1556,6 +1950,7 @@ msgstr ""
 "checks. The activity 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"
@@ -1576,11 +1971,57 @@ msgstr ""
 "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"
+
+#: views/developers/discuss.thtml:57
+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
+#: views/developers/discuss.thtml:70
+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
+#: views/developers/discuss.thtml:46
+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
+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 "Submit Reply"
+
+#: views/developers/discuss.thtml:72
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Add Author"
@@ -1593,10 +2034,247 @@ msgstr "Author's Email Address"
 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:94
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: views/developers/addon_edit_authors.thtml:81
+msgid "devcp_edit_authors_add_email"
+msgstr "Author Account Email:"
+
+#: views/developers/addon_edit_authors.thtml:96
+msgid "devcp_edit_authors_add_loading"
+msgstr "Checking account email..."
+
+#: 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:57
+msgid "devcp_edit_authors_header_current"
+msgstr "Current Authors"
+
+#: views/developers/addon_edit_authors.thtml:49
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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: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: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:88
+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
+msgid "devcp_edit_authors_option_empty"
+msgstr "----------------"
+
+#: 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:61
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. Column name in a table.
+#: 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:62
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+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).
+#: views/developers/addon_edit_categories.thtml:61
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit_categories.thtml:91
+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 "Category %s"
+
+#: views/developers/addon_edit_categories.thtml:94
+#: views/developers/addon_edit_categories.thtml:103
+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
+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
+msgid "devcp_edit_categories_select_application_categories"
+msgstr "Select up to three %s categories for your add-on"
+
+#: views/developers/addon_edit.thtml:47
+msgid "devcp_edit_dd_manage_authors"
+msgstr "Add or remove users that can manage this add-on."
+
+#: views/developers/addon_edit.thtml:49
+msgid "devcp_edit_dd_manage_categories"
+msgstr ""
+"Select the relevant categories for each application your add-on supports."
+
+#: views/developers/addon_edit.thtml:51
+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
+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
+msgid "devcp_edit_description_button_update"
+msgstr "Update Descriptions"
+
+#: 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:50
+msgid "devcp_edit_descriptions_header"
+msgstr "Edit Add-on Descriptions"
+
+#: 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 "
+"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
+msgid "devcp_edit_descriptions_transbox_comments_name"
+msgstr "Developer Comments"
+
+#: 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:84
+msgid "devcp_edit_descriptions_transbox_description_name"
+msgstr "Add-on Description"
+
+#: 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 "
+"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 "End-User License Agreement"
+
+#: 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:110
+msgid "devcp_edit_descriptions_transbox_privacy_name"
+msgstr "Privacy Policy"
+
+#: 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:76
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: views/developers/edit.thtml:77
 msgid "devcp_edit_error_categories_unavailable"
 msgstr "No categories available for this activity 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"
@@ -1662,6 +2340,171 @@ msgstr "Target Locale"
 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:197
+msgid "devcp_edit_properties_change_guid"
+msgstr "Only change if you understand all of the consequences."
+
+#: views/developers/addon_edit_properties.thtml:108
+msgid "devcp_edit_properties_current_icon"
+msgstr "Current Icon"
+
+#: 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:166
+msgid "devcp_edit_properties_flags"
+msgstr "These flags are used to filter and classify add-ons."
+
+#: 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:52
+msgid "devcp_edit_properties_header"
+msgstr "Edit Add-on Properties"
+
+#: views/developers/addon_edit_properties.thtml:185
+msgid "devcp_edit_properties_header_addon_type"
+msgstr "Add-on Type"
+
+#: views/developers/addon_edit_properties.thtml:180
+msgid "devcp_edit_properties_header_admin_settings"
+msgstr "Admin Settings"
+
+#: views/developers/addon_edit_properties.thtml:83
+msgid "devcp_edit_properties_header_default_locale"
+msgstr "Default Locale"
+
+#: views/developers/addon_edit_properties.thtml:165
+msgid "devcp_edit_properties_header_flags"
+msgstr "Add-on Flags"
+
+#: 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:103
+msgid "devcp_edit_properties_header_icon"
+msgstr "Add-on Icon"
+
+#: 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:181
+msgid "devcp_edit_properties_header_trusted"
+msgstr "Trusted Add-on?"
+
+#: 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:105
+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
+msgid "devcp_edit_properties_label_binary"
+msgstr "This add-on contains binary components"
+
+#: views/developers/addon_edit_properties.thtml:184
+msgid "devcp_edit_properties_label_not_trusted"
+msgstr "Not Trusted"
+
+#: views/developers/addon_edit_properties.thtml:183
+msgid "devcp_edit_properties_label_trusted"
+msgstr "Trusted"
+
+#: views/developers/addon_edit_properties.thtml:109
+msgid "devcp_edit_properties_new_icon"
+msgstr "New Icon"
+
+#: views/developers/addon_edit_properties.thtml:117
+msgid "devcp_edit_properties_remove_icon"
+msgstr "Remove Icon"
+
+#: 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:134
+msgid "devcp_edit_properties_transbox_homepage_name"
+msgstr "Add-on Homepage"
+
+#: 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:77
+msgid "devcp_edit_properties_transbox_name_name"
+msgstr "Add-on Name"
+
+#: 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:143
+msgid "devcp_edit_properties_transbox_supportemail_name"
+msgstr "Support Email Address"
+
+#: 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:152
+msgid "devcp_edit_properties_transbox_supporturl_name"
+msgstr "Support Website"
+
+#: 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:118
+msgid "devcp_edit_properties_undelete"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
+
+#: 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:161
+msgid "devcp_edit_properties_view_source_allow"
+msgstr "Allow online source viewing"
+
+#: 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"
@@ -1672,11 +2515,55 @@ 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"
+
+#: views/elements/developers/editbox.thtml:47
+msgid "devcp_editbox_categories"
+msgstr "Categories"
+
+#: views/elements/developers/editbox.thtml:52
+msgid "devcp_editbox_change_status"
+msgstr "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Featured Activities"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1685,7 +2572,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Moderated Reviews (%s)"
 msgstr[1] "Moderated Reviews (%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
 #, php-format
@@ -1694,7 +2581,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Nominated Activities (%s)"
 msgstr[1] "Nominated Activities (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1707,8 +2594,8 @@ 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)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
 #: views/developers/editversion.thtml:58
 #, php-format
 msgid "devcp_editversion_filename_size"
@@ -1734,29 +2621,30 @@ msgstr "Notes to Reviewer"
 msgid "devcp_editversion_submit_update"
 msgstr "Update"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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 activity."
 
+#. %s is a number
 #: views/developers/add_step2.thtml:126
-#: controllers/developers_controller.php:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: controllers/developers_controller.php:1992
 msgid "devcp_error_addonname_not_unique"
 msgstr ""
 "The name for your activity already exists in the database. Please make sure "
@@ -1764,27 +2652,46 @@ msgstr ""
 "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
 #, 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.
 #: controllers/components/developers.php:591
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "this page"
 
-#: controllers/developers_controller.php:2013
+#: controllers/developers_controller.php:2098
 msgid "devcp_error_describe_changes"
 msgstr "Please describe the changes made in this activity update."
 
+#. %1$s is the name of the file
+#: controllers/components/developers.php:658
+#, 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
 #: controllers/components/developers.php:355
 #, php-format
 msgid "devcp_error_file_extension"
 msgstr ""
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 "That file extension (%s) is not allowed for the selected activity type. Please "
 "use one of the following: %s"
+=======
+"That file extension (%1$s) is not allowed for the selected add-on type. "
+"Please use one of the following: %2$s"
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Not all file GUIDs match"
 
@@ -1813,20 +2720,23 @@ 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
 #: controllers/components/developers.php:401
 #, php-format
 msgid "devcp_error_icon_extension"
 msgstr ""
-"That file extension (%s) is not allowed for an icon. Please use one of the "
-"following: %s"
+"That file extension (%1$s) is not allowed for an icon. Please use one of the "
+"following: %2$s"
 
-#: controllers/developers_controller.php:1723
+#. %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 activity and platform."
 
-#: controllers/developers_controller.php:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No install.rdf present."
 
@@ -1834,25 +2744,31 @@ msgstr "No install.rdf present."
 msgid "devcp_error_install_manifest"
 msgstr "The following errors were found in install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Please select a valid activity type."
 
+#. %$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 "%s is not a valid version for %s"
+msgstr "%1$s is not a valid version for %2$s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "The ID of this activity is invalid: %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 is not a valid version for %s: minimum versions cannot contain *"
+msgstr ""
+"%1$s is not a valid version for %2$s: minimum versions cannot contain *"
 
 #: controllers/components/developers.php:536
 msgid "devcp_error_invalid_version"
@@ -1864,6 +2780,7 @@ msgstr ""
 msgid "devcp_error_invalid_version_spaces"
 msgstr "The version of this activity is invalid: versions cannot contain spaces."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1873,6 +2790,7 @@ 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
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1895,15 +2813,15 @@ msgstr "No ID could be found for this activity in install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "No platform selected"
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "You must supply the requested details for nomination."
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "You cannot nominate a pre-release activity."
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "You can only nominate activities currently in the sandbox."
 
@@ -1915,20 +2833,22 @@ msgstr "Please select at least one category."
 msgid "devcp_error_one_user"
 msgstr "There must be at least one author for this activity."
 
+#. %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 ""
-"That file extension (%s) is not allowed for a preview. Please use one of the "
-"following: %s"
+"That file extension (%1$s) is not allowed for a preview. Please use one of "
+"the following: %2$s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "You do not have permission to update this activity."
 
@@ -1944,7 +2864,7 @@ msgstr ""
 "Activities cannot use an external updateURL. Please remove this from install."
 "rdf and try again."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Please upload a file."
@@ -2161,11 +3081,64 @@ msgstr "Success"
 msgid "devcp_index_header_myaddons"
 msgstr "My Activities"
 
+#: views/pages/js_constants.js.thtml:79
+msgid "devcp_js_a_cancel"
+msgstr "Cancel"
+
+#: views/pages/js_constants.js.thtml:80
+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:71
+msgid "devcp_js_img_move_down"
+msgstr "Move Down"
+
+#. alt text for an up-arrow image.
+#: views/pages/js_constants.js.thtml:72
+msgid "devcp_js_img_move_up"
+msgstr "Move Up"
+
+#: views/pages/js_constants.js.thtml:81
+msgid "devcp_js_img_remove_compat"
+msgstr "Remove Application Compatibility"
+
+#: views/pages/js_constants.js.thtml:76
+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:74
+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:73
+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:75
+msgid "devcp_js_option_viewer"
+msgstr "Viewer"
+
+#: views/pages/js_constants.js.thtml:78
+msgid "devcp_js_remove_author"
+msgstr "Remove Author"
+
+#: views/pages/js_constants.js.thtml:77
+msgid "devcp_js_sure_remove"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
+
+#: views/pages/js_constants.js.thtml:67
+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 "Localized Fields"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2209,33 +3182,64 @@ msgstr "Submit Activity"
 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:232
+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
+msgid "devcp_nominate_cancel"
+msgstr "Cancel and return"
+
 #: views/developers/nominate.thtml:53
 msgid "devcp_nominate_link_returnto_details"
 msgstr "Return to activity 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"
 
-# %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 activity type: %s."
 
+#: views/developers/addon_edit_properties.thtml:49
+#: views/developers/addon_status.thtml:49
+#: 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: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
+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 ""
 "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"
@@ -2251,9 +3255,13 @@ msgstr ""
 "Making this the default preview will remove default status from the current "
 "default preview."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: views/developers/addon_edit_authors.thtml:69
+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
@@ -2282,6 +3290,51 @@ msgstr "Edit Preview"
 msgid "devcp_preview_updated_successfully"
 msgstr "Preview updated successfully."
 
+#: views/developers/previews.thtml:121
+msgid "devcp_previews_a_another"
+msgstr "Add Another Preview"
+
+#: views/developers/previews.thtml:97
+msgid "devcp_previews_a_delete"
+msgstr "Delete Preview"
+
+#: views/developers/previews.thtml:96
+msgid "devcp_previews_a_replace"
+msgstr "Replace Preview"
+
+#: views/developers/previews.thtml:127
+msgid "devcp_previews_a_update"
+msgstr "Update Previews"
+
+#: 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: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: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: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:108
+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 ""
@@ -2293,10 +3346,18 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Add Preview"
 
+#: views/developers/previews.thtml:79
+msgid "devcp_previews_header_caption"
+msgstr "Preview Caption"
+
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "Edit Preview"
 
+#: views/developers/previews.thtml:94
+msgid "devcp_previews_label_default"
+msgstr "Default Preview"
+
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
 msgstr "Preview File"
@@ -2305,6 +3366,29 @@ msgstr "Preview File"
 msgid "devcp_previews_label_makedefault"
 msgstr "Make this the default preview image"
 
+#: views/developers/previews.thtml:101
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: views/developers/previews.thtml:58
+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 "Delete Preview"
@@ -2321,57 +3405,154 @@ msgstr "Edit Preview"
 msgid "devcp_previews_submit_upload"
 msgstr "Upload Preview"
 
+#: views/developers/previews.thtml:77
+msgid "devcp_previews_thumbnail"
+msgstr "Thumbnail"
+
+#. %s is the add-on name.
+#: views/developers/previews.thtml:43
+msgid "devcp_previews_title"
+msgstr "%s Preview Manager"
+
 #: views/developers/add_step2.thtml:64
 msgid "devcp_question_addontype_incorrect"
 msgstr "Incorrect?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Are you sure you want to delete this file?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
 
+#: views/elements/developers/rolecheck.thtml:42
+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
+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
+msgid "devcp_sidebar_a_dashboard"
+msgstr "Dashboard"
+
 #: views/developers/add_step1.thtml:123
 msgid "devcp_skip_reviewing_addon_info"
 msgstr "Skip updating my current activity information"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Active Daily Users"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> Total Downloads"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Weekly Downloads"
 
-#: controllers/developers_controller.php:1481
+#: views/developers/addon_status_confirm.thtml:59
+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
+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
+msgid "devcp_status_confirm_header_sure"
+msgstr "Are you sure?"
+
+#: views/developers/addon_status_confirm.thtml:55
+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
+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
+msgid "devcp_status_confirm_no"
+msgstr "No, cancel"
+
+#: views/developers/addon_status_confirm.thtml:67
+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
+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
+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
+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
+msgid "devcp_status_confirm_yes"
+msgstr "Yes, I'm Sure"
+
+#: views/developers/addon_status_nominate.thtml:46
+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
+msgid "devcp_status_nominate_header"
+msgstr "Add-on Nomination"
+
+#: controllers/developers_controller.php:1566
 msgid "devcp_submissions_disabled"
 msgstr ""
 "Activity submissions are currently disabled. Please check back at a later time."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "I Accept"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "I Decline"
 
@@ -2387,11 +3568,11 @@ msgstr "Disabled"
 msgid "devcp_summary_header_trusted"
 msgstr "Trusted"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2401,7 +3582,7 @@ msgstr "You don't have any activities. Click %s to submit one."
 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
 #, php-format
 msgid "devcp_theme_upload_preview"
@@ -2411,30 +3592,569 @@ msgstr "Please be sure to %s for your theme."
 msgid "devcp_theme_upload_preview_link"
 msgstr "upload a preview"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+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
+msgid "devcp_transbox_a_title_help"
+msgstr "Help (does not leave page)"
+
+#: 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/developers/translationbox.thtml:97
+msgid "devcp_transbox_chars_used"
+msgstr "Characters used: %1$s / %2$s"
+
+#: 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/developers/translationbox.thtml:143
+msgid "devcp_transbox_help_header_tabs"
+msgstr "What are these %s tabs?"
+
+#: views/elements/developers/translationbox.thtml:145
+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 "Hide Help"
+
+#: 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 "
+"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
+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 "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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: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: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: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:319
+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
+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
+msgid "devcp_uploader_a_start"
+msgstr "Get Started"
+
+#: views/developers/uploader.thtml:103
+msgid "devcp_uploader_ajax_loading"
+msgstr "Uploading file..."
+
+#: views/developers/uploader.thtml:123
+msgid "devcp_uploader_button_edit"
+msgstr "Edit My Add-on"
+
+#: views/developers/uploader.thtml:124
+msgid "devcp_uploader_button_later"
+msgstr "I'll complete my add-on later."
+
+#: 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:122
+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
+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
+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
+msgid "devcp_uploader_header_created"
+msgstr "Add-on Created!"
+
+#: 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:139
+msgid "devcp_uploader_header_file_added"
+msgstr "File Added!"
+
+#: views/developers/uploader.thtml:66
+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
+msgid "devcp_uploader_header_update_created"
+msgstr "Version %s Created"
+
+#: views/developers/uploader.thtml:83
+msgid "devcp_uploader_header_upload"
+msgstr "Upload Your File"
+
+#: views/developers/uploader.thtml:67
+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
+msgid "devcp_uploader_label_platformtype"
+msgstr "Supported Platforms:"
+
+#: views/developers/uploader.thtml:90
+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
+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
+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
+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
+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
+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
+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
+msgid "devcp_uploader_platformtype_all"
+msgstr "All"
+
+#: views/developers/uploader.thtml:92
+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
+msgid "devcp_uploader_title_file"
+msgstr "Add File to %1$s %2$s"
+
+#: views/developers/uploader.thtml:50
+msgid "devcp_uploader_title_submit"
+msgstr "Submit New Add-on"
+
+#. %s is the add-on name.
+#: views/developers/uploader.thtml:54
+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 "Please see %s for reference."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "this page"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: controllers/developers_controller.php:527
+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 "Edit Version"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Version updated successfully."
 
+#: views/developers/versions.thtml:75
+msgid "devcp_versions_a_cancel"
+msgstr "Cancel"
+
+#: views/developers/versions.thtml:79
+msgid "devcp_versions_a_delete"
+msgstr "Delete Version"
+
+#: views/developers/versions.thtml:74
+msgid "devcp_versions_a_empty"
+msgstr "Remove Empty Version"
+
+#: views/developers/versions.thtml:71
+msgid "devcp_versions_a_remove"
+msgstr "Remove?"
+
+#: views/developers/versions.thtml:91
+msgid "devcp_versions_add"
+msgstr "Add New Version"
+
+#: views/developers/versions_delete.thtml:58
+msgid "devcp_versions_delete_a_cancel"
+msgstr "Cancel"
+
+#: views/developers/versions_delete.thtml:56
+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
+msgid "devcp_versions_delete_also"
+msgstr "This will also delete:"
+
+#: views/developers/versions_delete.thtml:53
+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
+msgid "devcp_versions_delete_header"
+msgstr "Delete Version %s?"
+
+#: views/developers/versions_delete.thtml:52
+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
+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
+msgid "devcp_versions_edit_a_cancel"
+msgstr "Cancel"
+
+#: views/developers/versions_edit.thtml:100
+msgid "devcp_versions_edit_a_delete"
+msgstr "Delete File"
+
+#: views/developers/versions_edit.thtml:164
+msgid "devcp_versions_edit_a_new_app"
+msgstr "Add New Application"
+
+#: views/developers/versions_edit.thtml:153
+msgid "devcp_versions_edit_a_remove_app"
+msgstr "Remove Application"
+
+#: 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: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: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: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:186
+msgid "devcp_versions_edit_header_approval"
+msgstr "Approval Information"
+
+#: views/developers/versions_edit.thtml:119
+msgid "devcp_versions_edit_header_compat"
+msgstr "Compatible Applications"
+
+#: views/developers/versions_edit.thtml:73
+msgid "devcp_versions_edit_header_file"
+msgstr "File Information"
+
+#. %s is the version number.
+#: views/developers/versions_edit.thtml:52
+msgid "devcp_versions_edit_header_manage"
+msgstr "Manage Version %s"
+
+#: views/developers/versions_edit.thtml:194
+msgid "devcp_versions_edit_header_notes"
+msgstr "Approval Notes"
+
+#: views/developers/versions_edit.thtml:97
+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.
+#: 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:110
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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:150
+msgid "devcp_versions_edit_remove_compat"
+msgstr "Remove Application Compatibility"
+
+#: views/developers/versions_edit.thtml:166
+msgid "devcp_versions_edit_select_app"
+msgstr "Please Select an Application"
+
+#: views/developers/versions_edit.thtml:77
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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 "
+"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 "Release Notes"
+
+#: 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: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:200
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %s is a version number, base 10.
+#: views/developers/versions.thtml:46
+msgid "devcp_versions_notice_success"
+msgstr "Version %s deleted successfully."
+
+#: views/developers/versions.thtml:73
+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
+msgid "devcp_versions_th_created"
+msgstr "Created"
+
+#: views/developers/versions.thtml:57
+msgid "devcp_versions_th_status"
+msgstr "Status"
+
+#: views/developers/versions.thtml:56
+msgid "devcp_versions_th_version"
+msgstr "Version"
+
 #: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "This activity is disabled"
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+msgid "editor_review_error_file_not_pending"
+msgstr "This file is not pending review."
+
+#. Actions are, for example: approving or rejecting
+#: controllers/components/editors.php:79
+#: controllers/components/editors.php:182
+msgid "editor_review_error_no_action"
+msgstr "Please select a review action."
+
+#: controllers/components/editors.php:192
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filter"
@@ -2443,7 +4163,7 @@ msgstr "Filter"
 msgid "editorcp_logs_filter_by"
 msgstr "Filter by type/action"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Event Log"
 
@@ -2495,16 +4215,17 @@ msgstr "Hide Comments"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Show Comments"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
-msgstr "View entries between %s and %s"
+msgstr "View entries between %1$s and %2$s"
 
 #: views/editors/reviewlog.thtml:104
 msgid "editorcp_reviewlog_none_found"
 msgstr "No reviews found for this period."
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Review Log"
 
@@ -2528,24 +4249,24 @@ msgstr "Recent Editor Activity"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total Reviews"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Review Activity"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Please complete the following fields:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Please select at least one file to review."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Self-reviews are not allowed."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "External Software"
 
@@ -2557,39 +4278,39 @@ msgstr "Add feature"
 msgid "editors_featured_add_feature_submit"
 msgstr "Add"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Successfully added feature."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Successfully removed feature."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Featured Activities"
 
@@ -2621,39 +4342,40 @@ msgstr "Activity Policy"
 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:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "There are currently no activities of this type to review."
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 day"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hour"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minute"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Editor Tools"
 
-#: controllers/editors_controller.php:286
+#. %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 "%s only"
 
-#: controllers/editors_controller.php:301
+#: 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:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2667,20 +4389,24 @@ msgstr "Clear"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Review Action"
 
+#: views/editors/review.thtml:153
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Push to Public"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Request Super-Review"
 
@@ -2688,34 +4414,41 @@ msgstr "Request Super-Review"
 msgid "editors_review_action_sandbox"
 msgstr "Retain in Sandbox"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Review Comments"
 
-#: views/editors/review.thtml:167
+#: 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:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "This will mark the activity 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:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "This will retain the activity in the sandbox."
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "This will approve a sandboxed version of a public activity to appear on the "
 "public side."
 
-#: views/editors/review.thtml:162
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "This will cause a sandboxed version of a public activity to remain in the "
 "sandbox."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "If you have concerns about this activity's security, copyright issues, or "
@@ -2742,15 +4475,15 @@ msgstr "Categories:"
 msgid "editors_review_header_compatibility"
 msgstr "Compatibility:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Description"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Developer Comments"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2758,85 +4491,108 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Files:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Item History"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomination Message"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Previews"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Review %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes to Reviewer"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Summary"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Version Notes"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: views/elements/developers/editors_review_history_item.thtml:78
+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 "Admin Review"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Nomination Approved/Public"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomination Denied/Sandbox"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "No previous review entries could be found."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Admin Review"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Approved/Public"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Denied/Sandbox"
 
-#: views/editors/review.thtml:198
+#. 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] "Show/Hide Replies (%1$s)"
+msgstr[1] "Show/Hide Replies (%1$s)"
+
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Applications:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "or select a canned response:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Comments:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Operating Systems:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Top"
 
@@ -2844,7 +4600,7 @@ msgstr "Top"
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "No previews found."
 
@@ -2852,41 +4608,51 @@ msgstr "No previews found."
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Review Queue"
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 # %1 is the activities 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
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Process Action"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Action"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comments"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Date"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Reviewer"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Version/File"
 
-#: controllers/editors_controller.php:411
+#: 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:422
 msgid "editors_reviewed_successfully"
 msgstr "Review successfully processed."
 
@@ -2910,7 +4676,7 @@ msgstr "Action"
 msgid "editors_reviews_in_reply_to"
 msgstr "In reply to:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Reviews processed successfully!"
 
@@ -2922,23 +4688,23 @@ msgstr "There are currently no reviews in moderation."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Process Reviews"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Site Specific"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "New"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Updated"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Tested Application"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Tested Operating Systems"
 
@@ -2979,17 +4745,20 @@ msgstr "Platforms"
 msgid "editors_th_submissiontypes"
 msgstr "Submission Types"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s days"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s hours"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutes"
@@ -2998,8 +4767,8 @@ msgstr "%s minutes"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Access Denied"
 
@@ -3007,12 +4776,13 @@ msgstr "Access Denied"
 msgid "error_access_denied_message"
 msgstr "You are not authorized to view this page."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3022,18 +4792,19 @@ msgstr "You are not authorized to view this page."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Activity not found!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "This activity is not viewable here."
 
@@ -3041,7 +4812,7 @@ msgstr "This activity is not viewable here."
 msgid "error_addon_selfreview"
 msgstr "You cannot review your own activity."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "No activities in this category!"
 
@@ -3063,24 +4834,25 @@ msgstr "This is not a valid email address."
 msgid "error_field_required"
 msgstr "This field must not be empty."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "File not found!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "File error: %s does not exist."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3097,16 +4869,18 @@ 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
 #: 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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3124,7 +4898,7 @@ msgstr "Notice"
 msgid "error_preview_notfound"
 msgstr "Preview not found!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "You must select a rating."
 
@@ -3176,8 +4950,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Wrong username or password!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Version not found!"
 
@@ -3189,13 +4963,18 @@ msgstr "Wrong password entered!"
 msgid "feature_learnmore"
 msgstr "Learn more"
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 # %1 is the activity name
+=======
+#. %1 is the add-on name
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Learn more about %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3207,6 +4986,60 @@ 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
+#: views/files/browse.thtml:65
+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)
+#: views/files/browse.thtml:67
+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)
+#: views/files/browse.thtml:64
+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)
+#: views/files/browse.thtml:46
+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.
+#: views/files/browse.thtml:68
+msgid "file_browser_toggle_expand_collapse"
+msgstr "+/-"
+
+#. Link text for the AMO About page.
+#: views/elements/footer.thtml:72
+msgid "footer_a_about"
+msgstr "About"
+
+#. Link text to the AMO blog.
+#: views/elements/footer.thtml:74
+msgid "footer_a_blog"
+msgstr "Blog"
+
+#. Link text to the Frequently Asked Questions page.
+#: views/elements/footer.thtml:73
+msgid "footer_a_faq"
+msgstr "FAQ"
+
+#. Full text for the FAQ abbreviation.
+#: views/elements/footer.thtml:73
+msgid "footer_abbr_faq"
+msgstr "Frequently Asked Questions"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "All rights reserved."
@@ -3219,7 +5052,7 @@ msgstr "Copyright"
 msgid "footer_credits"
 msgstr "Credits"
 
-#: views/elements/footer.thtml:73
+#: views/elements/footer.thtml:75 views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "SugarLabs is providing links to these applications as a courtesy, and makes no "
@@ -3243,7 +5076,7 @@ msgstr "Other languages:"
 msgid "footer_privacy_policy"
 msgstr "Privacy Policy"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Save"
 
@@ -3251,7 +5084,11 @@ msgstr "Save"
 msgid "general_addontype_dict"
 msgstr "Dictionary"
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 # Plural in this context means many of the activity type
+=======
+#. Plural in this context means many of the add-on type
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Dictionaries"
@@ -3260,7 +5097,11 @@ msgstr "Dictionaries"
 msgid "general_addontype_extension"
 msgstr "Extension"
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 # Plural in this context means many of the activity type
+=======
+#. Plural in this context means many of the add-on type
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensions"
@@ -3269,7 +5110,11 @@ msgstr "Extensions"
 msgid "general_addontype_lpaddon"
 msgstr "Language Pack (Activity)"
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 # Plural in this context means many of the activity type
+=======
+#. Plural in this context means many of the add-on type
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Language Packs (Activity)"
@@ -3278,7 +5123,11 @@ msgstr "Language Packs (Activity)"
 msgid "general_addontype_lpapp"
 msgstr "Language Pack (Application)"
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 # Plural in this context means many of the activity type
+=======
+#. Plural in this context means many of the add-on type
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Language Packs (Application)"
@@ -3287,7 +5136,11 @@ msgstr "Language Packs (Application)"
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 # Plural in this context means many of the activity type
+=======
+#. Plural in this context means many of the add-on type
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
@@ -3296,7 +5149,11 @@ msgstr "Plugins"
 msgid "general_addontype_search"
 msgstr "Search Engine"
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 # Plural in this context means many of the activity type
+=======
+#. Plural in this context means many of the add-on type
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Search Engines"
@@ -3305,11 +5162,16 @@ msgstr "Search Engines"
 msgid "general_addontype_theme"
 msgstr "Theme"
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 # Plural in this context means many of the activity type
+=======
+#. Plural in this context means many of the add-on type
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Themes"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3325,7 +5187,11 @@ msgstr "Activities"
 
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 msgstr "Seamonkey Activities"
+=======
+msgstr "SeaMonkey Add-ons"
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
@@ -3340,12 +5206,12 @@ msgid "header_navlink_addons"
 msgstr "Activities"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Log out"
 
@@ -3353,39 +5219,47 @@ msgstr "Log out"
 msgid "header_navlink_myaccount"
 msgstr "My Account"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Register"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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.
+#. %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 ""
 "<a href=\"%1$s\">Log in</a> to install this experimental activity. <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)
 #: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
-msgstr "Add to %s %s"
+msgstr "Add to %1$s %2$s"
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 # %1 is the activity name, %2 is the app name
+=======
+#. %1 is the add-on name, %2 is the app name
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: 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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3408,7 +5282,7 @@ msgid "langtools_download_langpack"
 msgstr "Download Language Pack"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dictionaries & Language Packs"
 
@@ -3464,7 +5338,7 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
@@ -3493,7 +5367,7 @@ msgstr "Themes"
 msgid "other_apps_tooltip"
 msgstr "Find activities 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:214
 msgid "other_users"
 msgstr "others"
@@ -3506,35 +5380,39 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Credits"
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Experimental Activities"
 
 #: controllers/pages_controller.php:113
+=======
+#: controllers/pages_controller.php:111
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Activities Policy"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "SugarLabs Privacy Policy"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Review Guidelines"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Sandbox Review System"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
@@ -3553,6 +5431,7 @@ msgstr ""
 "least one of the below applications supported. Only the versions listed "
 "below are allowed for these applications."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3560,6 +5439,8 @@ 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.
 #: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "here"
@@ -3568,10 +5449,6 @@ msgstr "here"
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/experimental_addons.thtml:56
-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"
@@ -3580,7 +5457,7 @@ 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
 #, php-format
 msgid "pagination_page_number_title"
@@ -3604,16 +5481,16 @@ 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
+#. %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 ""
 "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
+#. %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 ""
@@ -3628,7 +5505,7 @@ msgstr "Are you human?"
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
 
@@ -3653,7 +5530,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
 
@@ -3667,7 +5544,7 @@ 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
+#. %1 is the URL of the support section, %2 for the review guidelines
 #: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3684,22 +5561,22 @@ msgstr ""
 "personal information.</li></ul><p>Please read the <a href=\"%2$s\">Review "
 "Guidelines</a> for more detail about user activity reviews.</p>"
 
-# %1 is the addon name
+#. %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 "Reviews for %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Featured Activities"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Newest Activities"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Updated Activities"
 
@@ -3736,6 +5613,7 @@ msgstr "All Search Engines"
 msgid "search_landing_browse_search_engines"
 msgstr "Browse Search Engines"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3755,12 +5633,13 @@ msgstr "Search Activities"
 msgid "search_rss_description"
 msgstr "Search results feed"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Search results for: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Admin Tools"
 
@@ -3768,7 +5647,7 @@ msgstr "Admin Tools"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Developer Tools"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editor Tools"
 
@@ -3776,6 +5655,7 @@ msgstr "Editor Tools"
 msgid "sidebar_navlink_welcome"
 msgstr "Welcome"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3813,6 +5693,7 @@ msgstr "Theme"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Activities"
 
+#. %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
@@ -3824,7 +5705,11 @@ msgstr "%1$s KB"
 msgid "stars_not_yet_rated"
 msgstr "Not yet rated"
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 # %1 is the number of stars this activity has
+=======
+#. %1 is the number of stars this add-on has
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3842,24 +5727,32 @@ msgstr "Developer Tools"
 msgid "statistics_addon_switch"
 msgstr "Switch Activity"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "%b. %e"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "%b. %e, %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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3901,7 +5794,7 @@ msgstr "Statistics Dashboard"
 msgid "statistics_index_view_button"
 msgstr "View Statistics"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
@@ -3917,7 +5810,7 @@ msgstr "Remove this plot"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
@@ -3925,103 +5818,107 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s found in range"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Add Plot"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Add another plot to this graph"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Hide Total Count"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Show Total Count"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "View Data (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Hide %s Events"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Show %s Events"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Overlay activity release dates on the plots"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Hide Firefox Events"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Show Firefox Events"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Collapse Graph"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expand Graph"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Resize the graph"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Active Daily Users"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Custom"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operating System"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Activity Status"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Summary"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Activity Version"
 
@@ -4045,12 +5942,12 @@ msgstr "Unknown"
 msgid "statistics_longnames_version"
 msgstr "Activity Version"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "There is not yet enough data to display this graph. Please check back later."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "We don't have any data for your activity yet. Please check back in a few days."
@@ -4062,12 +5959,12 @@ msgstr ""
 "may be incomplete as our scripts work to update this information. Please "
 "check back in a few minutes."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr ""
 "The Statistics Dashboard is currently disabled. Please check back later."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "JavaScript is required to view the Statistics Dashboard graphs."
 
@@ -4082,36 +5979,36 @@ msgstr "Your settings have been updated!"
 msgid "statistics_pagetitle"
 msgstr "Statistics Dashboard"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Active Daily Users"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Daily Downloads"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Zoom In"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Zoom in one month"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Zoom Out"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out one month"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Daily summary of statistics for %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "RSS feed of summary data"
 
@@ -4151,23 +6048,23 @@ msgstr "Public"
 msgid "statistics_settings_access_public_description"
 msgstr "Anyone can view this activity's statistics"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Change Settings"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Please treat this information as confidential."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "This dashboard is currently <b>private</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "This dashboard is currently <b>public</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Locked"
 
@@ -4184,7 +6081,7 @@ msgstr "Save Settings"
 msgid "statistics_settings_title"
 msgstr "Statistics Dashboard Settings for %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Unlocked"
 
@@ -4208,7 +6105,7 @@ msgstr "Uk"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Average Daily Downloads"
 
@@ -4216,37 +6113,37 @@ msgstr "Average Daily Downloads"
 msgid "statistics_summary_downloads_heading"
 msgstr "Downloads"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Last Day Count"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in the last 7 days"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Total Downloads"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Since %1$s"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "No data yet"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Average Daily Active Users"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Change from previous count"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s on %2$s"
@@ -4255,17 +6152,17 @@ msgstr "%1$s on %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Active Daily Users"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Active Daily Users"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "On %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Statistics"
@@ -4290,7 +6187,7 @@ 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
+#. %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 ""
@@ -4310,7 +6207,7 @@ msgstr "Confirm Password"
 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:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4319,7 +6216,7 @@ msgstr ""
 "person in your development group delete you from the list of authors for "
 "your activities. 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:69
 msgid "user_del_error_addons_more_questions"
 msgstr "If you have additional questions, please contact %1$s for assistance."
@@ -4334,7 +6231,7 @@ msgstr ""
 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:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4345,7 +6242,7 @@ msgstr ""
 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:93
 msgid "user_del_header_delete_account"
 msgstr "Delete User Account %1$s"
@@ -4370,7 +6267,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4386,7 +6283,7 @@ msgstr "I understand that this step cannot be undone."
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4398,9 +6295,9 @@ msgstr ""
 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
+#. 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"
@@ -4420,7 +6317,7 @@ msgstr ""
 "Thanks for joining %2$s Activities\n"
 "-- %2$s Activities Staff"
 
-# %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4444,8 +6341,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Thanks for joining %s Activities"
 
-# 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
 #, php-format
 msgid "user_email_pwreset"
@@ -4472,7 +6369,7 @@ msgstr "Reset your %s Activities password"
 msgid "user_emailchange_error"
 msgstr "Error!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4482,7 +6379,7 @@ msgstr "Please confirm your email address change at %1$s Activities"
 msgid "user_emailchange_success"
 msgstr "Success!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4650,7 +6547,7 @@ msgstr "Send password reset link"
 msgid "user_register_amo_link"
 msgstr "%s Activities"
 
-# %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"
@@ -4658,7 +6555,7 @@ 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 Activities."
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4675,7 +6572,7 @@ 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
+#. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
 msgid "user_register_resend_confirmation_link"
@@ -4684,7 +6581,11 @@ msgstr ""
 "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."
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 # %1 is the link to the Sugar Labs Activities front page
+=======
+#. %1 is the link to the Mozilla Add-ons front page
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
@@ -4744,7 +6645,7 @@ msgstr "Nickname"
 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:110
 msgid "users_info_reviews_by_user"
 msgstr "Reviews by %s"
@@ -4753,8 +6654,13 @@ msgstr "Reviews by %s"
 msgid "users_login_pagetitle"
 msgstr "User Login"
 
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 # %1 is the link to the sandbox/policy explanation page
 # This message is for a specific activity not found
+=======
+#. %1 is the link to the sandbox/policy explanation page
+#. This message is for a specific add-on not found
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
 #: views/users/login.thtml:53
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4763,8 +6669,8 @@ msgstr ""
 "have an account on SugarLabs Activities, 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
+#. %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"
@@ -4781,6 +6687,12 @@ 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"
+
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
 msgstr "Sugar"
@@ -4788,6 +6700,7 @@ msgstr "Sugar"
 #: views/developers/dashboard.thtml:92
 msgid "devcp_actionbar_link_previews"
 msgstr "Edit Previews"
+<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po
 
 #: controllers/developers_controller.php:537
 msgid "devcp_error_activity_info_missing_activity_version"
@@ -4802,3 +6715,5 @@ msgstr "The file activity/activity.info must contain a value for name"
 msgid "devcp_error_activity_info_not_found"
 msgstr "The activity bundle must contain a file named activity/activity.info"
 
+=======
+>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po
diff --git a/site/app/locale/en_US/pages/about.thtml b/site/app/locale/en_US/pages/about.thtml
new file mode 100644
index 0000000..3b4946a
--- /dev/null
+++ b/site/app/locale/en_US/pages/about.thtml
@@ -0,0 +1,65 @@
+<h2>What is addons.mozilla.org?</h2>
+<p>
+  addons.mozilla.org (AMO) is Mozilla's official site for add-ons for Mozilla
+  applications.  Add-ons let you add new features to Firefox, Thunderbird,
+  SeaMonkey, and Sunbird.  From AMO, you can browse and download thousands of
+  add-ons to change the way you use the internet.
+</p>
+
+<h2>Who creates these add-ons?</h2>
+<p>
+  The thousands of add-on developers range from individual hobbyists to large
+  corporations.  All public add-ons are reviewed by a staff of dedicated
+  volunteers before being released.  Experimental add-ons are marked as such and
+  have not been reviewed.
+</p>
+
+<h2>How do I keep up on what's going on with AMO?</h2>
+<p>
+  Our <a href="http://blog.mozilla.com/addons/">blog</a> is regularly updated,
+  and we often feature posts from the general community.  We also have a
+  <a href="https://addons.mozilla.org/newsletter">newsletter</a> which gets sent
+  out on a monthly basis.
+</p>
+
+<h2>This sounds great!  How can I get involved?</h2>
+<p>
+  There are plenty of ways to get involved:
+</p>
+<ul>
+  <li>
+    <a href="https://wiki.mozilla.org/AMO:Editors/Applying">Become an
+    editor</a>.  Our editors are AMO fans with a technical background who
+    review add-ons for code quality and stability.
+  </li>
+  <li>
+    <a href="http://developer.mozilla.org/">Make your own add-on</a>.  AMO
+    provides free hosting and update services and can help you reach a large
+    audience of users.
+  </li>
+  <li>
+    Tell your friends!  <a href="http://spreadfirefox.com/">Spread Firefox</a>
+    and let people know which add-ons you use.
+  </li>
+  <li>
+    Submit bugs and fixes.
+    <a href="https://bugzilla.mozilla.org/buglist.cgi?quicksearch=addons">Bugzilla</a>
+    contains all of our current AMO bugs.  You can submit ones that haven't
+    been found yet or contribute patches.
+  </li>
+</ul>
+
+<h2>I have a question.</h2>
+<p>
+  A good place to start is our
+  <a href="https://addons.mozilla.org/pages/faq"><abbr title="Frequently Asked Questions">FAQ</abbr></a>.  If you don't find
+  an answer there use the contact information at the bottom of this page.  For
+  questions about a specific add-on use the contact information found on each add-on's listing page.
+</p>
+
+<h2>Contact Us</h2>
+<dl>
+  <dt>Using <abbr title="Internet Relay Chat">IRC</abbr>:</dt>
+  <dd><a href="irc://irc.mozilla.org/#addons">#addons</a> on irc.mozilla.org for general questions and review questions</dd>
+  <dd><a href="irc://irc.mozilla.org/#amo">#amo</a> on irc.mozilla.org for administrative or development concerns</dd>
+</dl>
diff --git a/site/app/locale/en_US/pages/experimental_addons.thtml b/site/app/locale/en_US/pages/experimental_addons.thtml
deleted file mode 100644
index e5f3c7d..0000000
--- a/site/app/locale/en_US/pages/experimental_addons.thtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<h1>Experimental Add-ons</h1>
-
-
-<h2>What is an experimental add-on?</h2>
-
-<p>Experimental add-ons are meant for advanced users to test add-ons before they
-are made available and reviewed for general use. Many add-ons may be in
-prototype form. Experimental add-ons 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>
-
-
-<h2>How do I know an experimental add-on when I see one on the site?</h2>
-
-<p>Experimental add-ons are marked with an "experimental" label and require login
-before you install them.</p>
-
-
-<h2>Why do I have to log in to install an experimental add-on?</h2>
-
-<p>The add-on site requires that users log in to install experimental add-ons as a 
-reminder that you are about to undertake a risk step.</p>
-
-
-<h2>Do I have to log in or need an account to install a public add-on?</h2>
-
-<p>No. The add-on site does not require you to have a user account or to log in in
-order to install a public add-on.</p>
-
diff --git a/site/app/locale/en_US/pages/faq.thtml b/site/app/locale/en_US/pages/faq.thtml
index e25de4d..7b6af48 100755
--- a/site/app/locale/en_US/pages/faq.thtml
+++ b/site/app/locale/en_US/pages/faq.thtml
@@ -6,13 +6,12 @@
     <li> Troubleshooting <a href="http://support.mozilla.com/kb/Unable+to+install+add-ons">add-on installation</a>, <a href="http://support.mozilla.com/kb/Troubleshooting+plugins">plugins</a> &amp; <a href="http://support.mozilla.com/kb/Troubleshooting+extensions+and+themes">general issues</a>.</li>
     <li> <a href="http://support.mozilla.com/kb/Uninstalling+add-ons">How to uninstall add-ons</a> and <a href="http://support.mozilla.com/kb/Cannot+uninstall+an+add-on">troubleshooting uninstallation</a>.</li>
     <li> <a href="http://support.mozilla.com/kb/Gray+bar+below+the+status+bar">Dealing with problematic add-ons / Gray Bar issue</a></li>
-    <li> <a href="https://addons.mozilla.org/firefox/pages/experimentalAddons">What is an experimental add-on?</a></li>
 </ul>
 
 <p></p>
 
 <h2>Add-on Questions</h2>
-<dl>
+<dl class="faq">
 <dt>What is an Add-on?</dt>
 <dd>Add-ons let you add features which aren't part of the standard application. Themes change appearance without changing functionality. Search Plugins and Dictionaries/Language Packs add additional search engines and language support. Extensions add more extensive features to the browser; some add simple toolbars while others can add a wide range of new features.</dd>
 
@@ -33,7 +32,7 @@
 </dl>
 
 <h2>Website questions</h2>
-<dl>
+<dl class="faq">
 <dt>I see several add-ons which provide the same capabilities. How do I decide which one is best?</dt> 
 <dd>In general, you can look at ratings and downloads which will give you an idea. Good add-ons tend to be downloaded more than bad ones. However, it's also easy to install both add-ons and decide which one you want to use. You may decide after trying them that you want to use both!</dd>
 
@@ -52,6 +51,10 @@
 <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>What are experimental add-ons?</dt> 
+<dt id="experimental-addons">What are experimental add-ons?</dt> 
 <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>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>
diff --git a/site/app/locale/es_ES/LC_MESSAGES/messages.po b/site/app/locale/es_ES/LC_MESSAGES/messages.po
index d91b45f..ad2ce48 100644
--- a/site/app/locale/es_ES/LC_MESSAGES/messages.po
+++ b/site/app/locale/es_ES/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ 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-02-14 19:53+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"
 "MIME-Version: 1.0\n"
@@ -26,85 +26,67 @@ msgstr ""
 msgid "a_cancel_installation"
 msgstr "Cancelar instalación"
 
-#: 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
+#. 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 "Descargar ahora %s"
 
-#: views/addons/policy.thtml:78
-#: views/addons/policy.thtml:79
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Aceptar y descargar"
 
-#: views/addons/policy.thtml:81
-#: views/addons/policy.thtml:83
+#: 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/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
 msgid "a_header_sandbox"
 msgstr "�rea de pruebas"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Añadido %s"
-
-#: views/elements/addon_listitem.thtml:145
-#: views/elements/feature.thtml:111
-#: views/addons/display.thtml:103
-#: views/addons/browse_thumbs.thtml:87
+#. %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 "%s actualizado"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versión %s"
 
-#: views/elements/addon_listitem.thtml:136
-#: views/elements/feature.thtml:103
-#: views/addons/display.thtml:115
-#: views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "descargas totales"
 
-#: views/elements/addon_listitem.thtml:136
-#: views/elements/feature.thtml:103
-#: views/addons/display.thtml:114
-#: views/addons/display.thtml:118
+#: 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:118
-#: views/addons/browse.thtml:75
+#. %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"
@@ -120,39 +102,32 @@ msgstr "por página"
 msgid "addon_list_sortby"
 msgstr "Ordenar por:"
 
-#: views/elements/addon_listitem.thtml:69
-#: views/elements/feature.thtml:89
-#: views/addons/display.thtml:51
-#: views/addons/browse_thumbs.thtml:67
+#: 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/elements/addon_listitem.thtml:72
-#: views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "recomendado"
 
-# %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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s no está disponible para %2$s"
 
-# %1 is the addon 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
+#. %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 "Volver a %1$s..."
 
-# %1 is the addon name
-#: views/reviews/flag.thtml:58
-#: views/reviews/add.thtml:127
+#. %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"
@@ -170,6 +145,7 @@ msgstr "Valoración:"
 msgid "addon_review_add_submit"
 msgstr "Enviar su valoración"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -179,8 +155,7 @@ msgstr "Añadir una valoración de %s"
 msgid "addon_review_add_title_field"
 msgstr "Título/Resumen:"
 
-#: views/reviews/display.thtml:81
-#: views/reviews/display.thtml:165
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Borrar"
 
@@ -204,46 +179,53 @@ msgstr "Si"
 msgid "addon_review_delete_header"
 msgstr "Borrar valoración"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 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:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Editar valoración de %s"
 
-# %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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 revisión: Las notas de las revisiones 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
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
-msgstr "Atención: Antes de que su 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: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: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 addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Valoraciones de %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -257,34 +239,27 @@ msgstr "Respuesta del desarrollador:"
 msgid "addon_review_saved_successfully"
 msgstr "Su valoración se ha guardado con éxito. ¡Gracias!"
 
-#: views/addons/display.thtml:285
-#: views/addons/display.thtml:288
-#: views/reviews/display.thtml:72
-#: views/reviews/display.thtml:75
+#: 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
-# %1 is the (localized) date, y 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
+#. %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 "Valorado por %1$s, puntuado con %2$d"
 
 #: views/addons/category_landing.thtml:138
-#: views/addons/category_landing.thtml:139
-#: views/addons/home.thtml:113
+#: 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/category_landing.thtml:129 views/addons/home.thtml:103
 #: views/addons/home.thtml:104
 msgid "addon_slider_tooltip_previous"
 msgstr "Complemento previo"
@@ -293,33 +268,34 @@ msgstr "Complemento previo"
 msgid "addon_version_permalink"
 msgstr "Enlace permanente a esta versión"
 
-#: views/addons/versions.thtml:123
-#: views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "La versión más reciente compatible con"
+#. %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 "La versión más reciente compatible con %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Enviar"
 
-#: views/elements/fyf_promotion.thtml:51
-#: 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:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "Ver todos los temas :: %1$s Addons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "Ver todos los temas %1$s :: %2$s Addons"
 
@@ -327,7 +303,7 @@ msgstr "Ver todos los temas %1$s :: %2$s Addons"
 msgid "addons_display_add_review"
 msgstr "Añadir una valoración"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Detalles avanzados"
 
@@ -335,12 +311,11 @@ msgstr "Detalles avanzados"
 msgid "addons_display_categories"
 msgstr "Categorías"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "valoración en detalle"
 
-#: views/addons/display.thtml:368
-#: views/reviews/add.thtml:103
+#: 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"
@@ -349,145 +324,149 @@ msgstr "No me gusta"
 msgid "addons_display_edit_review"
 msgstr "Editar tu valoración"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Este complemento tiene una política de privacidad."
 
-#: views/addons/display.thtml:367
-#: views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Comentarios del desarrollador"
 
-#: views/addons/display.thtml:208
-#: views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Portada"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Valoraciones"
 
-#: views/addons/display.thtml:225
-#: views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Asistencia"
 
-#: views/addons/display.thtml:369
-#: views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Me gusta"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Descripción larga"
 
-#: views/addons/display.thtml:371
-#: views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Más imágenes"
 
-# %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:421
+#. %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] "Otros complementos de %1$s"
 msgstr[1] "Otros complementos de estos autores"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: 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."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: 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."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Puntúa"
 
-#: views/addons/display.thtml:370
-#: views/reviews/add.thtml:107
+#: 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:387
-#: views/addons/display.thtml:390
+#: 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:405
+#. %1 is the review guidelines link
+#: 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:396
-#: views/addons/display.thtml:400
+#. %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 "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:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Guardar"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Ver todas las valoraciones (%1$s)"
 
-#: views/addons/display.thtml:195
-#: views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Historial completo de la versión"
 
-#: views/addons/display.thtml:335
-#: views/addons/versions.thtml:103
+#: 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:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Ver estadísticas"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "¿Qué opinas?"
 
@@ -497,32 +476,27 @@ msgstr "Válida para:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129
-#: views/elements/feature.thtml:95
-#: views/addons/policy.thtml:62
-#: views/addons/display.thtml:68
+#: 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/searchengines.thtml:54
-#: views/addons/category_landing.thtml:79
+#: 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
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Recomendamos"
 
-#: controllers/search_controller.php:211
-#: controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254
-#: controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528
-#: controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897
-#: controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, 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."
+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:201
 msgid "addons_home_newest_header"
@@ -532,44 +506,34 @@ msgstr "Nuevos:"
 msgid "addons_home_other_applications"
 msgstr "Otras aplicaciones"
 
-#: controllers/developers_controller.php:64
+#. %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:610
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:610
 #: 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/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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214
-#: controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530
-#: controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689
-#: controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776
-#: controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58
-#: controllers/pages_controller.php:123
-#: controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -590,10 +554,8 @@ msgstr "Recomendamos:"
 msgid "addons_home_updated_header"
 msgstr "Actualizados recientemente:"
 
-#: views/addons/home.thtml:189
-#: views/addons/home.thtml:199
-#: views/addons/home.thtml:209
-#: views/addons/home.thtml:219
+#: 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"
 
@@ -615,7 +577,11 @@ msgstr "Ver todos los complementos actualizados recientemente"
 
 #: 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/install.thtml:107
 msgid "addons_install_in_sunbird_title"
@@ -623,7 +589,12 @@ msgstr "Cómo instalar en Sunbird"
 
 #: 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/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
@@ -637,12 +608,9 @@ msgstr "Ver los complementos experimentales"
 msgid "addons_options_submit"
 msgstr "Ir"
 
-#: 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: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"
@@ -651,20 +619,22 @@ msgstr "Por"
 msgid "addons_plugins_for_linux"
 msgstr "para Linux"
 
-#: views/addons/plugins.thtml:113
-#: views/addons/plugins.thtml:145
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "para Mac OS X"
 
-#: views/addons/plugins.thtml:109
-#: views/addons/plugins.thtml:141
+#: 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: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:152
 msgid "addons_plugins_looking_for_plugin"
@@ -672,142 +642,139 @@ msgstr "¿Busca un plugin que no se encuentra en esta lista?"
 
 #: 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."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugins comunes para %1$s"
 
-#: controllers/components/amo.php:724
-#: controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
-#: 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: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: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 addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Capturas de %s"
 
-#: views/addons/recommended.thtml:50
-#: controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Complementos recomendados"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Complementos recomendados"
 
-#: views/addons/searchengines.thtml:147
-#: views/addons/searchengines.thtml:164
+#: 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:153
-#: views/addons/searchengines.thtml:169
+#. link text devmo
+#: 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: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:150
-#: views/addons/searchengines.thtml:167
+#. %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 "Aprende como %1$s en el %2$s."
 
-# link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:152
-#: views/addons/searchengines.thtml:168
+#. 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 "/es/docs/Creación_de_plugins_OpenSearch_para_Firefox"
 
-# link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:151
-#: views/addons/searchengines.thtml:168
+#. link text for "make your own" (opensearch engine)
+#: 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:148
-#: views/addons/searchengines.thtml:166
+#. %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 "Descubre más motores de búsqueda en %1$s"
 
-# link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:149
-#: views/addons/searchengines.thtml:166
+#. 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"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:755
-#: controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Motores de búsqueda"
 
-#: views/addons/searchengines.thtml:154
-#: views/addons/searchengines.thtml:171
+#: 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."
 
-#: 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: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"
 
-#: controllers/components/amo.php:195
-#: controllers/components/amo.php:226
+#: controllers/components/amo.php:195 controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "En el área de pruebas; Pendiente de revisión"
 
-#: controllers/components/amo.php:199
-#: controllers/components/amo.php:228
+#: controllers/components/amo.php:199 controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Público"
 
-#: controllers/components/amo.php:193
-#: controllers/components/amo.php:225
+#: controllers/components/amo.php:193 controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "En el área de pruebas"
 
@@ -815,8 +782,7 @@ msgstr "En el área de pruebas"
 msgid "addons_status_unknown"
 msgstr "Desconocido"
 
-#: views/elements/fyf_promotion.thtml:50
-#: 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"
 
@@ -826,14 +792,16 @@ msgstr "Ten cuidado con las versiones antiguas"
 
 #: 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."
 
-#: views/addons/versions.thtml:50
-#: controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Historial de la versión con las listas de cambios"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Historial de las versiones de %1$s"
@@ -846,6 +814,7 @@ msgstr "Añadir grupo"
 msgid "admin_group_delete_pagetitle"
 msgstr "Borrar grupo"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -855,8 +824,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"
 
@@ -864,8 +832,7 @@ 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"
 
@@ -877,8 +844,7 @@ msgstr "Avanzado"
 msgid "advanced_search_form_any_time"
 msgstr "Cualquier fecha"
 
-#: views/elements/search.thtml:95
-#: views/elements/search.thtml:108
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Cualquiera"
 
@@ -974,44 +940,53 @@ msgstr "Ignorar la comprobación"
 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: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: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: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:61
 msgid "app_compat_update_firefox"
-msgstr "<a href=\"http://getfirefox.com\">Actualiza Firefox</a> para usar este complemento"
+msgstr ""
+"<a href=\"http://getfirefox.com\">Actualiza Firefox</a> para usar este "
+"complemento"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Complementos por nombre"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Complementos nuevos"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Complementos populares"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Complementos por puntuación"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 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"
 
@@ -1039,9 +1014,8 @@ msgstr "Los actualizados recientemente primero"
 msgid "category_extra_mostpopular"
 msgstr "Los más populares primero"
 
-# %1 is the category name
-#: views/addons/searchengines.thtml:135
-#: views/addons/category_landing.thtml:51
+#. %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"
@@ -1050,14 +1024,25 @@ msgstr "Ver todos en %1$s"
 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 %s"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
-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."
+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:107
 msgid "compatibility_dashboard_loading"
@@ -1067,8 +1052,7 @@ msgstr "Cargando datos..."
 msgid "compatibility_dashboard_main_link"
 msgstr "Volver al inicio"
 
-#: views/compatibility/dashboard.thtml:104
-#: views/compatibility/report.thtml:41
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Informe de compatibilidad del complemento"
 
@@ -1086,9 +1070,14 @@ msgstr "Ajustar la maxVersion sin subirlo de nuevo"
 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: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:118
 msgid "compatibility_developers_mdclogo_alt"
@@ -1107,26 +1096,38 @@ msgstr "Resultados de la comprobación del estado del complemento"
 msgid "compatibility_developers_retrieving"
 msgstr "Obteniendo el estado de los complementos alojados..."
 
+#. %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 usuarios de %2$s (%3$s&#37; del total)"
 
 #: 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: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: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: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:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Complementos compatibles con un versión Alpha de %1$s"
@@ -1135,6 +1136,7 @@ msgstr "Complementos compatibles con un versión Alpha de %1$s"
 msgid "compatibility_report_legend_beta"
 msgstr "Versiones Beta"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "Complementos compatibles con una versión beta o candidata de %1$s"
@@ -1143,6 +1145,7 @@ msgstr "Complementos compatibles con una versión beta o candidata de %1$s"
 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:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Complementos actualizados para las últimas versiones de %1$s"
@@ -1151,6 +1154,7 @@ msgstr "Complementos actualizados para las últimas versiones de %1$s"
 msgid "compatibility_report_legend_other"
 msgstr "Otras versiones"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Complementos no compatibles con ninguna versión de %1$s"
@@ -1160,8 +1164,7 @@ msgid "compatibility_report_title"
 msgstr "Informe de compatibilidad del complemento"
 
 #: views/compatibility/dashboard.thtml:50
-#: views/compatibility/dashboard.thtml:148
-#: views/compatibility/users.thtml:40
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Información para los usuarios del complemento"
 
@@ -1169,18 +1172,22 @@ msgstr "Información para los usuarios del complemento"
 msgid "compatibility_view_report"
 msgstr "Ver informe de compatibilidad"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: 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:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "página wiki"
 
 #: 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:101
 msgid "credits_section_developers"
@@ -1208,38 +1215,41 @@ msgstr "Aplicaciones e imágenes"
 
 #: 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>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147
-#: 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:104
-#: views/addons/display.thtml:286
-#: views/addons/display.thtml:290
-#: 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
+#: 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)
+#. 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 "%x %X"
@@ -1265,18 +1275,52 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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."
+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"
@@ -1314,36 +1358,36 @@ msgstr "Paso 5: Éxito"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ayuda con el envío"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Complemento desactivado con éxito"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Editar complemento"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Complemento activado con éxito"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: 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:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "CLUF"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: 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:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Nombre del complemento"
 
@@ -1352,44 +1396,304 @@ msgstr "Nombre del complemento"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Captura de vista previa"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: 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:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Resumen del complemento"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Correo de ayuda"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL con ayuda"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: 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:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Proponer el complemento"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "¡Complemento propuesto con éxito!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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 "Visita la página de %1$s para hacer cambios a tu envío, o %2$s para volver a las Herramientas del desarrollador."
+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"
@@ -1401,9 +1705,12 @@ 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."
+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
+#. %1 is the link to the sandbox information page
 #: views/developers/add_step5.thtml:63
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1413,11 +1720,14 @@ 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í"
 
-# %1 is the "nominate" link
+#. %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."
+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"
@@ -1429,18 +1739,20 @@ 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."
+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:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Enviar un complemento"
 
-#: controllers/developers_controller.php:2375
+#: controllers/developers_controller.php:2460
 msgid "devcp_addon_updated_successfully"
 msgstr "Complemento actualizado con éxito"
 
-# %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"
@@ -1450,7 +1762,7 @@ msgstr "Quizá desees %s para aumentar el interés en tu complemento."
 msgid "devcp_addon_upload_preview_link"
 msgstr "subir una vista previa"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1460,24 +1772,18 @@ msgstr "Autor no encontrado [%s]"
 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
+#: 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
+#: 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
+#: 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"
 
@@ -1485,10 +1791,102 @@ msgstr "Siguiente"
 msgid "devcp_change_addontype"
 msgstr "Cambiar el tipo de complemento:"
 
-#: controllers/developers_controller.php:1402
+#: 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 "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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Añadir vista previa"
@@ -1581,8 +1979,8 @@ msgstr "El desarrollador no proporcionó ninguna url de ayuda."
 msgid "devcp_details_trusted"
 msgstr "De confianza"
 
-#: views/developers/details.thtml:84
-#: views/developers/versions.thtml:65
+#. %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 "Versión %s"
@@ -1605,8 +2003,13 @@ 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."
+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"
@@ -1622,15 +2025,71 @@ 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."
+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/edit.thtml:65
-#: views/developers/edit.thtml:71
+#: views/developers/discuss.thtml:68
+#, fuzzy
+msgid "devcp_discuss_addreply_header"
+msgstr "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Añadir autor"
 
@@ -1642,10 +2101,297 @@ msgstr "Correo electrónico del autor"
 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 "Add New Author"
+
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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"
@@ -1711,19 +2457,276 @@ msgstr "Idioma objetivo"
 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 "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 "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'"
+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 "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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
 
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Complementos destacados"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1732,7 +2735,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Una valoración por moderar"
 msgstr[1] "Valoraciones por moderar (%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
 #, php-format
@@ -1741,7 +2744,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Un complemento propuesto"
 msgstr[1] "Complementos propuestos (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1754,8 +2757,8 @@ msgstr[1] "Actualizaciones pendientes (%s)"
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "Los archivos marcados serán eliminados"
 
-# %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"
@@ -1781,51 +2784,75 @@ msgstr "Notas para el revisor"
 msgid "devcp_editversion_submit_update"
 msgstr "Actualizar"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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>"
-
+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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Por favor, lee %s para más información."
 
+#. 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 "esta página"
 
-#: controllers/developers_controller.php:2013
+#: controllers/developers_controller.php:2098
 msgid "devcp_error_describe_changes"
-msgstr "Por favor, describa los cambios realizados en esta actualización del complemento."
+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, php-format
+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 "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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "No concuerdan todas las GUIDs de los archivos"
 
@@ -1854,18 +2881,24 @@ msgstr "Sobrepasa el tamaño máximo de subida"
 msgid "devcp_error_http_nofile"
 msgstr "No se subió ningún archivo"
 
+#. %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 "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:1723
+#. %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."
+msgstr ""
+"Una versión idéntica (%s) ya existe para este complemento y plataforma."
 
-#: controllers/developers_controller.php:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No está presente el archivo install.rdf."
 
@@ -1873,43 +2906,58 @@ 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:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Por favor, seleccione un tipo válido de complemento."
 
+#. %$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 "%s no es una versión válida para %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "El ID de este complemento no es válido: %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 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"
 msgstr "No se puede mover el archivo"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1922,27 +2970,32 @@ 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:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "Debes proporcionar los datos requeridos para la nominación"
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "No puedes nominar complementos en fase beta."
 
-#: controllers/developers_controller.php:2704
+#: 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."
+msgstr ""
+"Solo puedes proponer complementos que estén actualmente en el área de "
+"pruebas."
 
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
@@ -1952,30 +3005,38 @@ msgstr "Por favor, elige al menos una categoría."
 msgid "devcp_error_one_user"
 msgstr "Este complemento debe tener al menos un autor."
 
+#. %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 "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:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Por favor, suba un archivo."
@@ -1984,8 +3045,7 @@ msgstr "Por favor, suba un archivo."
 msgid "devcp_file_addanother"
 msgstr "Añadir otro archivo de plataforma"
 
-#: views/developers/add_step2.thtml:93
-#: views/developers/add_step2.thtml:99
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
 msgid "devcp_form_author_add"
 msgstr "Añadir autor"
 
@@ -1995,7 +3055,9 @@ 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."
+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"
@@ -2045,8 +3107,7 @@ msgstr "Correo electrónico del autor"
 msgid "devcp_form_label_authors"
 msgstr "Autores"
 
-#: views/developers/add_step2.thtml:103
-#: views/developers/add_step3.thtml:107
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
 msgid "devcp_form_label_categories"
 msgstr "Categorías"
 
@@ -2082,8 +3143,7 @@ msgstr "Archivo de icono"
 msgid "devcp_form_label_name"
 msgstr "Nombre"
 
-#: views/developers/add_step1.thtml:75
-#: views/developers/add_step1.thtml:83
+#: 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"
@@ -2134,7 +3194,9 @@ 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:"
+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"
@@ -2197,11 +3259,16 @@ msgstr "Mis complementos"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Campos localizables"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: 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:68
@@ -2237,45 +3304,91 @@ msgstr "Enviar un complemento"
 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: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 "Volver a los detalles del complemento"
 
-# %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 "Proponer %s"
 
-# %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 "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: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 "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
+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."
+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."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2304,27 +3417,121 @@ msgstr "Editar vista previa"
 msgid "devcp_preview_updated_successfully"
 msgstr "Vista previa actualizada con éxito."
 
+#: 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 "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:79
+#, fuzzy
+msgid "devcp_previews_header_caption"
+msgstr "Preview Caption"
+
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "Editar vista previa"
 
+#: 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 "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:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Borrar vista previa"
@@ -2341,58 +3548,174 @@ msgstr "Editar la vista previa"
 msgid "devcp_previews_submit_upload"
 msgstr "Subir vista previa"
 
+#: 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 "¿Incorrecto?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "¿Estás seguro de borrar este archivo?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78
-#: views/developers/add_step0.thtml:52
+#: 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>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 "Saltar la valoración de la información actual de mi complemento"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> usuarios activos al día"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> descargas totales"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> descargas semanales"
 
-#: controllers/developers_controller.php:1481
+#: 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 "Los envíos de complementos están actualmente deshabilitados. Por favor, vuelva a intentarlo más tarde."
+msgstr ""
+"Los envíos de complementos están actualmente deshabilitados. Por favor, "
+"vuelva a intentarlo más tarde."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83
-#: views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Aceptar"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82
-#: views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Rechazar"
 
@@ -2408,12 +3731,11 @@ msgstr "Desactivado"
 msgid "devcp_summary_header_trusted"
 msgstr "De confianza"
 
-#: views/developers/dashboard.thtml:82
-#: views/developers/index.thtml:82
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Última versión:"
 
-# %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"
@@ -2423,7 +3745,7 @@ msgstr "No tienes ningún complemento. Haz clic %s para enviar uno."
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "aquí"
 
-# %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"
@@ -2433,30 +3755,674 @@ msgstr "Por favor, asegúrese de %s para su tema."
 msgid "devcp_theme_upload_preview_link"
 msgstr "subir una vista previa"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Por favor, ve %s para una referencia."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "esta página"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Editar versión"
 
-#: controllers/developers_controller.php:2572
+#: 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 "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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Este complemento está deshabilitado"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filtrar"
@@ -2465,8 +4431,7 @@ msgstr "Filtrar"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtrar por tipo/acción"
 
-#: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Registro de eventos"
 
@@ -2518,6 +4483,7 @@ msgstr "Ocultar comentarios"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Mostrar comentarios"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2527,8 +4493,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
-#: controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Registro de valoraciones"
 
@@ -2552,29 +4517,28 @@ msgstr "Actividad reciente del editor"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Valoraciones totales"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Valorar complemento"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Por favor, completa los siguientes campos:"
 
-#: controllers/editors_controller.php:461
+#: 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:395
+#: 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:305
+#: 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"
 
@@ -2582,54 +4546,47 @@ msgstr "Añadir una característica"
 msgid "editors_featured_add_feature_submit"
 msgstr "Añadir"
 
-#: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Se eliminó una característica con éxito."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: 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"
 
@@ -2653,41 +4610,40 @@ msgstr "Política del complemento"
 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:108
-#: views/admin/flagged_queue.thtml:75
+#. %1 is the queue mode
+#: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 día"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hora"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minuto"
 
-#: controllers/editors_controller.php:58
-#: controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Herramientas del editor"
 
-#: controllers/editors_controller.php:286
+#. %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 "Solo %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Versión previa"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2701,19 +4657,26 @@ msgstr "Limpiar"
 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."
+msgstr ""
+"Todas las colas de valoración están desactivadas actualmente. Por favor, "
+"vuelve a intentarlo en otro momento."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Valoración a realizar"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Mover a la zona pública"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Solicitar una valoración mayor (Super-Review)"
 
@@ -2721,29 +4684,47 @@ msgstr "Solicitar una valoración mayor (Super-Review)"
 msgid "editors_review_action_sandbox"
 msgstr "Mantener en el área de pruebas"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Revisar los comentarios"
 
-#: views/editors/review.thtml:167
+#: 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 "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:170
+#: 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:159
+#: 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:162
+#: 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:174
+#: 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:128
 msgid "editors_review_file_diff_link"
@@ -2765,15 +4746,15 @@ msgstr "Categorías:"
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilidad:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Descripción"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Comentarios del desarrollador"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "CLUF"
 
@@ -2781,92 +4762,111 @@ msgstr "CLUF"
 msgid "editors_review_header_files"
 msgstr "Archivos:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Historial del elemento"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Mensaje de nominación"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Vistas previas"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Política de privacidad"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Valoraciones de %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notas para el revisor"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Descripción"
 
-#: views/editors/review.thtml:240
+#: 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 "Reply"
+
+#: 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
-#: views/editors/review.thtml:295
 msgid "editors_review_history_nominated_adminreview"
 msgstr "Valoraciones del administrador"
 
+#: views/elements/developers/editors_review_history_item.thtml:56
 #: views/editors/reviewlog.thtml:71
-#: views/editors/review.thtml:289
 msgid "editors_review_history_nominated_approved"
 msgstr "Propuesta Aprobada/Páblica"
 
+#: views/elements/developers/editors_review_history_item.thtml:59
 #: views/editors/reviewlog.thtml:74
-#: views/editors/review.thtml:292
 msgid "editors_review_history_nominated_denied"
 msgstr "Propuesta denegada/�rea de pruebas"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "No se han podido encontrar valoraciones anteriores."
 
+#: views/elements/developers/editors_review_history_item.thtml:73
 #: views/editors/reviewlog.thtml:88
-#: views/editors/review.thtml:306
 msgid "editors_review_history_pending_adminreview"
 msgstr "Valoración del administrador"
 
+#: views/elements/developers/editors_review_history_item.thtml:67
 #: views/editors/reviewlog.thtml:82
-#: views/editors/review.thtml:300
 msgid "editors_review_history_pending_approved"
 msgstr "Aprobada/Pública"
 
+#: views/elements/developers/editors_review_history_item.thtml:70
 #: views/editors/reviewlog.thtml:85
-#: views/editors/review.thtml:303
 msgid "editors_review_history_pending_denied"
 msgstr "Denegada/�rea de pruebas"
 
-#: views/editors/review.thtml:198
+#. 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 "Aplicaciones:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "o selecciona una respuesta predeterminada:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Comentarios:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistemas operativos:"
 
-#: views/editors/review.thtml:268
-#: views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Ir al inicio"
 
@@ -2874,7 +4874,7 @@ msgstr "Ir al inicio"
 msgid "editors_review_next_link"
 msgstr "siguiente &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "No se encontraron vistas previas."
 
@@ -2882,41 +4882,48 @@ msgstr "No se encontraron vistas previas."
 msgid "editors_review_previous_link"
 msgstr "&laquo; anterior"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %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> de %2$s en cola"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Procesar acción"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Acción"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comentarios"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Fecha"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Revisor"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versión/Archivo"
 
-#: controllers/editors_controller.php:411
+#: 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 "Valoración procesada con éxito."
 
@@ -2940,7 +4947,7 @@ msgstr "Acción"
 msgid "editors_reviews_in_reply_to"
 msgstr "En respuesta a:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "¡Valoraciones procesadas con éxito!"
 
@@ -2952,23 +4959,23 @@ msgstr "Actualmente no hay valoraciones que moderar."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Procesar valoraciones"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Específico del sitio"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Nuevo"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Actualizado"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Aplicación probada"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistemas operativos probados"
 
@@ -2976,8 +4983,7 @@ msgstr "Sistemas operativos probados"
 msgid "editors_th_additional_info"
 msgstr "Información adicional"
 
-#: views/editors/featured.thtml:63
-#: views/editors/queue.thtml:73
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Complemento"
@@ -3010,30 +5016,30 @@ msgstr "Plataformas"
 msgid "editors_th_submissiontypes"
 msgstr "Tipos de envíos"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s días"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s horas"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: 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:610
-#: controllers/components/amo.php:611
-#: controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
+#: controllers/components/amo.php:611 controllers/components/amo.php:612
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Acceso denegado"
 
@@ -3041,12 +5047,13 @@ msgstr "Acceso denegado"
 msgid "error_access_denied_message"
 msgstr "No estás autorizado para ver esta página."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3056,22 +5063,19 @@ msgstr "No estás autorizado para ver esta página."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339
-#: controllers/api_controller.php:123
-#: controllers/api_controller.php:759
-#: controllers/api_controller.php:894
-#: controllers/api_controller.php:925
-#: controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
+#: controllers/api_controller.php:759 controllers/api_controller.php:894
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "¡Complemento no encontrado!"
 
-#: controllers/files_controller.php:83
-#: controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Este complemento no está visible aquí."
 
@@ -3079,7 +5083,7 @@ msgstr "Este complemento no está visible aquí."
 msgid "error_addon_selfreview"
 msgstr "No puedes valorar tu propio complemento."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "¡No hay complementos en la categoría!"
 
@@ -3087,94 +5091,78 @@ msgstr "¡No hay complementos en la categoría!"
 msgid "error_collection_feed_notfound"
 msgstr ""
 
-#: views/users/register.thtml:60
-#: views/users/edit.thtml:176
-#: views/developers/add_step2.thtml:117
-#: controllers/api_controller.php:907
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117 controllers/api_controller.php:907
 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: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/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:91
-#: controllers/files_controller.php:94
-#: controllers/files_controller.php:152
-#: controllers/files_controller.php:165
-#: controllers/files_controller.php:174
-#: controllers/files_controller.php:192
-#: controllers/editors_controller.php:509
+#: 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!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Error en el archivo: %s no existe."
 
-#: views/users/register.thtml:49
-#: views/users/edit.thtml:84
-#: views/reviews/add.thtml:84
-#: controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
-#: 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:104
 msgid "error_invalid_captcha"
 msgstr "Código no válido, por favor, inténtalo de nuevo"
 
-#: views/users/register.thtml:95
-#: views/users/edit.thtml:128
-#: views/developers/add_step2.thtml:112
-#: views/developers/add_step2.thtml:122
+#: 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:254
-#: controllers/users_controller.php:542
-#: controllers/users_controller.php:642
+#: 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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470
-#: controllers/api_controller.php:900
-#: controllers/addons_controller.php:87
-#: controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Falta un argumento: %s"
 
-#: controllers/components/amo.php:506
-#: controllers/components/amo.php:531
+#: 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
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
 msgid "error_notice"
 msgstr "Advertencia"
 
@@ -3182,8 +5170,7 @@ msgstr "Advertencia"
 msgid "error_preview_notfound"
 msgstr "¡Previsualización no encontrada!"
 
-#: views/addons/display.thtml:373
-#: views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Debes elegir una puntuación."
 
@@ -3191,43 +5178,37 @@ 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: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: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:70
+#: 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:60
-#: views/users/edit.thtml:172
+#: 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:580
-#: controllers/users_controller.php:581
+#: 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."
+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:86
-#: views/users/edit.thtml:119
+#: 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:260
-#: controllers/users_controller.php:592
+#: 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!"
@@ -3240,13 +5221,12 @@ msgstr "Por favor, confirme su cuenta de usuario primero."
 msgid "error_username_or_pw_wrong"
 msgstr "¡Nombre de usuario o contraseña incorrectos!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "¡Versión no encontrada!"
 
-#: views/users/delete.thtml:118
-#: views/users/edit.thtml:152
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "¡Se ha introducido una contraseña errónea!"
 
@@ -3254,16 +5234,15 @@ msgstr "¡Se ha introducido una contraseña errónea!"
 msgid "feature_learnmore"
 msgstr "Conoce más"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Conoce más acerca de %1$s"
 
-#: views/elements/addon_listitem.thtml:132
-#: views/elements/feature.thtml:99
-#: views/addons/display.thtml:98
-#: views/addons/browse_thumbs.thtml:100
+#. %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"
@@ -3274,6 +5253,45 @@ msgstr[1] "%1$s valoraciones"
 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Todos los derechos reservados."
@@ -3288,7 +5306,11 @@ msgstr "Créditos"
 
 #: views/elements/footer.thtml:73
 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
 msgid "footer_lang_form_lang_submit_go"
@@ -3298,7 +5320,6 @@ msgstr "Ir"
 msgid "footer_legal_notices"
 msgstr "Avisos legales"
 
-# This is the lang code -- should be the same as the dir for this locale.
 #: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Otros idiomas:"
@@ -3307,7 +5328,7 @@ msgstr "Otros idiomas:"
 msgid "footer_privacy_policy"
 msgstr "Política de privacidad"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Guardar"
 
@@ -3315,7 +5336,7 @@ msgstr "Guardar"
 msgid "general_addontype_dict"
 msgstr "Diccionario"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Diccionarios"
@@ -3324,7 +5345,7 @@ msgstr "Diccionarios"
 msgid "general_addontype_extension"
 msgstr "Extensió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:108
 msgid "general_addontype_extension_plural"
 msgstr "extensiones"
@@ -3333,7 +5354,7 @@ msgstr "extensiones"
 msgid "general_addontype_lpaddon"
 msgstr "Paquete de idioma (Complemento)"
 
-# 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Paquetes de idioma (Complemento)"
@@ -3342,7 +5363,7 @@ msgstr "Paquetes de idioma (Complemento)"
 msgid "general_addontype_lpapp"
 msgstr "Paquete de idioma (Aplicació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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Paquetes de idioma (Aplicación)"
@@ -3351,7 +5372,7 @@ msgstr "Paquetes de idioma (Aplicación)"
 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
@@ -3360,7 +5381,7 @@ msgstr "Plugins"
 msgid "general_addontype_search"
 msgstr "Motor de búsqueda"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Motores de búsqueda"
@@ -3369,13 +5390,13 @@ msgstr "Motores de búsqueda"
 msgid "general_addontype_theme"
 msgstr "Tema"
 
-# 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:109
 msgid "general_addontype_theme_plural"
 msgstr "temas"
 
-#: views/elements/header.thtml:111
-#: views/elements/header.thtml:122
+#. %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 "Volver a la página de inicio de Complementos para %1$s"
@@ -3405,13 +5426,12 @@ msgid "header_navlink_addons"
 msgstr "Complementos"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72
-#: views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Salir"
 
@@ -3419,40 +5439,43 @@ msgstr "Salir"
 msgid "header_navlink_myaccount"
 msgstr "Mi cuenta"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Registrarse"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81
-#: views/elements/feature.thtml:84
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Imagen previa de %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/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>?\""
+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/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/install.thtml:146
-#: views/elements/install.thtml:164
-#: views/elements/install.thtml:197
-#: views/elements/install.thtml:220
+#. %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 "Añadir %1$s a %2$s"
 
+#. %1$s is the add-on name
 #: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3474,10 +5497,8 @@ msgstr "Descargar diccionario"
 msgid "langtools_download_langpack"
 msgstr "Descargar paquete de idioma"
 
-#: views/elements/addon_categories.thtml:54
-#: views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701
-#: controllers/addons_controller.php:894
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Diccionarios y paquetes de idioma"
 
@@ -3501,12 +5522,9 @@ msgstr "Paquete de idioma"
 msgid "langtools_tableheader_language"
 msgstr "Idioma"
 
-#: 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
+#: 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."
 
@@ -3536,7 +5554,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3551,20 +5573,17 @@ msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
 #: views/elements/addon_categories.thtml:53
-#: views/elements/addon_categories.thtml:54
-#: controllers/components/amo.php:680
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:680
 #: controllers/components/amo.php:682
 msgid "nav_category_dicts_langpacks"
 msgstr "Diccionarios y paquetes de idioma"
 
-#: controllers/components/amo.php:715
-#: controllers/components/amo.php:717
+#: controllers/components/amo.php:715 controllers/components/amo.php:717
 msgid "nav_category_plugins"
 msgstr "Plugins"
 
 #: views/elements/addon_categories.thtml:57
-#: views/elements/addon_categories.thtml:58
-#: controllers/components/amo.php:686
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:686
 msgid "nav_category_themes"
 msgstr "Temas"
 
@@ -3572,7 +5591,7 @@ msgstr "Temas"
 msgid "other_apps_tooltip"
 msgstr "Encontrar complementos para otras aplicaciones"
 
-# In a user list: user 1, user 2, "others"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "otros"
@@ -3585,35 +5604,34 @@ msgstr "Versiones de la aplicación"
 msgid "page_title_credits"
 msgstr "Créditos"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Complementos experimentales"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
 msgstr "Preguntas frecuentes"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "PUF de \"Pon a punto Firefox\""
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Política de los complementos"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Política de privacidad de Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Guía de revisión"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Sistema de revisión del área de prueba"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Ayuda sobre el envío"
 
@@ -3621,20 +5639,27 @@ msgstr "Ayuda sobre el envío"
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:78
-#: 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: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: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:92
 msgid "pages_appversions_required_files_link"
 msgstr "aquí"
@@ -3643,7 +5668,6 @@ msgstr "aquí"
 msgid "pages_appversions_versions"
 msgstr "Versiones"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Volver a la página anterior"
 
@@ -3655,7 +5679,7 @@ 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
+#. %1 is page number, %2 is total page count
 #: views/helpers/pagination.php:199
 #, php-format
 msgid "pagination_page_number_title"
@@ -3667,7 +5691,9 @@ 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"
@@ -3677,17 +5703,21 @@ msgstr "Introduce tu respuesta aquí:"
 msgid "recaptcha_enter_whatyouhear"
 msgstr "Por favor, escribe lo que oigas."
 
-# %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 "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
+#. %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:100
 msgid "recaptcha_label"
@@ -3697,7 +5727,7 @@ msgstr "¿Eres humano?"
 msgid "recaptcha_whatsthis"
 msgstr "¿Qué es esto?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "¡Error al marcar esta valoración!"
 
@@ -3705,8 +5735,7 @@ 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:107
-#: views/reviews/display.thtml:190
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Informa de esta revisión (elige una razón)"
 
@@ -3722,11 +5751,12 @@ msgstr "Otro (por favor, especifícalo)"
 msgid "review_flag_reason_spam"
 msgstr "Publicidad u otro contenido no relacionado"
 
-#: views/reviews/display.thtml:95
-#: views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: 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"
@@ -3734,43 +5764,59 @@ 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
+#. %1 is the URL of the support section, %2 for the review guidelines
 #: 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>"
-
-# %1 is the addon name
-#: views/reviews/flag.thtml:54
-#: views/reviews/display.thtml:54
+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: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:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Complementos destacados"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Últimos complementos"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Complementos actualizados"
 
 #: 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/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "todos los complementos"
 
-#: views/elements/search.thtml:170
-#: views/elements/search.thtml:182
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
 #: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "buscar complementos"
@@ -3795,6 +5841,7 @@ msgstr "Todos los motores de búsqueda"
 msgid "search_landing_browse_search_engines"
 msgstr "Ver motores de búsqueda"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3814,21 +5861,21 @@ msgstr "Buscar complementos"
 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:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Resultados de la búsqueda por: %s"
 
-#: views/addons/home.thtml:172
+#: 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/addons/home.thtml:164
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Herramientas para desarrolladores"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Herramientas de edición"
 
@@ -3836,13 +5883,13 @@ msgstr "Herramientas de edición"
 msgid "sidebar_navlink_welcome"
 msgstr "Bienvenido"
 
+#. %s is the user's name
 #: 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"
 
@@ -3866,8 +5913,7 @@ msgstr "Plugin de búsqueda"
 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"
 
@@ -3875,10 +5921,9 @@ msgstr "Tema"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Complementos actualizados"
 
-#: views/helpers/localization.php:65
-#: views/developers/editversion.thtml:58
-#: views/developers/versions_edit.thtml:94
-#: views/developers/add_step3.thtml:74
+#. %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"
@@ -3888,7 +5933,7 @@ msgstr "%1$s Kb"
 msgid "stars_not_yet_rated"
 msgstr "Sin puntuar aún"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3906,28 +5951,32 @@ msgstr "Herramientas del desarrollador"
 msgid "statistics_addon_switch"
 msgstr "Cambiar complemento"
 
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:167
+#. 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 de %b"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:138
+#. 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 de %b, %Y"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:147
-#: views/statistics/addon.thtml:158
+#. 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 de %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 "%1$s creado"
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3969,8 +6018,7 @@ msgstr "Panel de estadísticas"
 msgid "statistics_index_view_button"
 msgstr "Ver estadísticas"
 
-#: views/statistics/addon.thtml:210
-#: controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Ver esta tabla en formato CSV"
 
@@ -3986,7 +6034,7 @@ msgstr "Eliminar este argumento"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Agrupar por: Día"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Agrupar por: Mes"
 
@@ -3994,103 +6042,109 @@ msgstr "Agrupar por: Mes"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Agrupar por: Semana"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "Encontrados %s al alcance"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Añadir argumento"
 
-#: controllers/statistics_controller.php:246
+#: 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:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Ocultar el recuento total"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Ver el recuento total"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Ver datos (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Ocultar %s eventos"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Ver %s eventos"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Ocultar los eventos de Firefox"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Ver los eventos de Firefox"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Contraer gráfico"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expandir gráfico"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Redimensionar gráfico"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Usuarios activos al día"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplicación"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personalizado"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Descargas"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistema operativo"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Estado del complemento"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Resumen"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Versión del complemento"
 
@@ -4114,25 +6168,37 @@ msgstr "Desconocido"
 msgid "statistics_longnames_version"
 msgstr "Versión del complemento"
 
-#: views/statistics/addon.thtml:104
+#: 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:116
+#: 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:122
+#: 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:109
+#: 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"
@@ -4145,36 +6211,36 @@ msgstr "¡Se han actualizado tus preferencias!"
 msgid "statistics_pagetitle"
 msgstr "Panel de estadísticas"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Usuarios activos por día"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Descargas al día"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Ampliar"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Ampliar un mes"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Reducir"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Reducir un mes"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Resumen diario con estadísticas para %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Canal RSS con datos de resumen"
 
@@ -4189,7 +6255,10 @@ msgstr "Estadísticas para %1$s"
 
 #: 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:45
 msgid "statistics_settings_access_heading"
@@ -4211,23 +6280,23 @@ msgstr "Público"
 msgid "statistics_settings_access_public_description"
 msgstr "Cualquiera puede ver las estadísticas de este complemento"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Cambiar preferencias"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Por favor, tratar esta información como confidencial."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Este panel actualmente es <strong>privado</strong>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Este panel actualmente es <strong>public</strong>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Bloqueado"
 
@@ -4244,7 +6313,7 @@ msgstr "Guardar preferencias"
 msgid "statistics_settings_title"
 msgstr "Preferencias del panel de estadísticas de %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Desbloqueado"
 
@@ -4268,8 +6337,7 @@ msgstr "Desc."
 msgid "statistics_shortnames_version"
 msgstr "Ver."
 
-#: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Media de descargas diarias"
 
@@ -4277,46 +6345,37 @@ msgstr "Media de descargas diarias"
 msgid "statistics_summary_downloads_heading"
 msgstr "Descargas"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149
-#: views/statistics/addon.thtml:169
+#: 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:70
-#: views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: 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"
@@ -4325,20 +6384,17 @@ 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:143
+#: 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:147
+#: 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/addon.thtml:65
-#: controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: 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"
@@ -4351,13 +6407,11 @@ msgstr "Todos los temas"
 msgid "themes_landing_browse_themes"
 msgstr "Ver temas"
 
-#: views/users/edit.thtml:99
-#: views/users/edit.thtml:167
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Cambiar correo electrónico"
 
-#: views/users/edit.thtml:98
-#: views/users/edit.thtml:148
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Cambiar contraseña"
 
@@ -4365,10 +6419,13 @@ msgstr "Cambiar contraseña"
 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
+#. %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 "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:95
 msgid "user_del_community_sad"
@@ -4382,34 +6439,47 @@ msgstr "Confirmar contraseña"
 msgid "user_del_deletenow"
 msgstr "Borrar mi cuenta de usuario ahora"
 
-# %1 is the URL of the user's info page
+#. %1 is the URL of the user's info page
 #: 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
+#. %1 is a link to the amo-editors mailing list
 #: 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: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: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
+#. %1 is a link to the amo-admins mailing list
 #: 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:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirmar el borrado de cuenta"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Borrar la cuenta de usuario %1$s"
@@ -4424,16 +6494,23 @@ msgstr "No podrás ingresar como usuario en Mozilla Addons nunca más."
 
 #: 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: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
+#. %1 is a link to the amo-editors mailing list
 #: 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:123
 msgid "user_del_understand_permanent"
@@ -4443,36 +6520,42 @@ msgstr "Comprendo que este paso no se puede deshacer."
 msgid "user_deleted_nickname"
 msgstr "Usuario borrado"
 
-# %1 is the new email address
-#: views/users/edit.thtml:58
-#: views/users/edit.thtml:59
+#. %1 is the new email address
+#: 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:183
 msgid "user_edit_delete_user"
 msgstr "Borrar la cuenta de usuario"
 
-# 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 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
+#. %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
@@ -4480,11 +6563,14 @@ 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"
@@ -4494,16 +6580,17 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Gracias por unirte a Mozilla Addons"
 
-# This is the password reset email
-# %1 is the pw reset URL, %2 is the application
-# %1 is the pw reset URL
+#. 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 ""
 "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"
@@ -4521,26 +6608,27 @@ msgstr "Reiniciar su contraseña de Mozilla Addons"
 msgid "user_emailchange_error"
 msgstr "¡Error!"
 
-# %1 is the application name
-#: controllers/users_controller.php:513
-#: controllers/users_controller.php:514
+#. %1 is the application name
+#: 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:49
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "¡Correcto!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: 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."
+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:68
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
 #: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Confirmar contraseña"
@@ -4550,33 +6638,27 @@ msgstr "Confirmar contraseña"
 msgid "user_form_editprofile"
 msgstr "Editar perfil del usuario %s"
 
-#: views/users/pwreset.thtml:52
-#: views/users/login.thtml:81
-#: views/users/register.thtml:58
-#: views/users/edit.thtml:169
+#: 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:73
-#: views/users/edit.thtml:106
+#: 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:89
-#: views/users/edit.thtml:122
+#: 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:93
-#: views/users/edit.thtml:126
+#: 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:79
-#: views/users/edit.thtml:112
+#: views/users/register.thtml:79 views/users/edit.thtml:112
 #: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Apellidos"
@@ -4585,13 +6667,11 @@ msgstr "Apellidos"
 msgid "user_form_login"
 msgstr "Código de usuario"
 
-#: views/users/pwreset.thtml:72
-#: views/users/edit.thtml:155
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Nueva contraseña"
 
-#: views/users/register.thtml:84
-#: views/users/edit.thtml:117
+#: views/users/register.thtml:84 views/users/edit.thtml:117
 #: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Apodo"
@@ -4600,13 +6680,11 @@ msgstr "Apodo"
 msgid "user_form_oldpassword"
 msgstr "Contraseña antigua"
 
-#: views/users/edit.thtml:100
-#: views/users/edit.thtml:182
+#: 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:63
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Contraseña"
 
@@ -4657,15 +6735,22 @@ msgstr "Actualmente no tienes avisos disponibles para configurar."
 
 #: 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: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: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:523
 msgid "user_profile_saved"
@@ -4686,7 +6771,9 @@ msgstr "¿Ha olvidado su contraseña?"
 
 #: 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:293
 msgid "user_pwreset_okay"
@@ -4705,17 +6792,23 @@ msgstr "Enviar enlace para reiniciar contraseña"
 msgid "user_register_amo_link"
 msgstr "%s Addons"
 
-# %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 "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
+#. %1 is the user's email address
 #: 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"
@@ -4725,30 +6818,30 @@ msgstr "reenviar el mensaje de confirmación"
 msgid "user_register_congratulations"
 msgstr "¡Enhorabuena! Tu cuenta de usuario se ha creado con éxito."
 
-# %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 "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
+#. %1 is the link to the Mozilla Add-ons front page
 #: 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:76
-#: views/users/edit.thtml:109
+#: 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:97
-#: views/users/edit.thtml:133
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Avisos"
 
-#: views/users/edit.thtml:96
-#: views/users/edit.thtml:104
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Perfil de usuario"
 
@@ -4794,37 +6887,74 @@ msgstr "Apodo"
 msgid "users_info_pagetitle"
 msgstr "Información del usuario %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Valoraciones de %s"
 
-#: controllers/users_controller.php:319
-#: controllers/users_controller.php:321
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Inicio de sesión de usuario"
 
-# %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
 #, 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
+#. %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"
 
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "La versión más reciente compatible con"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "editors_reviews_action_delete"
+#~ msgstr "Eliminar"
+
+#~ msgid "recaptcha_enter_numbers"
+#~ msgstr ""
+#~ "Por favor, introduce los <strong>números</strong> que estás escuchando a "
+#~ "continuación."
diff --git a/site/app/locale/eu/LC_MESSAGES/messages.po b/site/app/locale/eu/LC_MESSAGES/messages.po
index e38a3d9..01b676d 100644
--- a/site/app/locale/eu/LC_MESSAGES/messages.po
+++ b/site/app/locale/eu/LC_MESSAGES/messages.po
@@ -23,6 +23,10 @@ msgstr ""
 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 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
@@ -51,38 +55,35 @@ msgstr "Publikoa"
 msgid "a_header_sandbox"
 msgstr "Probagunea"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, fuzzy, php-format
-msgid "added"
-msgstr "Added %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "%s(e)an eguneratua"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Azken bertsioa"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "deskarga guztira"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
@@ -99,22 +100,24 @@ msgstr "orriko"
 msgid "addon_list_sortby"
 msgstr "Ordenatu:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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: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: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
@@ -124,6 +127,7 @@ 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -142,6 +146,7 @@ msgstr "Berrikuspena:"
 msgid "addon_review_add_submit"
 msgstr "Bidali berrikuspena"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -175,23 +180,26 @@ msgstr "Bai"
 msgid "addon_review_delete_header"
 msgstr "Ezabatu berrikuspena"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Berrikuspena guztiz ezabatu da."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Editatu %s(r)en berrikuspena"
 
 # %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -203,6 +211,7 @@ 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:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
@@ -211,15 +220,17 @@ 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 addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -233,13 +244,14 @@ msgstr "Garatzailearen erantzuna:"
 msgid "addon_review_saved_successfully"
 msgstr "Berrikuspena behar bezala gorde da. Milesker!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, php-format
@@ -264,11 +276,16 @@ msgstr "Previous Add-on"
 msgid "addon_version_permalink"
 msgstr "Bertsio honetara lotura iraunkorra"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "Azken bertsio bateragarria"
+# %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:118
+#, fuzzy
+msgid "addon_versions_getlatestversion"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Joan"
 
@@ -277,19 +294,23 @@ msgid "addons_author_tooltip"
 msgstr "Ikusi egilearen profila"
 
 # %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Arakatu %s"
 
 # %1 is the name of the theme category (eg. Modern)
 # %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
@@ -298,7 +319,7 @@ msgstr "Browse %1$s Themes :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "Gehitu berrikuspena"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Xehetasun aurreratuak"
 
@@ -306,11 +327,11 @@ msgstr "Xehetasun aurreratuak"
 msgid "addons_display_categories"
 msgstr "Kategoriak"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "berrikuspen xehea"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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"
@@ -319,66 +340,73 @@ msgstr "Ez dut gogoko"
 msgid "addons_display_edit_review"
 msgstr "Editatu berrikuspena"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Gehigarri honek pribatutasun politika du."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Garatzailearen Iruzkinak"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Webgunea"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Berrikuspenak"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Laguntza"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Gogoko dut"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Azalpen luzea"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Irudi gehiago"
 
 # %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:421
+#. %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
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "%1$s(r)en beste gehigarri batzuk"
 msgstr[1] "Other add-ons by these authors"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -390,7 +418,9 @@ 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:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -403,7 +433,8 @@ msgstr ""
 "ask for more details or let you know if the bug has been fixed in an "
 "upcoming version."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -415,16 +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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Puntuatu"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 #, fuzzy
 msgid "addons_display_review_etiquette"
 msgstr ""
@@ -433,51 +464,54 @@ msgstr ""
 "resolve your issue."
 
 # %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %1 is the support section link
+#: 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:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Gorde"
 
-#: views/addons/display.thtml:415
+#: 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
-#: views/addons/display.thtml:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Ikusi berrikuspen guztiak (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Ikusi bertsio guztiak"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Bertsioen historia osoa"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Ikusi iturburua"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Ikusi estatistikak"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Zer deritzozu?"
 
@@ -487,7 +521,7 @@ msgstr "Honekin dabil:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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:"
@@ -498,10 +532,11 @@ msgstr "Egilea:"
 msgid "addons_home_feature_head"
 msgstr "Gure gomendioak"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -516,7 +551,9 @@ msgstr "Berriena:"
 msgid "addons_home_other_applications"
 msgstr "Beste aplikazioak"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -526,19 +563,20 @@ msgstr "Beste aplikazioak"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -635,6 +673,7 @@ msgstr "Mac OS Xrako"
 msgid "addons_plugins_for_windows"
 msgstr "Windowserako"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -656,12 +695,13 @@ msgstr ""
 "azken hauek existitzen den funtzionalitatea aldatu edo honi zerbait gehitzen "
 "baitiote."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "%1$s(r)en plugin ohikoenak"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Pluginak"
 
@@ -672,6 +712,7 @@ msgstr "Pluginak"
 msgid "addons_plugins_support_documentation"
 msgstr "Laguntza-dokumentazioa: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -680,23 +721,24 @@ msgstr ""
 "erabiltzaile lizentziako baldintzak onartzea."
 
 # %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s(r)en aurrebista"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 msgid "addons_recommended_introduction"
 msgstr ""
 "Ehundaka gehigarri erabilgarrirekin guztiontzat dago zerbait. Hasteko hemen "
 "duzu gehien erabiltzen direnen zerrenda bat. Gozatu!"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Gomendatutako gehigarriak"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Gomendatutako gehigarriak"
 
@@ -705,6 +747,7 @@ msgid "addons_searchengines_additional_resources"
 msgstr "Baliabide gehigarriak"
 
 # link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozillaren garapengunea"
@@ -724,33 +767,39 @@ msgstr ""
 
 # %1 is "make your own" link
 # %2 is mozdev link
+#. %1 is "make your own" link
+#. %2 is MDC link
 #: 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: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: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: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:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Bilaketa-motorrak"
 
@@ -765,7 +814,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Disabled"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 #, fuzzy
 msgid "addons_status_incomplete"
 msgstr "Incomplete Version"
@@ -809,11 +858,12 @@ msgstr ""
 "Bertsio hauek erreferentzia eta egiaztatze helburuetarako bistaratzen dira. "
 "Gehigarri baten azken bertsioa erabili beharko zenuke beti."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Bertsioaren historia aldaketen egunkariarekin"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s Bertsioaren historia"
@@ -826,6 +876,7 @@ msgstr "Gehitu taldea"
 msgid "admin_group_delete_pagetitle"
 msgstr "Ezabatu taldea"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -951,6 +1002,7 @@ msgstr "Baztertu bertsio kontrola"
 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:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
@@ -958,10 +1010,13 @@ 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: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:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
@@ -974,27 +1029,27 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Eguneratu Firefox</a> gehigarri hau "
 "erabiltzeko"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 #, fuzzy
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 #, fuzzy
 msgid "browse_addons_newest"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 #, fuzzy
 msgid "browse_addons_popular"
 msgstr "Popular Add-ons"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 #, fuzzy
 msgid "browse_addons_rated"
 msgstr "Add-ons by Rating"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 #, fuzzy
 msgid "browse_addons_updated"
 msgstr "Recently Updated Add-ons"
@@ -1028,6 +1083,7 @@ msgid "category_extra_mostpopular"
 msgstr "Gogokoenak lehenengo"
 
 # %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"
@@ -1038,12 +1094,20 @@ msgstr "Ikusi %1$s guztiak"
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
+#. %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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 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:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
@@ -1083,6 +1147,8 @@ 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
 #: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
@@ -1111,6 +1177,10 @@ 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)
 #: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
@@ -1128,6 +1198,8 @@ msgstr ""
 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:69
 #, fuzzy
 msgid "compatibility_report_intro"
@@ -1141,6 +1213,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
@@ -1151,6 +1224,7 @@ 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
 #: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
@@ -1161,6 +1235,7 @@ 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
 #: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
@@ -1171,6 +1246,7 @@ 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
 #: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
@@ -1192,12 +1268,13 @@ msgstr "Information for Add-on Users"
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Laguntza-informazioa jasotzeko ikusi gure %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wiki orria"
 
@@ -1241,18 +1318,27 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
+#: 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>."
+
 # 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/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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
@@ -1260,7 +1346,10 @@ msgid "date"
 msgstr "%Y(e)ko %Bren %ea"
 
 # date and time format string (strftime)
+#. 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 "%Y(e)ko %Bren %ea, %I:%M %p"
@@ -1286,14 +1375,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 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"
@@ -1341,36 +1458,36 @@ msgstr "5. urratsa: eginda"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Bidaltzeko laguntza"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Gehigarria arrakastaz ezgaitu da"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Editatu gehigarria"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Gehigarria arrakastaz gaitu da"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Gehigarriaren azalpena"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "AELK"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Gehigarriaren webgunea"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Gehigarriaren izena"
 
@@ -1379,40 +1496,300 @@ msgstr "Gehigarriaren izena"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Aurrebistaren izenburua"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Pribatutasun-politika"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Gehigarriaren laburpena"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Sostengurako Eposta"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "Sostengurako URLa"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Bertsio-oharrak"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Proposatu gehigarria"
 
-#: controllers/developers_controller.php:2729
+#: 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: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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1436,6 +1813,7 @@ msgstr ""
 "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"
@@ -1446,6 +1824,7 @@ 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"
@@ -1468,16 +1847,17 @@ msgstr ""
 "Zure gehigarriak konfiantza duenez, bertsio hau automatikoki onartu da gune "
 "publikorako."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Bidali gehigarria"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1488,6 +1868,7 @@ 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"
@@ -1516,10 +1897,102 @@ msgstr "Hurrengoa"
 msgid "devcp_change_addontype"
 msgstr "Aldatu gehigarri mota:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "Garatzailearen iruzkinak eguneratu dira."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Gehitu aurrebista"
@@ -1612,6 +2085,7 @@ msgstr "Garatzaileak ez du sostengurako URLrik eman."
 msgid "devcp_details_trusted"
 msgstr "Konfiantzazkoa"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1641,6 +2115,7 @@ msgstr ""
 "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"
@@ -1660,11 +2135,65 @@ 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"
+msgstr "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Gehitu egilea"
@@ -1677,10 +2206,297 @@ msgstr "Egilearen eposta helbidea"
 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:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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"
@@ -1746,6 +2562,206 @@ msgstr "Helburu locale-a"
 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: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 "Eguneratu"
@@ -1756,11 +2772,67 @@ 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"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Nabarmendutako gehigarriak"
 
 # %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1770,6 +2842,7 @@ msgstr[0] "Moderatutako berrikuspenak (%s)"
 msgstr[1] "Moderatutako berrikuspenak (%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
 #, php-format
@@ -1779,6 +2852,7 @@ msgstr[0] "Proposatutako gehigarriak (%s)"
 msgstr[1] "Proposatutako gehigarriak (%s)"
 
 # %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1793,6 +2867,8 @@ 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"
@@ -1818,29 +2894,30 @@ msgstr "Ikuskatzailearentzat oharrak"
 msgid "devcp_editversion_submit_update"
 msgstr "Eguneratu"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: controllers/developers_controller.php:1992
 msgid "devcp_error_addonname_not_unique"
 msgstr ""
 "Zure gehigarriaren izena dagoeneko datu-basean existitzen da. Mesedez "
@@ -1849,19 +2926,33 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Erreferentziarako ikusi %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 "orri hau"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, fuzzy, php-format
+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"
@@ -1869,7 +2960,7 @@ msgstr ""
 "Fitxategiaren luzapen hori (%s) ez da onartzen aukeratutako gehigarri "
 "motarentzat. Mesedez erabili ondorengoetako bat: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Fitxategi guztien GUID-ak ez datoz bat"
 
@@ -1898,6 +2989,8 @@ msgstr "Igoera-tamaina maximoa gainditzen du"
 msgid "devcp_error_http_nofile"
 msgstr "Fitxategirik ez da igo"
 
+#. %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"
@@ -1905,15 +2998,16 @@ msgstr ""
 "Fitxategiaren luzapen hori (%s) ez da onartzen ikono batentzat. Mesedez "
 "erabili ondorengoetako bat: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Ez dago install.rdf fitxategia."
 
@@ -1921,21 +3015,26 @@ msgstr "Ez dago install.rdf fitxategia."
 msgid "devcp_error_install_manifest"
 msgstr "Ondorengo erroreak aurkitu dira install.rdf fitxategian:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Mesedez aukeratu baliozko gehigarri-mota bat."
 
+#. %$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 "%s ez da %s-(r)en baliozko bertsio bat"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "Gehigarri honen IDa baliogabea da: %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"
@@ -1954,6 +3053,7 @@ msgstr ""
 "Gehigarri honen bertsioa baliogabea da: bertsioek ezin dituzte zuriuneak "
 "eduki."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1963,6 +3063,7 @@ msgstr "Ondorengo errorea gertatu da install.rdf fitxategia analizatzean: %s"
 msgid "devcp_error_move_file"
 msgstr "Ezin izan da fitxategia lekuz aldatu"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1985,15 +3086,15 @@ msgstr "Ezin da IDrik aurkitu gehigarri honentzat install.rdf fitxategian."
 msgid "devcp_error_no_platform"
 msgstr "Ez da plataformarik aukeratu"
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "Eskatutako xehetasunak hornitu behar dituzu proposamenerako."
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "Ezin duzu aurre-argitalpena proposatu."
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Une honetan probagunean dauden gehigarriak soilik proposatu ditzakezu."
 
@@ -2005,6 +3106,8 @@ msgstr "Mesedez aukeratu gutxienez kategoria bat."
 msgid "devcp_error_one_user"
 msgstr "Gutxienez egile bat egon behar da gehigarri honentzat."
 
+#. %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"
@@ -2012,13 +3115,13 @@ msgstr ""
 "Fitxategiaren luzapen hori (%s) ez da onartzen aurrebista batentzat. Mesedez "
 "erabili ondorengoetako bat: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Ez duzu baimenik gehigarri hau eguneratzeko."
 
@@ -2034,7 +3137,7 @@ msgstr ""
 "Gehigarriek ezin dute kanpoko updateURL bat erabili. Mesedez ezaba ezazu hau "
 "install.rdf fitxategitik eta saiatu berriro."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Mesedez igo fitxategi bat."
@@ -2258,6 +3361,7 @@ msgid "devcp_localebox_header_localizedfields"
 msgstr "Lokalizatutako eremuak"
 
 # %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2301,11 +3405,26 @@ msgstr "Bidali gehigarria"
 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: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 "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
@@ -2313,11 +3432,33 @@ msgid "devcp_nominate_submit_nominate"
 msgstr "Proposatu %s"
 
 # %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: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 ""
@@ -2328,6 +3469,10 @@ msgstr ""
 # %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"
@@ -2343,9 +3488,14 @@ msgstr ""
 "Aurrebista lehenetsi bezala ezartzeak uneko aurrebista lehenetsiari egoera "
 "hori kentzea dakar."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2374,6 +3524,60 @@ msgstr "Editatu aurrebista"
 msgid "devcp_preview_updated_successfully"
 msgstr "Aurrebista arrakastaz eguneratu da."
 
+#: 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 ""
@@ -2385,10 +3589,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Gehitu aurrebista"
 
+#: 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 "Editatu aurrebista"
 
+#: 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 "Aurrebistaren fitxategia"
@@ -2397,6 +3611,34 @@ msgstr "Aurrebistaren fitxategia"
 msgid "devcp_previews_label_makedefault"
 msgstr "Ezarri lehenetsitako aurrebista-irudi gisa"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Ezabatu aurrebista"
@@ -2413,45 +3655,160 @@ msgstr "Editatu aurrebista"
 msgid "devcp_previews_submit_upload"
 msgstr "Igo aurrebista"
 
+#: 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 "Ezegokia?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Ziur zaude fitxategi hau ezabatu nahi duzula?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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 "
 "jarraitu aurretik."
 
+#: 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 "Saltatu nire uneko gehigarriaren informazioa berrikustea"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> erabiltzaile aktibo egunero"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> deskarga guztira"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> deskarga astero"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "Gehigarrien bidalketak ezgaituta daude momentuz. Mesedez beranduago "
@@ -2459,13 +3816,13 @@ msgstr ""
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Onartzen dut"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Uko egiten dut"
 
@@ -2481,11 +3838,12 @@ msgstr "Ezgaituta"
 msgid "devcp_summary_header_trusted"
 msgstr "Konfiantzazkoa"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2496,6 +3854,7 @@ 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"
@@ -2505,30 +3864,674 @@ msgstr "Mesedez egiaztatu zure gaiarentzat %s."
 msgid "devcp_theme_upload_preview_link"
 msgstr "aurrebista igotzeaz"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Mesedez ikusi %s erreferentziarako."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "orri hau"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Editatu bertsioa"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Bertsioa arrakastaz eguneratu da."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Gehigarri hau ezgaituta dago"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Iragazkia"
@@ -2537,7 +4540,7 @@ msgstr "Iragazkia"
 msgid "editorcp_logs_filter_by"
 msgstr "Iragazkia motaren/ekintzaren arabera"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Gertaeren log-a"
 
@@ -2589,6 +4592,7 @@ msgstr "Ezkutatu iruzkinak"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Erakutsi iruzkinak"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2598,7 +4602,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Berrikuspenen log-a"
 
@@ -2622,24 +4626,24 @@ msgstr "Editorearen azken ekintzak"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Berrikuspenak guztira"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Ikuskatu Gehigarria"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Mesedez osatu ondorengo eremuak:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Mesedez aukeratu gutxienez ikuskatzeko fitxategi bat."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Norbere ikuskapenak ez dira onartzen."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Kanpoko softwarea"
 
@@ -2651,39 +4655,39 @@ msgstr "Gehitu ezaugarria"
 msgid "editors_featured_add_feature_submit"
 msgstr "Gehitu"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Ezaugarria ongi ezabatu da."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Nabarmendutako gehigarriak"
 
@@ -2716,38 +4720,41 @@ 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:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Ez dago mota horretako gehigarririk berrikusteko."
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "egun bat"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "ordu bat"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "minutu bat"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Editorearen tresnak"
 
-#: controllers/editors_controller.php:286
+#. %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 "%s bakarrik"
 
-#: controllers/editors_controller.php:301
+#: 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:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2761,21 +4768,26 @@ msgstr "Garbitu"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Ikuskapen ekintza"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Publiko izatea Eskatu"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Eskatu super-ikuskapena"
 
@@ -2783,34 +4795,42 @@ msgstr "Eskatu super-ikuskapena"
 msgid "editors_review_action_sandbox"
 msgstr "Mantendu probagunean"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Ikuskapen-iruzkinak"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "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:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Honek gehigarria probagunean mantenduko du."
 
-#: views/editors/review.thtml:159
+#: 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:162
+#: 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:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Inolako kezkarik izanez gero gehigarri honen segurtasunarekin, "
@@ -2839,15 +4859,15 @@ msgstr "Kategoriak:"
 msgid "editors_review_header_compatibility"
 msgstr "Bateragarritasuna:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Azalpena"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Garatzailearen iruzkinak"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "AELK"
 
@@ -2855,85 +4875,112 @@ msgstr "AELK"
 msgid "editors_review_header_files"
 msgstr "Fitxategiak:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Elementuaren historia"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Proposamen-mezua"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Aurrebistak"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Ikuskatu %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Ikuskatzailearentzat oharrak"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Laburpena"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Bertsio-oharrak"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "Kudeatzailearen berrikuspena"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Proposamena Onartuta/Publikoa"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Proposamen ukatua/probagunea"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Ezin da aurreko berrikuspen sarrerarik aurkitu."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Kudeatzailearen berrikuspena"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Onartua/Publikoa"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Ukatua/Probagunea"
 
-#: views/editors/review.thtml:198
+#. 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 "Aplikazioak:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "edo aukeratu erantzun finkoa:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Iruzkinak:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistema eragileak:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Goialdean"
 
@@ -2942,7 +4989,7 @@ msgstr "Goialdean"
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Ez da aurrebistarik aurkitu."
 
@@ -2951,42 +4998,69 @@ msgstr "Ez da aurrebistarik aurkitu."
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Prozesatu ekintza"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Ekintza"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Iruzkinak"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Data"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Ikuskatzailea"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Bertsioa/Fitxategia"
 
-#: controllers/editors_controller.php:411
+#: 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)"
+
+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:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Berrikuspena arrakastaz prozesatu da."
 
@@ -3012,7 +5086,7 @@ msgstr "Ekintza"
 msgid "editors_reviews_in_reply_to"
 msgstr "honi erantzunez:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Berrikuspenak arrakastaz prozesatu dira!"
 
@@ -3024,23 +5098,23 @@ msgstr "Ez dago berrikuspenik moderatzeke."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Prozesatu berrikuspenak"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Gune konkreturako"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Berria"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Eguneratuta"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Egiaztatutako aplikazioa"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Egiaztatutako sistema eragileak"
 
@@ -3081,17 +5155,20 @@ msgstr "Plataformak"
 msgid "editors_th_submissiontypes"
 msgstr "Bidalketa-motak"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s egun"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ordu"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutu"
@@ -3100,8 +5177,8 @@ msgstr "%s minutu"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Sarrera ukatua"
 
@@ -3109,12 +5186,13 @@ msgstr "Sarrera ukatua"
 msgid "error_access_denied_message"
 msgstr "Ez duzu orri hau ikusteko baimenik."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3124,18 +5202,19 @@ msgstr "Ez duzu orri hau ikusteko baimenik."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Ez da gehigarria aurkitu!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Gehigarri hau ezin da hemen ikusi."
 
@@ -3144,7 +5223,7 @@ msgstr "Gehigarri hau ezin da hemen ikusi."
 msgid "error_addon_selfreview"
 msgstr "You cannot review your own add-on."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Ez dago gehigarririk kategoria honetan!"
 
@@ -3166,24 +5245,25 @@ msgstr "Hau ez da baliozko eposta helbide bat."
 msgid "error_field_required"
 msgstr "Eremu hau ezin da hutsik utzi."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Fitxategia ez da aurkitu!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Fitxategi-errorea: %s ez da existitzen."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3201,16 +5281,18 @@ msgstr ""
 "URL honek formatu baliogabea du. Baliozko URLak honelakoak dira: 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3229,7 +5311,7 @@ msgstr "Oharra"
 msgid "error_preview_notfound"
 msgstr "Aurrebista ez da aurkitu!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Puntuazio bat aukeratu behar duzu."
 
@@ -3281,8 +5363,8 @@ msgstr "Lehenik berretsi zure erabiltzaile kontua mesedez."
 msgid "error_username_or_pw_wrong"
 msgstr "Erabiltzaile-izen edo pasahitz okerra!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Bertsioa ez da aurkitu!"
 
@@ -3295,12 +5377,14 @@ msgid "feature_learnmore"
 msgstr "Ikasi gehiago"
 
 # %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Gehiago jakin %1$s buruz"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3312,6 +5396,45 @@ msgstr[1] "%1$s berrikuspen"
 msgid "feature_view_more_from_category"
 msgstr "Kategoria honetako gehiago:"
 
+#. 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Eskubide guztiak erreserbatuta"
@@ -3349,7 +5472,7 @@ msgstr "Beste hizkuntzak:"
 msgid "footer_privacy_policy"
 msgstr "Pribatutasun-politika"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Gorde"
 
@@ -3358,6 +5481,7 @@ 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Hiztegiak"
@@ -3367,6 +5491,7 @@ 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Hedapenak"
@@ -3376,6 +5501,7 @@ 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Hizkuntza Paketeak (Gehigarriak)"
@@ -3385,6 +5511,7 @@ 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Hizkuntza Paketeak (Aplikazioak)"
@@ -3394,6 +5521,7 @@ 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Pluginak"
@@ -3403,6 +5531,7 @@ 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:111
 msgid "general_addontype_search_plural"
 msgstr "Bilaketa Motoreak"
@@ -3412,10 +5541,12 @@ 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Gaiak"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3446,12 +5577,12 @@ msgid "header_navlink_addons"
 msgstr "Gehigarriak"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Amaitu saioa"
 
@@ -3459,36 +5590,43 @@ msgstr "Amaitu saioa"
 msgid "header_navlink_myaccount"
 msgstr "Nire kontua"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Eman izena"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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"
 
 # %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/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">Hasi saioa</a> gehigarri hau instalatzeko"
 
+#. %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 "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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3512,7 +5650,7 @@ msgid "langtools_download_langpack"
 msgstr "Deskargatu hizkuntza-paketea"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Hiztegiak eta hizkuntza-paketeak"
 
@@ -3570,7 +5708,7 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3608,6 +5746,7 @@ 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:214
 msgid "other_users"
 msgstr "besteak"
@@ -3622,42 +5761,41 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_experimental_addons"
 msgstr "Experimental Add-ons"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 #, fuzzy
 msgid "page_title_policy"
 msgstr "Add-ons Policy"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 #, fuzzy
 msgid "page_title_privacy"
 msgstr "Mozilla Privacy Policy"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 #, fuzzy
 msgid "page_title_review_guide"
 msgstr "Review Guidelines"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 #, fuzzy
 msgid "page_title_sandbox"
 msgstr "Sandbox Review System"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 #, fuzzy
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
@@ -3678,6 +5816,7 @@ msgstr ""
 "fitxategian. Azpian zerrendatutako bertsioak onartuko dira soilik aplikazio "
 "horientzat."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3685,6 +5824,8 @@ msgstr ""
 "Euskarria ematen diozun aplikazioak install.rdf fitxategia behar ez badu "
 "ere, halako bat sartu beharko duzu %s zehaztutako propietateekin."
 
+#. 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 "hemen"
@@ -3693,7 +5834,6 @@ msgstr "hemen"
 msgid "pages_appversions_versions"
 msgstr "Bertsioak"
 
-#: views/pages/experimental_addons.thtml:56
 #, fuzzy
 msgid "pages_experimental_addons_backbutton"
 msgstr "Back to the previous page"
@@ -3707,6 +5847,7 @@ 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"
@@ -3735,6 +5876,8 @@ msgstr "Please type what you hear."
 
 # %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
 #, fuzzy
 msgid "recaptcha_hardtohear_text"
@@ -3744,6 +5887,8 @@ msgstr ""
 
 # %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
 #, fuzzy
 msgid "recaptcha_hardtoread_text"
@@ -3761,7 +5906,7 @@ msgstr "Are you human?"
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 #, fuzzy
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
@@ -3792,7 +5937,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 #, fuzzy
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
@@ -3810,6 +5955,7 @@ msgstr ""
 "editor review."
 
 # %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:48
 #, fuzzy
 msgid "review_guidelines_short"
@@ -3827,21 +5973,22 @@ msgstr ""
 "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: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:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Nabarmendutako gehigarriak"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Gehigarri berrienak"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 #, fuzzy
 msgid "rss_updatedaddons"
 msgstr "Updated Add-ons"
@@ -3881,6 +6028,7 @@ msgstr "Bilaketa-motor guztiak"
 msgid "search_landing_browse_search_engines"
 msgstr "Arakatu bilaketa-motorrak"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3900,12 +6048,13 @@ msgstr "Bilatu gehigarriak"
 msgid "search_rss_description"
 msgstr "Bilaketa-emaitzen jarioa"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Bilaketaren emaitzak: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Kudeaketa-tresnak"
 
@@ -3913,7 +6062,7 @@ msgstr "Kudeaketa-tresnak"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Garatzaile-tresnak"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editore-tresnak"
 
@@ -3921,6 +6070,7 @@ msgstr "Editore-tresnak"
 msgid "sidebar_navlink_welcome"
 msgstr "Ongi etorri"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3962,6 +6112,7 @@ msgstr "Gaia"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Add-ons"
 
+#. %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
@@ -3974,6 +6125,7 @@ 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3991,24 +6143,32 @@ msgstr "Garatzaile-tresnak"
 msgid "statistics_addon_switch"
 msgstr "Aldatu gehigarria"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "%b. %e"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "%Y %b. %e"
 
+#. 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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -4050,7 +6210,7 @@ msgstr "Estatistiken arbela"
 msgid "statistics_index_view_button"
 msgstr "Ikusi estatistikak"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
@@ -4068,7 +6228,7 @@ msgstr "Ezabatu grafiko hau"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
@@ -4078,104 +6238,109 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s aurkitu dira heinean"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Gehitu grafikoa"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Gehitu beste irudi bat grafikoari"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Ezkutatu kontu totala "
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Erakutsi kontu totala"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Ikusi datuak (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Ezkutatu %s(r)en gertaerak"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Erakutsi %s(r)en gertaerak"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Gainjarri grafikoetan gehigarrien kaleratze-datak"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Ezkutatu Firefoxen gertaerak"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Erakutsi Firefoxen gertaerak"
 
-#: controllers/statistics_controller.php:241
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Gainjarri grafikoetan Firefoxen kaleratze-datak"
 
-#: controllers/statistics_controller.php:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Tolestu grafikoa"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Zabaldu grafikoa"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Aldatu tamainaz grafikoa"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Eguneko erabiltzaile aktiboak"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplikazioa"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Pertsonalizatu"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Deskargak"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistema Eragilea"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Gehigarriaren egoera"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Laburpena"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Gehigarriaren bertsioa"
 
@@ -4199,11 +6364,11 @@ msgstr "Ezezaguna"
 msgid "statistics_longnames_version"
 msgstr "Gehigarriaren bertsioa"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr "Ez dago nahikoa datu grafikoa bistaratzeko. Saiatu beranduago."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr "Ez dugu zure gehigarriaren daturik. Saiatu berriro egun gutxi barru."
 
@@ -4214,11 +6379,11 @@ msgstr ""
 "osatu gabe egon litezke, gure scriptak informazio hau eguneratzeko lanean "
 "baitabiltza. Saiatu berriro minutu batzuk barru."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "Estatistiken arbela ezgaituta dago. Saiatu beranduago."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "JavaScript beharrezkoa da estatistiken arbeleko grafikoak ikusteko."
 
@@ -4233,36 +6398,36 @@ msgstr "Zure ezarpenak eguneratu dira!"
 msgid "statistics_pagetitle"
 msgstr "Estatistiken arbela"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Eguneko erabiltzaile aktiboak"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Eguneko deskargak"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Gerturatu zooma"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Gerturatu zooma hilabete"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Urrundu zooma"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Urrundu zooma hilabete"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Estatistiken eguneroko laburpena (%1$s)"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Laburpen-datuen RSS jarioa"
 
@@ -4302,23 +6467,23 @@ msgstr "Publikoa"
 msgid "statistics_settings_access_public_description"
 msgstr "Edonork ikus ditzake gehigarri honen estatistikak"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Aldatu ezarpenak"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Mesedez erabili informazio hau konfidentziala balitz bezala."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Arbel hau une honetan <b>pribatua</b> da."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Arbel hau une honetan <b>publikoa</b> da."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Itxirik"
 
@@ -4335,7 +6500,7 @@ msgstr "Gorde ezarpenak"
 msgid "statistics_settings_title"
 msgstr "Estatistiken arbelaren ezarpenak (%1$s)"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Desblokeatua"
 
@@ -4359,7 +6524,7 @@ msgstr "Ee"
 msgid "statistics_shortnames_version"
 msgstr "Ber"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Batez besteko eguneko deskargak"
 
@@ -4367,37 +6532,37 @@ msgstr "Batez besteko eguneko deskargak"
 msgid "statistics_summary_downloads_heading"
 msgstr "Deskargak"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Azken egunean"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Deskargak azken 7 egunetan"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Deskargak guztira"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "%1$s(e)tik"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Daturik ez oraindik"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Batez besteko eguneko erabiltzaile aktiboak"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Aldaketa aurreko kontagailutik"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s %2$s(e)an"
@@ -4406,17 +6571,17 @@ msgstr "%1$s %2$s(e)an"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Eguneko erabiltzaile aktiboak"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Eguneko erabiltzaile aktiboak"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: 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:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s estatistikak"
@@ -4443,6 +6608,7 @@ 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:49
 #, fuzzy
 msgid "user_del_account_deleted"
@@ -4467,6 +6633,7 @@ 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:62
 #, fuzzy
 msgid "user_del_error_addons"
@@ -4477,6 +6644,7 @@ msgstr ""
 "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:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
@@ -4495,6 +6663,7 @@ 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:83
 #, fuzzy
 msgid "user_del_error_unknown"
@@ -4508,6 +6677,7 @@ 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:93
 #, fuzzy
 msgid "user_del_header_delete_account"
@@ -4538,6 +6708,7 @@ msgstr ""
 "associated with you."
 
 # %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
@@ -4557,6 +6728,7 @@ msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 #, fuzzy
 msgid "user_edit_confirm_email_sent"
@@ -4573,6 +6745,9 @@ 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
+#. 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"
@@ -4592,6 +6767,7 @@ msgstr ""
 "-- %2$s Gehigarrien Pertsonala"
 
 # %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, fuzzy, php-format
@@ -4617,6 +6793,8 @@ msgstr "Milesker Mozilla Gehigarriekin bat egiteagatik"
 
 # This is the password reset email
 # %1 is the pw reset URL
+#. 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"
@@ -4645,6 +6823,7 @@ msgid "user_emailchange_error"
 msgstr "Error!"
 
 # %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, fuzzy, php-format
 msgid "user_emailchange_subject"
@@ -4656,6 +6835,7 @@ msgid "user_emailchange_success"
 msgstr "Success!"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, fuzzy, php-format
 msgid "user_emailchange_successful_description"
@@ -4832,6 +7012,7 @@ msgid "user_register_amo_link"
 msgstr "%s Gehigarriak"
 
 # %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"
@@ -4840,6 +7021,7 @@ msgstr ""
 "hori jarraitu behar duzu %2$s gehigarrietan saioa hasi aurretik."
 
 # %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4857,6 +7039,7 @@ msgid "user_register_congratulations"
 msgstr "Zorionak! zure erabiltzaile kontua behar bezala sortu da!"
 
 # %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"
@@ -4866,6 +7049,7 @@ msgstr ""
 "aurreko eposta helbidera berriz bidal dezakegu."
 
 # %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4930,6 +7114,7 @@ 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:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
@@ -4941,6 +7126,8 @@ msgstr "Erabiltzailearen saio-hasiera"
 
 # %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4951,6 +7138,8 @@ msgstr ""
 
 # %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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4966,3 +7155,33 @@ msgstr "Berrezarri erabiltzaile pasahitza"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Erabiltzaile berriaren harpidetza"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Azken bertsio bateragarria"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "sidebar_navlink_tools"
+#~ msgstr "Tresnak"
diff --git a/site/app/locale/fa/LC_MESSAGES/messages.po b/site/app/locale/fa/LC_MESSAGES/messages.po
index 899058b..8c2d025 100644
--- a/site/app/locale/fa/LC_MESSAGES/messages.po
+++ b/site/app/locale/fa/LC_MESSAGES/messages.po
@@ -16,6 +16,10 @@ msgstr ""
 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 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
@@ -44,38 +48,34 @@ msgstr "عمومی"
 msgid "a_header_sandbox"
 msgstr "گودال ماسه‌بازی"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "اضا�ه گردید"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "به‌هنگام شده در %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "نسخهٔ %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "بارگیری در کل"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
@@ -92,22 +92,22 @@ msgstr "در هر ص�حه"
 msgid "addon_list_sortby"
 msgstr "مرتب‌سازی بر حسب:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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: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: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
@@ -116,7 +116,7 @@ msgstr "%1$s برای %2$s در دسترس نیست."
 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -135,6 +135,7 @@ msgstr "بررسی:"
 msgid "addon_review_add_submit"
 msgstr "ارسال بررسی شما"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -168,22 +169,24 @@ msgstr "بله"
 msgid "addon_review_delete_header"
 msgstr "حذ� بررسی"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "بررسی با مو�قیت حذ� گردید."
 
+#. %s is the name of the add-on
 #: 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:534
+#. %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 حر� وارد کرده‌اید."
 
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -194,7 +197,7 @@ msgstr ""
 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:135
 #, php-format
 msgid "addon_review_others_by_user"
@@ -204,16 +207,16 @@ msgstr[0] ""
 msgstr[1] ""
 "%1$s بررسی قبلی ارسال شده توسط %2$s برای این ا�زودنی را مشاهده کنید."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -227,13 +230,13 @@ msgstr "پاسخ توسعه‌دهنده:"
 msgid "addon_review_saved_successfully"
 msgstr "بررسی شما با مو�قیت ذخیره گردید.  متشکریم!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, php-format
@@ -256,11 +259,13 @@ msgstr "ا�زودنی قبلی"
 msgid "addon_version_permalink"
 msgstr "پیوند دائمی به این نسخه"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "جدیدترین نسخهٔ سازگار با"
+#. %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 "جدیدترین نسخهٔ سازگار با %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "برو"
 
@@ -268,19 +273,20 @@ msgstr "برو"
 msgid "addons_author_tooltip"
 msgstr "مشاهدهٔ اطلاعات مؤل�"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "مرور همهٔ تم‌ها :: ا�زودنی‌های %1$s"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "مرور تم‌های %1$s :: ا�زودنی‌های %2$s"
 
@@ -288,7 +294,7 @@ msgstr "مرور تم‌های %1$s :: ا�زودنی‌های %2$s"
 msgid "addons_display_add_review"
 msgstr "ا�زودن یک بررسی"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "جزئیات پیشر�ته"
 
@@ -296,11 +302,11 @@ msgstr "جزئیات پیشر�ته"
 msgid "addons_display_categories"
 msgstr "دسته‌ها"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "بررسی م�صل"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "آن را دوست ندارم"
@@ -309,143 +315,149 @@ msgstr "آن را دوست ندارم"
 msgid "addons_display_edit_review"
 msgstr "ویرایش بررسی خود"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "این ا�زودنی دارای یک سیاست محرمانگی است."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "توضیحات توسعه‌دهنده"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "ص�حهٔ آغازه"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "بررسی‌ها"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "پشتیبانی"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "آن را دوست دارم"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "شرح کامل"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 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:421
-#, fuzzy
+#. %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] "دیگر ا�زودنی‌های %1$s"
-msgstr[1] "Other add-ons by these authors"
+msgstr[1] "دیگر ا�زودنی‌های این مؤل�ان"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "پشتیبانی از این ا�زودنی توسط توسعه‌دهنده در %s ارائه می‌شود"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "پشتیبانی از این ا�زودنی توسط توسعه‌دهنده در %s یا با ارسال پست الکترونیکی به %"
 "s ارائه می‌شود"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "ص�حهٔ آغازه"
 
-#: views/addons/display.thtml:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "به این ا�زودنی رتبه بدهید"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "از <a href=\"%1$s\">بخش پشتیبانی </a> برای کمک گر�تن دربارهٔ است�اده از این "
 "ا�زودنی بازدید کنید."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "ارسال"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "همهٔ بررسی‌ها را مشاهده کنید (تعداد: %1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "مشاهدهٔ تمام نسخه‌ها"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "تاریخچهٔ کامل نسخه‌ها"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "مشاهدهٔ متن برنامه"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "مشاهدهٔ آمار"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "شما چه �کر می‌کنید؟"
 
@@ -455,7 +467,7 @@ msgstr "با این نسخه‌ها کار می‌کند:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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 "توسط"
@@ -466,10 +478,11 @@ msgstr "توسط"
 msgid "addons_home_feature_head"
 msgstr "پیشنهاد ما"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -485,7 +498,9 @@ msgstr "جدیدترین ا�زودنی‌ها:"
 msgid "addons_home_other_applications"
 msgstr "برنامه‌های دیگر"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -495,19 +510,20 @@ msgstr "برنامه‌های دیگر"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -603,6 +619,7 @@ msgstr "مخصوص مک‌ا�وا�س ا�کس"
 msgid "addons_plugins_for_windows"
 msgstr "مخصوص ویندوز"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -622,12 +639,13 @@ msgstr ""
 "گرا�یکی یا پخش پرونده‌های چندرسانه‌ای انجام دهد. متصل‌شونده‌ها کمی با ضمیمه‌ها که "
 "توانایی‌های موجود را گسترش می‌دهند یا بهبود می‌بخشند ت�اوت دارند."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "متصل‌شونده‌های %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "متصل‌شونده‌ها"
 
@@ -638,6 +656,7 @@ msgstr "متصل‌شونده‌ها"
 msgid "addons_plugins_support_documentation"
 msgstr "مستندات پشتیبانی: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -645,24 +664,24 @@ msgstr ""
 "پیش از ادامهٔ نصب، %s شما را ملزم به پذیر�تن توا�ق‌نامهٔ مجوز کاربر نهایی زیر "
 "می‌کند:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "پیش‌نمایش‌های مخصوص %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 msgid "addons_recommended_introduction"
 msgstr ""
 "با این همه ا�زودنی‌های عالی که وجود دارد، هر کس چیزی پیدا خواهد کرد. برای "
 "شروع، این �هرستی از محبوب‌ترین ا�زودنی‌هاست.  لذت ببرید!"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "ا�زودنی‌های پیشنهاد شده"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "ا�زودنی‌های پیشنهاد شده"
 
@@ -670,7 +689,7 @@ msgstr "ا�زودنی‌های پیشنهاد شده"
 msgid "addons_searchengines_additional_resources"
 msgstr "منابع دیگر"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "مرکز توسعه‌دهندگان موزیلا"
@@ -688,35 +707,35 @@ msgstr ""
 "�عال کرده‌اید.  لط�اً جاوا اسکریپت را پیش از تلاش برای نصب هر یک از متصل "
 "شونده‌های جستجوی زیر �عال سازید."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %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 "در %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: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: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: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:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "موتورهای جستجو"
 
@@ -728,7 +747,7 @@ msgstr "تشکر خاص از پروژهٔ مایکرا�ت برای کار بر
 msgid "addons_status_disabled"
 msgstr "غیر �عال"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "نسخهٔ ناقص"
 
@@ -766,11 +785,12 @@ msgstr ""
 "این نسخه‌ها تنها برای رجوع و آزمایش نمایش داده می‌شوند. همیشه باید از جدیدترین "
 "نسخهٔ ا�زودنی است�اده کنید."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "تاریخچهٔ نسخه‌ها به همراه �هرست تغییرات"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "تاریخچهٔ نسخه‌های %1$s"
@@ -783,6 +803,7 @@ msgstr "ا�زودن گروه"
 msgid "admin_group_delete_pagetitle"
 msgstr "حذ� گروه"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -908,16 +929,20 @@ msgstr "صر�‌نظر از کنترل تطابق نسخهٔ ا�زودنی"
 msgid "app_compat_older_firefox_only"
 msgstr "این ا�زودنی مخصوص نسخه‌های پیشین �ایر�اکس است"
 
+#. %1$s and %2$s are URLs
 #: 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: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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -930,23 +955,23 @@ msgstr ""
 "برای است�اده از این ا�زودنی، <a href=\"http://getfirefox.com\">�ایر�اکس را "
 "ارتقا دهید</a>"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "ا�زودنی‌ها بر حسب نام"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "جدیدترین ا�زودنی‌ها"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "ا�زودنی‌های محبوب"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "ا�زودنی‌ها بر حسب رتبه"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "ا�زودنی‌های به تازگی به‌هنگام شده"
 
@@ -978,7 +1003,7 @@ msgstr "تقدم با تازه‌ترین به‌هنگام‌سازی‌ها"
 msgid "category_extra_mostpopular"
 msgstr "تقدم با محبوب‌ترین‌ها"
 
-# %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"
@@ -988,11 +1013,19 @@ msgstr "مشاهدهٔ همهٔ ا�زودنی‌های دستهٔ %1$s"
 msgid "collection_not_found"
 msgstr "مجموعه‌ای پیدا نشد!"
 
+#. %s is a date in the _('date') format
+#: views/elements/collections_interactive_addon.thtml:85
+#, php-format
+msgid "collections_interactive_addon_added"
+msgstr "اضا�ه گردید"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
@@ -1025,6 +1058,8 @@ msgstr "تنظیم maxVersion بدون ارسال مجدد ا�زودنی"
 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:130
 msgid "compatibility_developers_login_first"
 msgstr ""
@@ -1048,6 +1083,10 @@ msgstr "نتایج  بررسی وضعیت ا�زودنی‌ها"
 msgid "compatibility_developers_retrieving"
 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:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s کاربر %2$s (%3$s٪ از کل)"
@@ -1062,6 +1101,8 @@ msgstr ""
 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:69
 msgid "compatibility_report_intro"
 msgstr ""
@@ -1073,6 +1114,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "نسخه‌های آل�ا"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "ا�زودنی‌های سازگار با نسخهٔ آل�ایی از %1$s"
@@ -1081,6 +1123,7 @@ msgstr "ا�زودنی‌های سازگار با نسخهٔ آل�ایی از %
 msgid "compatibility_report_legend_beta"
 msgstr "نسخه‌های بتا"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "ا�زودنی‌های سازگار با نسخهٔ بتا یا نامزد انتشاری از %1$s"
@@ -1089,6 +1132,7 @@ msgstr "اÙ�زودنی‌های سازگار با نسخهٔ بتا یا نامØ
 msgid "compatibility_report_legend_latest"
 msgstr "جدیدترین نسخه"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "ا�زودنی‌های سازگار با جدیدترین نسخه‌های %1$s"
@@ -1097,6 +1141,7 @@ msgstr "ا�زودنی‌های سازگار با جدیدترین نسخه‌ه
 msgid "compatibility_report_legend_other"
 msgstr "نسخه‌های دیگر"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "ا�زودنی‌های ناسازگار با هر نسخهٔ %1$s"
@@ -1114,12 +1159,13 @@ msgstr "اطلاعات مخصوص است�اده‌کنندگان ا�زودنی
 msgid "compatibility_view_report"
 msgstr "مشاهدهٔ گزارش سازگاری"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "برای اطلاعات دربارهٔ مشارکت، لط�اً از %s ما بازدید کنید."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "ص�حهٔ ویکی"
 
@@ -1160,26 +1206,35 @@ msgstr ""
 "شمایل famfamfam Silk</a>، تحت مجوز <a href=\"http://creativecommons.org/"
 "licenses/by/2.5/\">تخصیص کریتیو کامنز ۲٫۵</a> مورد است�اده قرار گر�ته‌اند."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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)
+#. 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، %I:%M %p"
@@ -1205,14 +1260,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1260,36 +1343,36 @@ msgstr "گام ۵: مو�قیت"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "راهنمای ارسال"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "ا�زودنی با مو�قیت غیر �عال گردید"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "ویرایش ا�زودنی"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "ا�زودنی با مو�قیت �عال گردید"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "شرح ا�زودنی"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "توا�ق‌نامهٔ مجوز کاربر نهایی"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "ص�حهٔ آغازهٔ ا�زودنی"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "نام ا�زودنی"
 
@@ -1298,40 +1381,298 @@ msgstr "نام ا�زودنی"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "عنوان پیش‌نمایش"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "سیاست محرمانگی"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "خلاصهٔ ا�زودنی"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "پست الکترونیکی پشتیبانی"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "نشانی پشتیبانی"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "یادداشت‌های نسخه"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "نامزد کردن ا�زودنی"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "ا�زودنی با مو�قیت نامزد شد!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1354,7 +1695,7 @@ msgstr ""
 "بررسی شود درون گودال ماسه‌بازی قرار گر�ته است. هنگامی که این عمل انجام شود، "
 "به شما توسط پست الکترونیکی خبر داده خواهد شد."
 
-# %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"
@@ -1364,7 +1705,7 @@ msgstr "در %s می‌توانید بیشتر دربارهٔ روال بررسÛ
 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"
@@ -1387,16 +1728,16 @@ msgstr ""
 "به دلیل این که ا�زودنی شما مورد اعتماد است، این نسخه به صورت خودکار برای بخش "
 "عمومی تأیید شده است."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "ارسال ا�زودنی"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1406,7 +1747,7 @@ msgstr "ممکن است مایل باشید برای اÙ�زایش علاقه بÙ
 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"
@@ -1435,10 +1776,102 @@ msgstr "بعدی"
 msgid "devcp_change_addontype"
 msgstr "تغییر نوع ا�زودنی:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "توضیحات توسعه‌دهنده به‌هنگام گردید."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "ا�زودن پیش‌نمایش"
@@ -1531,6 +1964,7 @@ msgstr "نشانی اینترنتی پشتیبانی توسط توسعه‌دهÙ
 msgid "devcp_details_trusted"
 msgstr "مورد اعتماد"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1561,6 +1995,7 @@ msgstr ""
 "می‌شود، ولی می‌توانید هر زمانی که مایل باشید به اینجا بازگردید و آن را دوباره "
 "�عال کنید."
 
+#. %s is the name of an add-on
 #: views/developers/disable.thtml:55
 #, php-format
 msgid "devcp_disable_disable_title"
@@ -1581,11 +2016,57 @@ 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 "ا�زودن پاسخ"
+
+#: views/developers/discuss.thtml:57
+msgid "devcp_discuss_allreplies_header"
+msgstr "پاسخ‌ها"
+
+#. 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 ""
+"خطایی در ذخیره کردن پاسخ‌تان روی داد. لط�اً در این مورد با %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 از شما "
+"اطلاعات بیشتری درخواست کرده است."
+
+#. %1 is the add-on name
+#: views/developers/discuss.thtml:43
+msgid "devcp_discuss_pagetitle"
+msgstr "�راهم کردن اطلاعات بیشتر برای بررسی ا�زودنی %1$s"
+
+#. submit button text
+#: views/developers/discuss.thtml:79
+msgid "devcp_discuss_submit_reply"
+msgstr "ارسال پاسخ"
+
+#: views/developers/discuss.thtml:72
+msgid "devcp_discuss_success_message"
+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
+msgid "devcp_discuss_writtenby"
+msgstr "نوشته شده توسط %1$s در تاریخ %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "ا�زودن مؤل�"
@@ -1598,10 +2079,297 @@ msgstr "نشانی پست الکترونیکی مؤل�"
 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 "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+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 "مؤل�ان"
@@ -1667,6 +2435,206 @@ msgstr "منطقهٔ مقصد"
 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: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 "به‌هنگام‌سازی"
@@ -1677,11 +2645,66 @@ 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 "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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+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
 #, php-format
@@ -1690,7 +2713,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "بررسی‌های تعدیل شده (%s)"
 msgstr[1] "بررسی‌های تعدیل شده (%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
 #, php-format
@@ -1699,7 +2722,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "ا�زودنی‌های نامزد شده (%s)"
 msgstr[1] "ا�زودنی‌های نامزد شده (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1712,8 +2735,8 @@ msgstr[1] "به‌هنگام‌سازی‌های باقی‌مانده (%s)"
 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"
@@ -1739,29 +2762,30 @@ msgstr "یادداشت برای بررسی‌کنندگان"
 msgid "devcp_editversion_submit_update"
 msgstr "به‌هنگام‌سازی"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
 msgid "devcp_error_addon_field_summary_toolong"
 msgstr ""
 "خلاصه‌ها محدود به حداکثر ۲۵۰ حر� هستند.\n"
 "(شما %s حر� وارد کردید)"
 
-#: controllers/developers_controller.php:1907
+#: controllers/developers_controller.php:1992
 msgid "devcp_error_addonname_not_unique"
 msgstr ""
 "نام ا�زودنی شما قبلاً در پایگاه‌داده وجود دارد. لط�اً مطمئن شوید که: <br /><li> "
@@ -1770,19 +2794,33 @@ msgstr ""
 "صورت، یا باید مدخل قبلی را به‌هنگام سازید یا آن را حذ� کنید و دوباره تلاش "
 "کنید.</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 "لط�اً %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 "این ص�حه"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+msgid "devcp_error_file_exists"
+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"
@@ -1790,7 +2828,7 @@ msgstr ""
 "این پسوند پرونده (%s) برای نوع ا�زودنی انتخاب شده مجاز نیست. لط�اً از یکی از "
 "پسوندهای زیر است�اده کنید: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "تمام GUID ها با هم یکسان نیستند"
 
@@ -1819,6 +2857,8 @@ msgstr "اندازهٔ پرونده بیش از اندازهٔ بارگذاری
 msgid "devcp_error_http_nofile"
 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:401
 #, php-format
 msgid "devcp_error_icon_extension"
@@ -1826,13 +2866,14 @@ msgstr ""
 "این پسوند پرونده (%s) برای شمایل مجاز نیست. لط�اً از یکی از پسوندهای زیر "
 "است�اده کنید: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "پروندهٔ install.rdf وجود ندارد."
 
@@ -1840,21 +2881,26 @@ msgstr "پروندهٔ install.rdf وجود ندارد."
 msgid "devcp_error_install_manifest"
 msgstr "خطاهای زیر در پروندهٔ install.rdf پیدا شد:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "لط�اً یک نوع ا�زودنی مجاز انتخاب کنید."
 
+#. %$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 "%s نسخهٔ مجازی برای %s نیست"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "شناسهٔ این ا�زودنی نامعتبر است: %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"
@@ -1870,6 +2916,7 @@ msgstr ""
 msgid "devcp_error_invalid_version_spaces"
 msgstr "نسخهٔ این ا�زودنی معتبر نیست: نسخه‌ها نمی‌توانند شامل �اصله باشند."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1879,6 +2926,7 @@ msgstr "خطای زیر در هنگام تجزیهٔ install.rdf روی داد:
 msgid "devcp_error_move_file"
 msgstr "تغییر مکان پرونده شکست خورد"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1901,15 +2949,15 @@ msgstr "شناسه‌ای برای این ا�زودنی در install.rdf تعر
 msgid "devcp_error_no_platform"
 msgstr "سکوی نرم‌ا�زاری انتخاب نشده است"
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "باید اطلاعات خواسته شده را برای نامزد کردن ا�زودنی �راهم کنید."
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "شما نمی‌توانید یک ا�زودنی پیش از انتشار را نامزد کنید."
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "تنها می‌توانید ا�زودنی‌های موجود در گودال ماسه‌بازی را نامزد کنید."
 
@@ -1921,6 +2969,8 @@ msgstr "لط�اً حداقل یک دسته را انتخاب کنید."
 msgid "devcp_error_one_user"
 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"
@@ -1928,13 +2978,13 @@ msgstr ""
 "پسوند پروندهٔ (%s) برای یک پیش‌نمایش مجاز نیست. لط�اً از یکی از پسوندهای زیر "
 "است�اده کنید: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
 msgid "devcp_error_saving"
 msgstr "در ذخیره‌سازی اطلاعات شما خطایی روی داد."
 
-#: controllers/developers_controller.php:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "اجازهٔ به‌هنگام‌سازی این ا�زودنی را ندارید."
 
@@ -1950,7 +3000,7 @@ msgstr ""
 "ا�زودنی‌ها قادر به است�اده از یک updateURL خارجی نیستند.  لط�اً این را از "
 "install.rdf حذ� کنید و دوباره تلاش نمایید."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "لط�اً یک پرونده بارگذاری نمایید."
@@ -2171,7 +3221,7 @@ msgstr "ا�زودنی‌های من"
 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"
@@ -2215,33 +3265,68 @@ msgstr "ارسال ا�زودنی"
 msgid "devcp_myaddons_title"
 msgstr "ابزارهای توسعه‌دهنده"
 
+#. %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 "بازگشت به جزئیات ا�زودنی"
 
-# %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"
 
-# %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: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 ""
 "حذ� پیش‌نمایش پیش‌�رض باعث می‌شود یک پیش‌نمایش دیگر به صورت خودکار به عنوان "
 "پیش‌نمایش پیش‌�رض انتخاب شود."
 
-# %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"
@@ -2256,9 +3341,14 @@ msgstr ""
 "انتخاب این پیش‌نمایش به عنوان پیش‌نمایش پیش‌�رض باعث می‌شود پیش‌نمایش پیش‌�رض "
 "کنونی از حالت پیش‌�رضی خارج شود."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2287,6 +3377,60 @@ msgstr "ویرایش پیش‌نمایش"
 msgid "devcp_preview_updated_successfully"
 msgstr "پیش‌نمایش با مو�قیت به‌هنگام شد."
 
+#: 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 ""
@@ -2298,10 +3442,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "ا�زودن پیش‌نمایش"
 
+#: 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 "ویرایش پیش‌نمایش"
 
+#: 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 "پروندهٔ پیش‌نمایش"
@@ -2310,6 +3464,34 @@ msgstr "پروندهٔ پیش‌نمایش"
 msgid "devcp_previews_label_makedefault"
 msgstr "این تصویر را به عنوان پیش‌نمایش پیش‌�رض قرار بده"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "حذ� پیش‌نمایش"
@@ -2326,57 +3508,172 @@ msgstr "ویرایش پیش‌نمایش"
 msgid "devcp_previews_submit_upload"
 msgstr "بارگذاری پیش‌نمایش"
 
+#: 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 "نادرست؟"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "آیا از حذ� این پرونده اطمینان دارید؟"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
+
+#: 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 "از به‌هنگام‌سازی اطلاعات �علی ا�زودنی من صر�‌نظر کن"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> کاربر روزانهٔ �عال"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> بارگیری در کل"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> بارگیری در این ه�ته"
 
-#: controllers/developers_controller.php:1481
+#: 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 "ارسال ا�زودنی �علاً غیر �عال است. لط�اً بعداً دوباره تلاش نمایید."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "قبول دارم"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "قبول ندارم"
 
@@ -2392,11 +3689,11 @@ msgstr "غیر �عال"
 msgid "devcp_summary_header_trusted"
 msgstr "مورد اعتماد"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2406,7 +3703,7 @@ msgstr "شما هیچ ا�زودنی ندارید. برای ارسال یک ا�
 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"
@@ -2416,30 +3713,667 @@ msgstr "لط�اً مطمئن شوید برای تم خود %s."
 msgid "devcp_theme_upload_preview_link"
 msgstr "یک پیش‌نمایش بارگذاری کنید"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "لط�اً %s را به عنوان مرجع ملاحظه نمایید."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "این ص�حه"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "ویرایش نسخه"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "نسخه با مو�قیت به‌هنگام گردید."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "این ا�زودنی غیر �عال است"
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "این ا�زودنی نامزد نشده است."
+
+#: controllers/components/editors.php:213
+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
+msgid "editor_review_error_no_action"
+msgstr "لط�اً یک عمل بررسی را انتخاب کنید."
+
+#: controllers/components/editors.php:192
+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
+msgid "editor_review_error_no_comments"
+msgstr "لط�اً نظرات خود را دربارهٔ این بررسی وارد کنید."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "لط�اً حداقل یک پرونده را برای بررسی انتخاب نمایید."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "لط�اً سیستم‌عامل‌هایی که آزمایش نمودید را مشخص کنید."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "صا�ی"
@@ -2448,7 +4382,7 @@ msgstr "صا�ی"
 msgid "editorcp_logs_filter_by"
 msgstr "صا�ی بر حسب نوع/عمل"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "ثبت وقایع رویدادها"
 
@@ -2500,6 +4434,7 @@ msgstr "مخ�ی کردن نظرات"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "نشان دادن نظرات"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2509,7 +4444,7 @@ msgstr "مشاهدهٔ موارد بین %s و %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "هیچ بررسی در این دوره پیدا نشد."
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "ثبت وقایع بررسی‌ها"
 
@@ -2533,24 +4468,24 @@ msgstr "�عالیت‌های اخیر ویرایش‌گر"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "تعداد کل بررسی‌ها"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "بررسی ا�زودنی"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "لط�اً �یلدهای زیر را تکمیل نمایید:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "لط�اً حداقل یک پرونده را برای بررسی انتخاب نمایید."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "بررسی ا�زودنی‌های خود مجاز نیست."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "نرم‌ا�زار خارجی"
 
@@ -2562,39 +4497,39 @@ msgstr "ا�زودن ویژگی"
 msgid "editors_featured_add_feature_submit"
 msgstr "ا�زودن"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "ویژگی با مو�قیت ا�زوده شد."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "حذ� ویژگی شکست خورد."
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "حذ� ویژگی با مو�قیت انجام شد."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "ا�زودنی‌های ویژه"
 
@@ -2626,39 +4561,40 @@ msgstr "سیاست ا�زودنی"
 msgid "editors_notice_filter_session"
 msgstr "این صا�ی‌ها برای این نشست تا زمانی که پاک شوند باقی خواهند ماند."
 
-# %1 is the queue mode
+#. %1 is the queue mode
 #: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "در حال حاضر هیچ ا�زودنی از این نوع برای بررسی وجود ندارد."
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "۱ روز"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "۱ ساعت"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "۱ دقیقه"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "ابزارهای ویرایش‌گر"
 
-#: controllers/editors_controller.php:286
+#. %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 "تنها %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "پیش از انتشار"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2672,19 +4608,23 @@ msgstr "پاک کردن"
 msgid "editors_queue_submit_filter"
 msgstr "صا�ی"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "تمام ص�‌های بررسی اکنون غیر �عال هستند.  لط�اً بعداً دوباره تلاش نمایید."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "عمل بررسی"
 
+#: views/editors/review.thtml:153
+msgid "editors_review_action_info"
+msgstr "درخواست اطلاعات بیشتر"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "عمومی کردن"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "درخواست بررسی ارشد"
 
@@ -2692,31 +4632,38 @@ msgstr "درخواست بررسی ارشد"
 msgid "editors_review_action_sandbox"
 msgstr "نگه داشتن در گودال ماسه‌بازی"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "توضیحات بررسی"
 
-#: views/editors/review.thtml:167
+#: views/editors/review.thtml:176
+msgid "editors_review_details_info_request"
+msgstr ""
+"از این �رم برای درخواست اطلاعات بیشتر از مؤل� است�اده کنید. مؤل�ان نامه‌ای "
+"الکترونیکی دریا�ت خواهند کرد و قادر خواهند بود در اینجا پاسخ دهند. هنگامی که "
+"مؤل�ان پاسخی ارسال نمایند، شما توسط نامه‌ای الکترونیکی مطلع خواهید شد."
+
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "این گزینه، ا�زودنی و آخرین نسخهٔ آن را به صورت عمومی در خواهد آورد. نسخه‌های "
 "بعدی وارد گودال ماسه‌بازی می‌شوند تا توسط یک ویرایش‌گر بررسی گردند."
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "این گزینه ا�زودنی را در گودال ماسه‌بازی نگه خواهد داشت."
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr "این گزینه یک نسخهٔ درون گودال ماسه‌بازی از ا�زودنی را عمومی می‌کند."
 
-#: views/editors/review.thtml:162
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "این گزینه باعث می‌شود یک نسخهٔ درون گودال ماسه‌یازی از ا�زودنی در گودال "
 "ماسه‌بازی باقی بماند."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "اگر دربارهٔ امنیت این ا�زودنی، مسائل مربوط به حق نسخه‌برداری آن، یا دیگر "
@@ -2743,15 +4690,15 @@ msgstr "دسته‌ها:"
 msgid "editors_review_header_compatibility"
 msgstr "سازگاری:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "شرح"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "توضیحات توسعه‌دهنده"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "توا�ق‌نامهٔ مجوز کاربر نهایی"
 
@@ -2759,85 +4706,108 @@ msgstr "توا�ق‌نامهٔ مجوز کاربر نهایی"
 msgid "editors_review_header_files"
 msgstr "پرونده‌ها:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "تاریخچهٔ مورد"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "پیام نامزد شدن ا�زودنی"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "پیش‌نمایش‌ها"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "بررسی %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "یادداشت برای بررسی‌کنندگان"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "خلاصه"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "یادداشت‌های نسخه"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "پاسخ"
+
+#: views/elements/developers/editors_review_history_item.thtml:78
+msgid "editors_review_history_info_request"
+msgstr "درخواست اطلاعات"
+
+#: views/elements/developers/editors_review_history_item.thtml:62
+#: views/editors/reviewlog.thtml:77
 msgid "editors_review_history_nominated_adminreview"
 msgstr "بررسی مدیر"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "با نامزدی ا�زودنی موا�قت شد، ا�زودنی عمومی گردید"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "با نامزدی ا�زودنی موا�قت نشد/ا�زودنی در گودال ماسه‌بازی باقی ماند"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "هیچ بررسی قبلی پیدا نشد."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "بررسی مدیر"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "تأیید شده/عمومی"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "تأیید نشده/گودال ماسه‌بازی"
 
-#: views/editors/review.thtml:198
+#. 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] "نمایش/پنهان‌سازی پاسخ"
+msgstr[1] "نمایش/پنهان‌سازی پاسخ‌ها (%1$s)"
+
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "برنامه‌ها:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "یا یک پاسخ از پیش آماده انتخاب کنید:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "نظرها:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "سیستم‌عامل‌ها:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "بالای ص�حه"
 
@@ -2845,7 +4815,7 @@ msgstr "بالای ص�حه"
 msgid "editors_review_next_link"
 msgstr "بعدی &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "یادداشت‌های نسخه"
 
@@ -2853,41 +4823,47 @@ msgstr "یادداشت‌های نسخه"
 msgid "editors_review_previous_link"
 msgstr "&laquo; قبلی"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 msgid "editors_review_rank_in_queue"
 msgstr "ا�زودنی <strong>%1$s</strong> از %2$s در این ص�"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "پردازش عمل"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "عمل"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "نظرها"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "نظرها"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "بررسی‌کننده"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "نسخه/پرونده"
 
-#: controllers/editors_controller.php:411
+#: views/editors/review.thtml:213
+msgid "editors_review_update_notify_once"
+msgstr ""
+"د�عهٔ بعدی که این ا�زودنی به‌هنگام می‌شود به من اطلاع داده شود. (به‌هنگام‌سازی‌های "
+"بعدی باعث ارسال مجدد نامهٔ الکترونیکی نخواهند شد)"
+
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "بررسی با مو�قیت پردازش گردید."
 
@@ -2911,7 +4887,7 @@ msgstr "عمل"
 msgid "editors_reviews_in_reply_to"
 msgstr "در پاسخ به:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "بررسی با مو�قیت پردازش گردید!"
 
@@ -2923,23 +4899,23 @@ msgstr "در حال حاضر هیچ بررسی در صÙ� تعدیل وجود Ù†Ø
 msgid "editors_reviews_submit_process_reviews"
 msgstr "پردازش بررسی‌ها"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "مخصوص یک وب‌گاه"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "جدید"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "به‌هنگام شده"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "برنامهٔ مورد آزمایش"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "سیستم‌عامل‌های مورد آزمایش"
 
@@ -2980,17 +4956,20 @@ msgstr "سکوهای نرم‌ا�زاری"
 msgid "editors_th_submissiontypes"
 msgstr "انواع ارسال"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s روز"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ساعت"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s دقیقه"
@@ -2999,8 +4978,8 @@ msgstr "%s دقیقه"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "دسترسی مجاز نیست"
 
@@ -3008,12 +4987,13 @@ msgstr "دسترسی مجاز نیست"
 msgid "error_access_denied_message"
 msgstr "شما مجاز به مشاهدهٔ این ص�حه نیستید."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3023,18 +5003,19 @@ msgstr "شما مجاز به مشاهدهٔ این ص�حه نیستید."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "ا�زودنی پیدا نشد!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "این ا�زودنی قابل مشاهده در اینجا نیست."
 
@@ -3042,7 +5023,7 @@ msgstr "این ا�زودنی قابل مشاهده در اینجا نیست."
 msgid "error_addon_selfreview"
 msgstr "بررسی ا�زودنی خودتان ممکن نیست."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "هیچ ا�زودنی در این دسته وجود ندارد!"
 
@@ -3064,24 +5045,25 @@ msgstr "این نشانی پست الکترونیکی معتبر نیست."
 msgid "error_field_required"
 msgstr "این �یلد نباید خالی باشد."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "پرونده پیدا نشد!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "خطای پرونده: %s وجود ندارد."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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 ""
@@ -3100,16 +5082,18 @@ 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3127,7 +5111,7 @@ msgstr "توجه"
 msgid "error_preview_notfound"
 msgstr "پیش‌نمایش پیدا نشد!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "باید یک رتبه انتخاب کنید."
 
@@ -3180,8 +5164,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "نام کاربری یا گذرواژهٔ اشتباه!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "نسخه پیدا نشد!"
 
@@ -3193,13 +5177,14 @@ msgstr "گذرواژهٔ اشتباه وارد شد!"
 msgid "feature_learnmore"
 msgstr "بیشتر بدانید"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "دربارهٔ %1$s بیشتر بدانید"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3211,6 +5196,40 @@ msgstr[1] "%1$s بررسی"
 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
+msgid "file_browser_link_addon"
+msgstr "بازگشت به ا�زودنی"
+
+#. 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 "باز کردن همه"
+
+#. 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 "بازگشت به بررسی"
+
+#. 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 :: مرورگر پرونده :: ا�زودنی‌های %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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "تمامی حقوق مح�وظ است."
@@ -3246,7 +5265,7 @@ msgstr "زبان‌های دیگر:"
 msgid "footer_privacy_policy"
 msgstr "سیاست محرمانگی"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "ارسال"
 
@@ -3254,7 +5273,7 @@ msgstr "ارسال"
 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:110
 msgid "general_addontype_dict_plural"
 msgstr "واژه‌نامه‌ها"
@@ -3263,7 +5282,7 @@ msgstr "واژه‌نامه‌ها"
 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:108
 msgid "general_addontype_extension_plural"
 msgstr "ضمیمه‌ها"
@@ -3272,7 +5291,7 @@ msgstr "ضمیمه‌ها"
 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "بسته‌های زبان (ا�زودنی)"
@@ -3281,7 +5300,7 @@ msgstr "بسته‌های زبان (ا�زودنی)"
 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "بسته‌های زبان (برنامه)"
@@ -3290,7 +5309,7 @@ msgstr "بسته‌های زبان (برنامه)"
 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "متصل‌شونده‌ها"
@@ -3299,7 +5318,7 @@ msgstr "متصل‌شونده‌ها"
 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:111
 msgid "general_addontype_search_plural"
 msgstr "موتورهای جستجو"
@@ -3308,11 +5327,12 @@ msgstr "موتورهای جستجو"
 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:109
 msgid "general_addontype_theme_plural"
 msgstr "تم‌ها"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3343,12 +5363,12 @@ msgid "header_navlink_addons"
 msgstr "ا�زودنی‌ها"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "خروج"
 
@@ -3356,39 +5376,43 @@ msgstr "خروج"
 msgid "header_navlink_myaccount"
 msgstr "حساب کاربری من"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "ثبت نام"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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/install.thtml:229
 msgid "install_a_login_to_install"
 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/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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3411,7 +5435,7 @@ msgid "langtools_download_langpack"
 msgstr "بارگیری بستهٔ زبان"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "واژه‌نامه‌ها و بسته‌های زبان"
 
@@ -3500,7 +5524,7 @@ msgstr "تم‌ها"
 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:214
 msgid "other_users"
 msgstr "دیگران"
@@ -3513,36 +5537,34 @@ msgstr "نسخه‌های برنامه"
 msgid "page_title_credits"
 msgstr "دست‌اندرکاران"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "ا�زودنی‌های آزمایشی"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
+msgstr "پرسش‌های متداول"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "پرسش‌های معمول «به نمایش گذاشتن �ایر�اکس خود»"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "سیاست ا�زودنی‌ها"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "سیاست محرمانگی موزیلا"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "رهنمون‌های بررسی"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "نظام بررسی گودال ماسه‌بازی"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "راهنمای ارسال"
 
@@ -3561,6 +5583,7 @@ msgstr ""
 "install.rdf با حداقل یکی از برنامه‌های پشتیبانی شدهٔ زیر باشند.  تنها نسخه‌هایی "
 "که در زیر ذکر شده‌اند برای این برنامه‌ها مجاز می‌باشند."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3568,6 +5591,8 @@ 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:92
 msgid "pages_appversions_required_files_link"
 msgstr "اینجا"
@@ -3576,7 +5601,6 @@ msgstr "اینجا"
 msgid "pages_appversions_versions"
 msgstr "نسخه‌ها"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "برگشتن به ص�حهٔ قبل"
 
@@ -3588,7 +5612,7 @@ 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"
@@ -3612,16 +5636,16 @@ 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>."
 
-# %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
 msgid "recaptcha_hardtoread_text"
 msgstr ""
@@ -3636,7 +5660,7 @@ msgstr "آیا شما یک انسان هستید؟"
 msgid "recaptcha_whatsthis"
 msgstr "این چیست؟"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "علامت‌گذاری این بررسی با خطا مواجه شد!"
 
@@ -3661,7 +5685,7 @@ msgid "review_flag_reason_spam"
 msgstr "هرزنوشته و مطلب نامربوط به بررسی"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "متشکریم؛ این بررسی برای تأیید ویرایش‌گران علامت خورد."
 
@@ -3675,7 +5699,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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3692,21 +5716,22 @@ msgstr ""
 "برای اطلاعات بیشتر از بررسی‌های ا�زودنی‌های کاربران، <a href=\"%2$s"
 "\">رهنمون‌های انجام بررسی</a> را مطالعه نمایید."
 
+#. %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 "بررسی‌های %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "ا�زودنی‌های پیشنهاد شده"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "جدیدترین ا�زودنی‌ها"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "ا�زودنی‌های به‌هنگام شده"
 
@@ -3743,6 +5768,7 @@ msgstr "همهٔ موتورهای جستجو"
 msgid "search_landing_browse_search_engines"
 msgstr "مرور موتورهای جستجو"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3762,12 +5788,13 @@ msgstr "جستجو در ا�زودنی‌ها"
 msgid "search_rss_description"
 msgstr "خورد نتیجهٔ جستجو"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "نتایج جستجو برای: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "جدیدترین ا�زودنی‌ها"
 
@@ -3775,7 +5802,7 @@ msgstr "جدیدترین ا�زودنی‌ها"
 msgid "sidebar_navlink_developer_tools"
 msgstr "ابزارهای توسعه‌دهنده"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "ابزارهای ویرایش‌گر"
 
@@ -3783,6 +5810,7 @@ msgstr "ابزارهای ویرایش‌گر"
 msgid "sidebar_navlink_welcome"
 msgstr "خوش آمدید"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3820,6 +5848,7 @@ msgstr "تم"
 msgid "sidebar_pitch_updated_addons"
 msgstr "ا�زودنی‌های به‌هنگام شده"
 
+#. %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
@@ -3831,7 +5860,7 @@ msgstr "%1$s کیلوبایت"
 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3849,24 +5878,32 @@ msgstr "جدیدترین ا�زودنی‌ها"
 msgid "statistics_addon_switch"
 msgstr "تغییر ا�زودنی"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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:147 views/statistics/addon.thtml:158
+#: 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 "%1$s ایجاد گردید"
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3908,10 +5945,9 @@ msgstr "ص�حهٔ آمار"
 msgid "statistics_index_view_button"
 msgstr "آمار مشاهده"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
-#, fuzzy
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
-msgstr "View this table in CSV format"
+msgstr "مشاهدهٔ این جدول در قالب CSV"
 
 #: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
@@ -3922,117 +5958,118 @@ msgid "statistics_js_dropdowns_removeplot"
 msgstr "حذ� این نمودار"
 
 #: controllers/statistics_controller.php:224
-#, fuzzy
 msgid "statistics_js_groupby_selector_date"
-msgstr "Group by: Day"
+msgstr "گروه‌بندی بر اساس: روز"
 
-#: controllers/statistics_controller.php:226
-#, fuzzy
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
-msgstr "Group by: Month"
+msgstr "گروه‌بندی بر اساس: ماه"
 
 #: controllers/statistics_controller.php:225
-#, fuzzy
 msgid "statistics_js_groupby_selector_week"
-msgstr "Group by: Week"
+msgstr "گروه‌بندی بر اساس: ه�ته"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "مقایسه بر اساس: ه�ته"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s مورد در این بازه پیدا شد"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "ا�زودن نمودار"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "ا�زودن نموداری دیگر به این شکل"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "پنهان کردن تعداد کل"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "نمایش تعداد کل"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "رسم تعداد کل این نمودار"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "مشاهدهٔ اطلاعات (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "دریا�ت یک پروندهٔ مقادیر جدا شده توسط ویرگول از این اطلاعات"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "پنهان کردن رویدادهای %s"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "تمایش رویدادهای %s"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "انداختن تاریخ‌های انتشار نسخه‌های ا�زودنی بر روی نمودار"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "پنهان کردن رویدادهای �ایر�اکس"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "نمایش رویدادهای �ایر�اکس"
 
-#: controllers/statistics_controller.php:241
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "انداختن تاریخ‌های انتشار �ایر�اکس بر روی نمودار"
 
-#: controllers/statistics_controller.php:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "جمع کردن شکل"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "بسط دادن شکل"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "تغییر اندازهٔ شکل"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "کاربران �عال روزانه"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "برنامه"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "س�ارشی"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "بارگیری‌ها"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "سیستم‌عامل"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "وضعیت ا�زودنی"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "خلاصه"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "نسخهٔ ا�زودنی"
 
@@ -4056,12 +6093,12 @@ msgstr "نامعلوم"
 msgid "statistics_longnames_version"
 msgstr "نسخهٔ ا�زودنی"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "هنوز اطلاعات کا�ی برای نمایش نمودار جمع‌آوری نشده است. لط�اً بعداً تلاش نمایید."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "ما هنوز از ا�زودنی شما اطلاعاتی نداریم.  لط�اً چند روز بعد مجدداً مراجعه "
@@ -4073,11 +6110,11 @@ msgstr ""
 "آمار ا�زودنی‌ها هم‌اکنون در حال به‌هنگام شدن است.  اطلاعات جدید ممکن است تا "
 "زمان انجام این به‌هنگام‌سازی ناقص باشد. لط�اً چند دقیقهٔ بعد دوباره تلاش نمایید."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "ص�حهٔ آمار در حال حاضر غیر �عال است.  لط�اً بعداً دوباره تلاش نمایید."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "جاوا اسکریپت برای مشاهدهٔ نمودارهای ص�حهٔ آمار مورد نیاز است."
 
@@ -4092,36 +6129,36 @@ msgstr "تنظیمات شما به‌هنگام شدند!"
 msgid "statistics_pagetitle"
 msgstr "ص�حهٔ آمار"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "کاربران �عال روزانه"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "بارگیری‌های روزانه"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "بزرگ‌نمایی"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "بزرگ‌نمایی روی یک ماه"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "کوچک‌نمایی"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "کوچک‌نمایی روی یک ماه"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "خلاصهٔ روزانهٔ آمار %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "خورد RSS از اطلاعات خلاصه"
 
@@ -4161,23 +6198,23 @@ msgstr "ص�حهٔ آمار"
 msgid "statistics_settings_access_public_description"
 msgstr "همه بتوانند آمار این ا�زودنی را مشاهده کنند"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "تغییر تنظیمات"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "لط�اً این اطلاعات را محرمانه تقلی کنید."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "این ص�حهٔ آمار در حال حاضر <b>خصوصی</b> است."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "این ص�حهٔ آمار در حال حاضر <b>عمومی</b> است."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "ق�ل شده"
 
@@ -4194,7 +6231,7 @@ msgstr "ذخیرهٔ تنظیمات"
 msgid "statistics_settings_title"
 msgstr "تنظیمات ص�حهٔ آمار %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "ق�ل نشده"
 
@@ -4218,7 +6255,7 @@ msgstr "نامعلوم"
 msgid "statistics_shortnames_version"
 msgstr "نسخه"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "بارگیری‌های متوسط روزانه"
 
@@ -4226,37 +6263,37 @@ msgstr "بارگیری‌های متوسط روزانه"
 msgid "statistics_summary_downloads_heading"
 msgstr "بارگیری‌ها"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "هیچ اطلاعاتی هنوز وجود ندارد"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s بر %2$s"
@@ -4265,17 +6302,17 @@ msgstr "%1$s بر %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "کاربران �عال روزانه"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: 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:147
+#: 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:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "آمار %1$s"
@@ -4300,7 +6337,7 @@ msgstr "تغییر گذرواژه"
 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:49
 msgid "user_del_account_deleted"
 msgstr ""
@@ -4319,7 +6356,7 @@ msgstr "تأیید گذرواژه"
 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:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4328,7 +6365,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:69
 msgid "user_del_error_addons_more_questions"
 msgstr "در صورتی که سؤال دیگری دارید، با %1$s تماس بگیرید."
@@ -4343,7 +6380,7 @@ msgstr ""
 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:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4355,7 +6392,7 @@ msgstr ""
 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:93
 msgid "user_del_header_delete_account"
 msgstr "حذ� حساب کاربری %1$s"
@@ -4380,7 +6417,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:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4396,7 +6433,7 @@ msgstr "متوجه هستم Ú©Ù‡ این عمل قابل بازگرداندن Ù†Û
 msgid "user_deleted_nickname"
 msgstr "کاربر حذ� شده"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4408,9 +6445,9 @@ msgstr ""
 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4431,7 +6468,7 @@ msgstr ""
 "از پیوستن شما به ا�زودنی‌های %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4455,8 +6492,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
 #, php-format
 msgid "user_email_pwreset"
@@ -4483,7 +6520,7 @@ msgstr "بازنشانی گذرواژهٔ ا�زودنی‌های %s"
 msgid "user_emailchange_error"
 msgstr "خطا!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4493,7 +6530,7 @@ msgstr "لط�اً تغییر نشانی پست الکترونیکی خود در
 msgid "user_emailchange_success"
 msgstr "مو�قیت!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4663,7 +6700,7 @@ msgstr "ارسال پیوند بازنشانی گذرواژه"
 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"
@@ -4672,7 +6709,7 @@ msgstr ""
 "گردید. پیش از آن که بتوانید وارد وب‌گاه ا�زودنی‌های %2$s شوید باید بر روی آن "
 "کلیک نمایید."
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4689,7 +6726,7 @@ msgstr "ارسال مجدد پیام تأیید"
 msgid "user_register_congratulations"
 msgstr "به شما تبریک می‌گوییم! حساب کاربری شما با مو�قیت ایجاد گردید."
 
-# %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"
@@ -4698,7 +6735,7 @@ msgstr ""
 "الکترونیکی شما آن را به عنوان «هرزنامه» برچسب نزده باشد. اگر نیاز دارید، "
 "می‌توانید از ما درخواست %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4758,7 +6795,7 @@ msgstr "نام مستعار"
 msgid "users_info_pagetitle"
 msgstr "اطلاعات کاربری %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "بررسی توسط %s"
@@ -4767,8 +6804,8 @@ msgstr "بررسی توسط %s"
 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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4777,8 +6814,8 @@ 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
+#. %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"
@@ -4794,3 +6831,30 @@ msgstr "بازنشانی گذرواژهٔ کاربر"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "ثبت نام کاربر جدید"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "search_form_submit"
+#~ msgstr "جستجو"
diff --git a/site/app/locale/fa/pages/experimental_addons.thtml b/site/app/locale/fa/pages/experimental_addons.thtml
deleted file mode 100644
index dd6707a..0000000
--- a/site/app/locale/fa/pages/experimental_addons.thtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<h1>ا�زودنی‌های آزمایشی</h1>
-
-
-<h2>ا�زودنی آزمایشی چیست؟</h2>
-
-<p>ا�زودنی‌های آزمایشی مخصوص کاربران پیشر�ته هستند تا بتوانند ا�زودنی‌ها را
-پیش از آن که برای است�ادهٔ عموم در دسترس قرار گیرند، آزمایش کنند. بسیاری ا�زودنی‌ها
-ممکن است در مرحلهٔ نمونه‌سازی باشند. ا�زودنی‌های آزمایشی ممکن است کی�یت، کارایی 
-و ویژگی‌های در سطح آل�ا، بتا و یا پیش از انتشار داشته باشند.</p>
-
-<p>در هنگام نصب ا�زودنی‌های آزمایشی باید مراقب باشید، زیرا این ا�زودنی‌ها
-توسط یک ویرایش‌گر آزمایش نشده‌اند و ممکن است به تنظیمات رایانهٔ شما صدمه بزنند.</p>
-
-
-<h2>چگونه ا�زودنی‌های آزمایشی را از سایر ا�زودنی‌های وب‌گاه تشخیص دهم؟</h2>
-
-<p>ا�زودنی‌های آزمایشی با یک برچسب «آزمایشی» مشخص می‌شوند و برای نصب آنها لازم
-است ابتدا وارد وب‌گاه شوید.</p>
-
-
-<h2>چرا برای نصب یک ا�زودنی آزمایشی لازم است وارد وب‌گاه شوم؟</h2>
-
-<p>وب‌گاه ا�زودنی‌ها از شما می‌خواهد پیش از نصب ا�زودنی‌های آزمایشی وارد وب‌گاه شوید
-تا به شما یادآوری کند که در حال انجامکار بالقوه خطرناکی هستید.</p>
-
-
-<h2>آیا برای نصب یک ا�زودنی عمومی نیاز به یک حساب کاربری و ورود به وب‌گاه دارم؟</h2>
-
-<p>خیر. وب‌گاه ا�زودنی‌ها برای نصب ا�زودنی‌های عمومی نیازی به داشتن یک حساب کاربری
-یا ورود به وب‌گاه ندارد.</p>
-
diff --git a/site/app/locale/fa/pages/faq.thtml b/site/app/locale/fa/pages/faq.thtml
new file mode 100644
index 0000000..d045d14
--- /dev/null
+++ b/site/app/locale/fa/pages/faq.thtml
@@ -0,0 +1,56 @@
+<h1>Frequently Asked Questions</h1>
+
+<p>This FAQ for the <a href="http://addons.mozilla.org">AMO site</a> addresses some topics not currently covered by the Firefox Support website. The Support website includes introductory information about <a href="http://support.mozilla.com/kb/Customizing+Firefox+with+add-ons">customizing Firefox with add-ons</a> as well as articles on:</p>
+
+<ul>
+    <li> Troubleshooting <a href="http://support.mozilla.com/kb/Unable+to+install+add-ons">add-on installation</a>, <a href="http://support.mozilla.com/kb/Troubleshooting+plugins">plugins</a> &amp; <a href="http://support.mozilla.com/kb/Troubleshooting+extensions+and+themes">general issues</a>.</li>
+    <li> <a href="http://support.mozilla.com/kb/Uninstalling+add-ons">How to uninstall add-ons</a> and <a href="http://support.mozilla.com/kb/Cannot+uninstall+an+add-on">troubleshooting uninstallation</a>.</li>
+    <li> <a href="http://support.mozilla.com/kb/Gray+bar+below+the+status+bar">Dealing with problematic add-ons / Gray Bar issue</a></li>
+</ul>
+
+<p></p>
+
+<h2>Add-on Questions</h2>
+<dl>
+<dt>What is an Add-on?</dt>
+<dd>Add-ons let you add features which aren't part of the standard application. Themes change appearance without changing functionality. Search Plugins and Dictionaries/Language Packs add additional search engines and language support. Extensions add more extensive features to the browser; some add simple toolbars while others can add a wide range of new features.</dd>
+
+<dt>Are add-ons easy to install?</dt>
+<dd>Yes! Add-ons are very easy to install. They're generally much smaller than a normal application and download very quickly. If you don't like one, they are just as easy to remove or disable. Also, if an update is available for one of your add-ons, Firefox will inform you and let you upgrade with one click.</dd>
+
+<dt>How do I manage an add-on?</dt>
+<dd>In Firefox, go to "Add-ons" in the Tools menu to manage Themes and Extensions. If your Extension has special options, you can see them in the Extensions section of the Add-ons window. From here, you can also disable and uninstall add-ons. Dictionaries are installed as Extensions. Search Plugins can be managed in the Search Bar.</dd>
+
+<dt>Can add-ons make Firefox slower?</dt>
+<dd>In most cases, add-ons do not cause a perceivable slowdown in Firefox. However, since they are applications some may affect the performance of Firefox depending on your system configuration. If you suspect that an add-on is affecting the way Firefox runs on your machine try disabling it.</dd>
+
+<dt>Why would I disable an add-on?</dt> 
+<dd>Disabling an add-on prevents it from loading when you start Firefox, but it doesn't remove the add-on or any of its settings. Enabling the add-on again will bring it back to where it was when you disabled it. For add-ons that you want to turn off without removing, disabling is the way to go.</dd>
+
+<dt>How do I backup all of the add-ons and themes that I've installed?</dt> 
+<dd>You can backup your profile directory which will also backup your add-ons and themes. A third party application like MozBackup can help you with this.</dd>
+</dl>
+
+<h2>Website questions</h2>
+<dl>
+<dt>I see several add-ons which provide the same capabilities. How do I decide which one is best?</dt> 
+<dd>In general, you can look at ratings and downloads which will give you an idea. Good add-ons tend to be downloaded more than bad ones. However, it's also easy to install both add-ons and decide which one you want to use. You may decide after trying them that you want to use both!</dd>
+
+<dt>I see a great add-on but it says that it's only compatible with Firefox 2.x. Can I still install it in Firefox 3.x?</dt> 
+<dd>In general, no. Firefox 3.x has a number of new features and a large majority of add-on developers have updated their add-ons to support 3.x. If the add-on only supports Firefox 2, try searching for that add-on's title. In many cases there will be a new version that supports Firefox 3 with the same or similar title.</dd>
+
+<dt>I installed a new theme but would like to revert back to the Firefox default theme. How do I do that?</dt> 
+<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 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.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>What are experimental add-ons?</dt> 
+<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>
+</dl>
diff --git a/site/app/locale/fi/LC_MESSAGES/messages.po b/site/app/locale/fi/LC_MESSAGES/messages.po
index dae9cb3..cc8990a 100644
--- a/site/app/locale/fi/LC_MESSAGES/messages.po
+++ b/site/app/locale/fi/LC_MESSAGES/messages.po
@@ -20,6 +20,10 @@ msgstr ""
 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 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
@@ -48,41 +52,37 @@ msgstr "Julkinen"
 msgid "a_header_sandbox"
 msgstr "Hiekkalaatikko"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, fuzzy, php-format
-msgid "added"
-msgstr "Added %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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
 #, fuzzy
 msgid "addon_detail_last_updated"
 msgstr "Updated %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versio %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 #, fuzzy
 msgid "addon_downloads_total"
 msgstr "total downloads"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
@@ -99,22 +99,22 @@ msgstr "yhdellä sivulla"
 msgid "addon_list_sortby"
 msgstr "Järjestys:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "suositeltu"
 
-# %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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s ei ole saatavilla alustalle %2$s."
 
-# %1 is the addon name
+#. %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
@@ -123,7 +123,7 @@ msgstr "%1$s ei ole saatavilla alustalle %2$s."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Palaa lisäosaan %1$s..."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -142,6 +142,7 @@ msgstr "Arvostelu:"
 msgid "addon_review_add_submit"
 msgstr "Lähetä arvostelu"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -175,23 +176,25 @@ msgstr "Kyllä"
 msgid "addon_review_delete_header"
 msgstr "Poista arvostelu"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Arvostelu poistettiin."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Muokkaa lisäosan %s arvostelua"
 
-# %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -202,7 +205,7 @@ msgstr ""
 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.
+#. %1 is the review count, %2 is the nickname or full name of the user.
 #: views/reviews/display.thtml:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
@@ -210,16 +213,16 @@ 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 addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Arvostelut lisäosasta %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -233,13 +236,13 @@ msgstr "Tekijän vastaus:"
 msgid "addon_review_saved_successfully"
 msgstr "Arvostelusi tallennettiin. Kiitos vaivannäöstä!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, php-format
@@ -265,12 +268,14 @@ msgstr "Previous Add-on"
 msgid "addon_version_permalink"
 msgstr "Permanent link to this version"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
+#. %1 is the current Application name (e.g. Firefox)
+#. %2 is the Application's version number
+#: views/addons/versions.thtml:118
 #, fuzzy
-msgid "addon_versions_getlatesttext"
-msgstr "The most recent version compatible with"
+msgid "addon_versions_getlatestversion"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 #, fuzzy
 msgid "addons_author_addons_submit"
 msgstr "Go"
@@ -280,20 +285,21 @@ msgstr "Go"
 msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
@@ -302,7 +308,7 @@ msgstr "Browse %1$s Themes :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "Kirjoita arvostelu"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Lisätietoja"
 
@@ -310,11 +316,11 @@ msgstr "Lisätietoja"
 msgid "addons_display_categories"
 msgstr "Luokat"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "yksityiskohtainen arvostelu"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "En pidä"
@@ -323,68 +329,72 @@ msgstr "En pidä"
 msgid "addons_display_edit_review"
 msgstr "Muokkaa arvosteluasi"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Lisäosalla on tietosuojakäytäntö"
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Tekijän kommentteja"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 #, fuzzy
 msgid "addons_display_header_homepage"
 msgstr "Homepage"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Arvostelut"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 #, fuzzy
 msgid "addons_display_header_support"
 msgstr "Support"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Pidän"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Pitkä kuvaus"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Lisää kuvia"
 
-# %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:421
+#. %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
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Muut lisäosat tekijältä %1$s"
 msgstr[1] "Other add-ons by these authors"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -396,7 +406,9 @@ 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:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -409,7 +421,8 @@ msgstr ""
 "ask for more details or let you know if the bug has been fixed in an "
 "upcoming version."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -421,16 +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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Pisteytä lisäosa"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 #, fuzzy
 msgid "addons_display_review_etiquette"
 msgstr ""
@@ -438,54 +451,54 @@ msgstr ""
 "available to add-on developers and they may need to contact you to help "
 "resolve your issue."
 
-# %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %1 is the support section link
+#: 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:379
+#: views/addons/display.thtml:403
 #, fuzzy
 msgid "addons_display_review_submit"
 msgstr "Save"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Näytä kaikki arvostelut (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Täydellinen versiohistoria"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Näytä lähdekoodi"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Näytä tilastotietoja"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Mitä mieltä olet?"
 
@@ -495,7 +508,7 @@ msgstr "Toimii seuraavilla ohjelmaversioilla:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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ä"
@@ -506,10 +519,11 @@ msgstr "Tekijänä"
 msgid "addons_home_feature_head"
 msgstr "Suosittelemme"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -526,7 +540,9 @@ msgstr "Newest:"
 msgid "addons_home_other_applications"
 msgstr "Muut ohjelmat"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -536,19 +552,20 @@ msgstr "Muut ohjelmat"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -648,6 +665,7 @@ msgstr "Mac OS X:lle"
 msgid "addons_plugins_for_windows"
 msgstr "Windowsille"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -668,12 +686,13 @@ msgstr ""
 "kuitenkin eri asia kuin laajennukset, jotka nekin lisäävät tai muuttavat "
 "selaimen toimintaa."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "keskeisimmät liitännäiset"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Liitännäiset"
 
@@ -684,6 +703,7 @@ msgstr "Liitännäiset"
 msgid "addons_plugins_support_documentation"
 msgstr "Ohjeita ongelmatilanteisiin: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -691,24 +711,24 @@ msgstr ""
 "Lisäosaa %s ei voi asentaa ennen kuin seuraava loppukäyttäjän lisenssi "
 "(EULA) hyväksytään:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Esikatselukuvat lisäosasta %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Suositeltuja lisäosia"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "suositeltuja lisäosia"
 
@@ -717,7 +737,7 @@ msgstr "suositeltuja lisäosia"
 msgid "addons_searchengines_additional_resources"
 msgstr "Additional Resources"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 #, fuzzy
 msgid "addons_searchengines_devmo_link"
@@ -736,38 +756,38 @@ msgstr ""
 "JavaScript-komentosarjoja. Salli JavaScriptin käyttö ennen kuin yrität "
 "asentaa hakukoneita."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %1 is "make your own" link
+#. %2 is MDC link
 #: 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: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: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: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:149 views/addons/searchengines.thtml:166
 #, fuzzy
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Hakukoneet"
 
@@ -783,7 +803,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Disabled"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 #, fuzzy
 msgid "addons_status_incomplete"
 msgstr "Incomplete Version"
@@ -828,11 +848,12 @@ msgstr ""
 "Nämä versiot ovat esillä vain testaus- ja referenssimielessä. On aina "
 "suositeltua käyttää lisäosan viimeisintä versiota."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Versiohistoria muutostietojen kera"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s versiohistoria"
@@ -845,6 +866,7 @@ msgstr "Lisää ryhmä"
 msgid "admin_group_delete_pagetitle"
 msgstr "Poista ryhmä"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -995,6 +1017,7 @@ msgstr "Ignore version check"
 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:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
@@ -1002,10 +1025,13 @@ 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: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:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
@@ -1018,27 +1044,27 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Päivitä Firefoxisi</a> asentaaksesi tämän "
 "lisäosan"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 #, fuzzy
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 #, fuzzy
 msgid "browse_addons_newest"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 #, fuzzy
 msgid "browse_addons_popular"
 msgstr "Popular Add-ons"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 #, fuzzy
 msgid "browse_addons_rated"
 msgstr "Add-ons by Rating"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 #, fuzzy
 msgid "browse_addons_updated"
 msgstr "Recently Updated Add-ons"
@@ -1071,7 +1097,7 @@ msgstr "Viimeisin päivitys ensin"
 msgid "category_extra_mostpopular"
 msgstr "Suosituin ensin"
 
-# %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"
@@ -1082,12 +1108,20 @@ msgstr "Näytä kaikki luokassa \"%1$s\""
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
+#. %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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 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:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
@@ -1127,6 +1161,8 @@ 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
 #: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
@@ -1155,6 +1191,10 @@ 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)
 #: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
@@ -1172,6 +1212,8 @@ msgstr ""
 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:69
 #, fuzzy
 msgid "compatibility_report_intro"
@@ -1185,6 +1227,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
@@ -1195,6 +1238,7 @@ 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
 #: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
@@ -1205,6 +1249,7 @@ 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
 #: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
@@ -1215,6 +1260,7 @@ 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
 #: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
@@ -1236,12 +1282,13 @@ msgstr "Information for Add-on Users"
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Lue lisätietoja avustamisesta %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wiki-sivultamme"
 
@@ -1285,26 +1332,35 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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"
 
-# date and time format string (strftime)
+#. 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.%m.%Y, %H.%M"
@@ -1330,14 +1386,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 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"
@@ -1385,36 +1469,36 @@ msgstr "5. kohta: onnellinen loppu"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Apua lisäosan lisäämiseen"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Lisäosan poisto käytöstä onnistui"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Muokkaa lisäosaa"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Lisäosan käyttöönotto onnistui"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Lisäosan kuvaus"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Lisäosan kotisivu"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Lisäosan nimi"
 
@@ -1423,40 +1507,298 @@ msgstr "Lisäosan nimi"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Esikatselun kuvateksti"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Tietosuojakäytäntö"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Lisäosan yhteenveto"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Tukisähköpostiosoite"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "Tukisivu"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Versiotietoja"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: 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:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Lisäosaa ehdotettiin julkiselle puolelle."
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1477,7 +1819,7 @@ msgstr ""
 "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
+#. %1 is the link to the sandbox information page
 #: views/developers/add_step5.thtml:63
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1487,7 +1829,7 @@ msgstr "Lue lisää %s."
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "hiekkalaatikon tarkastusjärjestelmästä"
 
-# %1 is the "nominate" link
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1510,16 +1852,16 @@ msgstr ""
 "Lisäosasi luokitellaan luotettavaksi ja se on automaattisesti hyväksytty ja "
 "lisätty sivuston julkiselle puolelle."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Lähetä lisäosa"
 
-#: controllers/developers_controller.php:2375
+#: controllers/developers_controller.php:2460
 msgid "devcp_addon_updated_successfully"
 msgstr "Lisäosa päivittiin"
 
-# %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"
@@ -1529,7 +1871,7 @@ msgstr "Kasvata lisäosasi käyttäjäkuntaa lisäämällä siitä sivulle %s."
 msgid "devcp_addon_upload_preview_link"
 msgstr "esikatselukuvia"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1558,10 +1900,102 @@ msgstr "Seuraava"
 msgid "devcp_change_addontype"
 msgstr "Muuta lisäosan tyyppiä:"
 
-#: controllers/developers_controller.php:1402
+#: 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"
+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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Lisää esikatselu"
@@ -1654,6 +2088,7 @@ msgstr "Tekijä ei ole kirjoittanut tukisivun osoitetta."
 msgid "devcp_details_trusted"
 msgstr "Luotettu"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1684,6 +2119,7 @@ msgstr ""
 "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"
@@ -1705,11 +2141,65 @@ msgstr ""
 "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"
+msgstr "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Lisää tekijä"
@@ -1722,10 +2212,297 @@ msgstr "Tekijän sähköpostiosoite"
 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:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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"
@@ -1792,6 +2569,206 @@ msgstr "Kohdelokaali"
 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: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 "Päivitä"
@@ -1802,11 +2779,66 @@ 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"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Näytteillä oleva lisäosa"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1815,7 +2847,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Suodatettu arvostelu"
 msgstr[1] "Suodatettuja arvosteluja (%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
 #, php-format
@@ -1824,7 +2856,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Ehdolle asetettu lisäosa (%s)"
 msgstr[1] "Ehdolle asetetut lisäosat (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1837,8 +2869,8 @@ msgstr[1] "Odottavat päivitystä (%s)"
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "Valitut tiedostot poistetaan."
 
-# %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"
@@ -1864,29 +2896,30 @@ msgstr "Huomautuksia tarkastajalle"
 msgid "devcp_editversion_submit_update"
 msgstr "Päivitä"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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 "
@@ -1895,19 +2928,33 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Lue %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 "referenssisivu"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, fuzzy, php-format
+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"
@@ -1915,7 +2962,7 @@ msgstr ""
 "Tiedostopääte (%s) ei ole kelvollinen valitun tyyppiselle lisäosalle. Oikea "
 "pääte on: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Kaikkien tiedostojen GUID:t eivät täsmää"
 
@@ -1944,6 +2991,8 @@ msgstr "Tiedostokoko ylittää suurimman sallitun koon"
 msgid "devcp_error_http_nofile"
 msgstr "Tiedostoa ei siirretty"
 
+#. %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"
@@ -1951,13 +3000,14 @@ msgstr ""
 "Tiedostopääte %s ei ole kelvollinen kuvakkeelle. Kuvakkeen tiedostopäätteen "
 "tulee olla jokin seuraavista: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Install.rdf-tiedostoa ei löytynyt."
 
@@ -1965,21 +3015,26 @@ msgstr "Install.rdf-tiedostoa ei löytynyt."
 msgid "devcp_error_install_manifest"
 msgstr "Seuraavat virheet havaittiin install.rdf:ssä:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Valitse kelvollinen lisäosatyyppi."
 
+#. %$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 "%s ei ole kelvollinen versionumero ohjelmalle %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "Lisäosan tunnus (GUID) on virheellinen: %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"
@@ -1999,6 +3054,7 @@ msgstr ""
 "Lisäosan versionumero on virheellinen. Versionumero ei voi sisältää "
 "välilyöntejä."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -2008,6 +3064,7 @@ msgstr "Seuraava virhe tapahtui jäsennettäessä tiedostoa install.rdf: %s"
 msgid "devcp_error_move_file"
 msgstr "Tiedostoa ei voitu siirtää"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -2031,16 +3088,16 @@ msgid "devcp_error_no_platform"
 msgstr "Alustaa ei valittu"
 
 #
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "Pyydetyt tiedot täytyy antaa asetettaessa lisäosaa ehdolle."
 
-#: controllers/developers_controller.php:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Voit asettaa ehdolle ainoastaan lisäosia, jotka ovat hiekkalaatikossa."
 
@@ -2052,6 +3109,8 @@ msgstr "Valitse ainakin yksi luokka."
 msgid "devcp_error_one_user"
 msgstr "Lisäosalle täytyy merkitä ainakin yksi tekijä."
 
+#. %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"
@@ -2059,13 +3118,13 @@ msgstr ""
 "Tiedostopääte %s ei ole kelvollinen esikatselukuvalle. Kuvan "
 "tiedostopäätteen tulee olla jokin seuraavista: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Sinulla ei ole oikeutta päivittää lisäosan tietoja."
 
@@ -2081,7 +3140,7 @@ 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Siirrä tiedosto."
@@ -2300,7 +3359,7 @@ msgstr "Lisäosani"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Lokalisoidut kentät"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2344,33 +3403,68 @@ msgstr "Lähetä lisäosa"
 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: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 "Palaa lisäosan tietoihin"
 
-# %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 "Ehdota lisäosaa %s"
 
-# %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 "Automaattisesti tunnistettu lisäosatyyppi: %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 ""
 "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)
+#. %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"
@@ -2386,9 +3480,14 @@ msgstr ""
 "Kuvan muuttaminen oletuskuvaksi muuttaa aikaisemman oletusesikatselukuvan "
 "normaaliksi kuvaksi."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2417,6 +3516,60 @@ msgstr "Muokkaa esikatselua"
 msgid "devcp_preview_updated_successfully"
 msgstr "Esikatselun päivittäminen onnistui"
 
+#: 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 ""
@@ -2428,10 +3581,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Lisää esikatselukuva"
 
+#: 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 "Muokkaa esikatselukuvaa"
 
+#: 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 "Esikatselutiedosto"
@@ -2440,6 +3603,34 @@ msgstr "Esikatselutiedosto"
 msgid "devcp_previews_label_makedefault"
 msgstr "Aseta kuva oletusesikatselukuvaksi"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Poista esikatselukuva"
@@ -2456,55 +3647,170 @@ msgstr "Muokkkaa esikatselukuvaa"
 msgid "devcp_previews_submit_upload"
 msgstr "Siirrä kuva"
 
+#: 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 "Virheellinen?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Poistetaanko tiedosto?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
 
+#: 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 "Ohita lisäosan tietojen tarkistaminen"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> päivittäin aktiivista käyttäjää"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> latausta yhteensä"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> latausta viikottain"
 
-#: controllers/developers_controller.php:1481
+#: 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 "Lisäosia ei juuri nyt voi lähettää. Kokeile myöhemmin uudestaan."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Hyväksyn"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "En hyväksy"
 
@@ -2520,11 +3826,11 @@ msgstr "Poistettu käytöstä"
 msgid "devcp_summary_header_trusted"
 msgstr "Luotettu"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Viimeisin versio:"
 
-# %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"
@@ -2534,7 +3840,7 @@ msgstr "Sinulla ei ole yhtään lisäosia. %s."
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "Lisää sellainen"
 
-# %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"
@@ -2544,30 +3850,674 @@ msgstr "%s teemastasi."
 msgid "devcp_theme_upload_preview_link"
 msgstr "Siirräthän esikatselukuvan"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Lue %s."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "lisätietoja"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Muokkaa versiota"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Versio päivitettiin."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Lisäosa on poistettu käytöstä"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Suodata"
@@ -2576,7 +4526,7 @@ msgstr "Suodata"
 msgid "editorcp_logs_filter_by"
 msgstr "Suodata tyypin ja toimen suhteen"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Tapahtumaloki"
 
@@ -2628,6 +4578,7 @@ msgstr "Piilota kommentit"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Näytä kommentit"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2637,7 +4588,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Tarkastusloki"
 
@@ -2661,24 +4612,24 @@ msgstr "Toimittajan viimeaikaiset toimet"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Tarkastuksia yhteensä"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Tarkasta lisäosa"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Täytä seuraavat kentät:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Valitse ainakin yksi tarkastettava tiedosto."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Omia lisäosiaan ei voi tarkastaa."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Kolmannen osapuolen ohjelma"
 
@@ -2690,39 +4641,39 @@ msgstr "Lisää ominaisuus"
 msgid "editors_featured_add_feature_submit"
 msgstr "Lisää"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Ominaisuuden poisto onnistui."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Näytteillä olevat lisäosat"
 
@@ -2754,39 +4705,40 @@ msgstr "Lisäosakäytäntö"
 msgid "editors_notice_filter_session"
 msgstr "Nämä suodattimet poistuvat istunnon loputtua tai kun ne poistetaan."
 
-# %1 is the queue mode
+#. %1 is the queue mode
 #: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 päivä"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 tunti"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minuutti"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Toimittajan ohjauspaneeli"
 
-#: controllers/editors_controller.php:286
+#. %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 "Vain %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Esijulkaisu"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2800,19 +4752,24 @@ msgstr "Tyhjennä"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Tarkastustoimi"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Siirrä julkiselle puolelle"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Pyydä Super-Review"
 
@@ -2820,33 +4777,41 @@ msgstr "Pyydä Super-Review"
 msgid "editors_review_action_sandbox"
 msgstr "Säilytä hiekkalaatikossa"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Tarkastuskommentit"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "Tämä valinta merkitsee lisäosan ja sen tiedostojen uusimmat versiot "
 "julkiseksi. Tulevat versiot jäävät odottomaan tarkastusta hiekkalaatikkoon."
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Tämä valinta jättää lisäosan hiekkalaatikkoon."
 
-#: views/editors/review.thtml:159
+#: 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:162
+#: 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:174
+#: 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-, "
@@ -2874,15 +4839,15 @@ msgstr "Luokat:"
 msgid "editors_review_header_compatibility"
 msgstr "Yhteensopivuus:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Kuvaus"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Kehittäjän kommentit"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2890,85 +4855,111 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Tiedostot:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Kohteen historia"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Viesti ehdolle asettamista"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Esikatselukuvat"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Tietosuojakäytäntö"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Tarkasta %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Kommentit tarkastajalle"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Yhteenveto"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Versiokommentit"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "Ylläpidon tarkastus"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Ehdotus hyväksytty/julkinen"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Ehdotus hylätty/hiekkalaatikko"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Aikaisempia tarkastusmerkintöjä ei löytynyt."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Ylläpidon tarkastus"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Hyväksytty/julkinen"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Hylätty/hiekkalaatikko"
 
-#: views/editors/review.thtml:198
+#. 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 "Ohjelmat:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "tai valitse evätty vastaus:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Kommentit:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Käyttöjärjestelmät:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Alkuun"
 
@@ -2977,7 +4968,7 @@ msgstr "Alkuun"
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Esikatselukuvia ei löytynyt."
 
@@ -2986,42 +4977,49 @@ msgstr "Esikatselukuvia ei löytynyt."
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %1 is the add-ons rank in the queue, %2 is the total queue length
 #: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Käsittele toiminnot"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Toiminto"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Kommentit"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Päiväys"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Arvostelija"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versio/tiedosto"
 
-#: controllers/editors_controller.php:411
+#: 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 "Arvostelu käsiteltiin."
 
@@ -3043,11 +5041,19 @@ msgstr "Ohita"
 msgid "editors_reviews_header_action"
 msgstr "Toiminto"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: views/editors/reviews_queue.thtml:67
 msgid "editors_reviews_in_reply_to"
 msgstr "Vastauksena kysymykseen:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Arvostelut käsiteltiin."
 
@@ -3059,23 +5065,23 @@ msgstr "Yhtäkään arvostelua ei ole tarkistettavana."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Käsittele arvostelut"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Sivustokohtainen"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Uusi"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Päivitetty"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Testattu ohjelma"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Testatut käyttöjärjestelmät"
 
@@ -3116,17 +5122,20 @@ msgstr "Alustat"
 msgid "editors_th_submissiontypes"
 msgstr "Lähetystyyppi"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s päivää"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s tuntia"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minuuttia"
@@ -3135,8 +5144,8 @@ msgstr "%s minuuttia"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Yhteys estetty"
 
@@ -3144,12 +5153,13 @@ msgstr "Yhteys estetty"
 msgid "error_access_denied_message"
 msgstr "Sinulla ei ole oikeutta avata sivua."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3159,18 +5169,19 @@ msgstr "Sinulla ei ole oikeutta avata sivua."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Lisäosaa ei löytynyt."
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Lisäosa ei ole esillä täällä."
 
@@ -3179,7 +5190,7 @@ msgstr "Lisäosa ei ole esillä täällä."
 msgid "error_addon_selfreview"
 msgstr "You cannot review your own add-on."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Tässä luokassa ei ole lisäosia."
 
@@ -3201,24 +5212,25 @@ msgstr "Tämä sähköpostiosoite on virheellinen."
 msgid "error_field_required"
 msgstr "Tämä kenttä ei voi olla tyhjä."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Tiedostoa ei löytynyt."
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Tiedostovirhe: %s ei ole olemassa."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3236,16 +5248,18 @@ msgstr ""
 "URL:n muoto on virheellinen. Oikean muotoiset URL:it ovat muotoa http://"
 "esimerkki.com/jokusivu."
 
+#. %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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3264,7 +5278,7 @@ msgstr "Huomautus"
 msgid "error_preview_notfound"
 msgstr "Esikatselukuvaa ei löytynyt."
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 #, fuzzy
 msgid "error_review_rating_required"
 msgstr "You must select a rating."
@@ -3317,8 +5331,8 @@ msgstr "Varmista käyttäjätilisi koodilla, jonka sait sähköpostitse."
 msgid "error_username_or_pw_wrong"
 msgstr "Virheellinen käyttäjätunnus tai salasana."
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versiota ei löytynyt."
 
@@ -3330,13 +5344,14 @@ msgstr "Virheellinen salasana."
 msgid "feature_learnmore"
 msgstr "Lue lisää"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Lue lisää lisäosasta %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3348,6 +5363,45 @@ msgstr[1] "arvostelua"
 msgid "feature_view_more_from_category"
 msgstr "Näytä lisää luokasta"
 
+#. 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Kaikki oikeudet pidätetään."
@@ -3383,7 +5437,7 @@ msgstr "Muut kielet:"
 msgid "footer_privacy_policy"
 msgstr "Tietosuojakäytäntö"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Tallenna"
 
@@ -3391,7 +5445,7 @@ msgstr "Tallenna"
 msgid "general_addontype_dict"
 msgstr "Oikolukusanasto"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Oikolukusanastot"
@@ -3400,7 +5454,7 @@ msgstr "Oikolukusanastot"
 msgid "general_addontype_extension"
 msgstr "Laajennus"
 
-# 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Laajennukset"
@@ -3409,7 +5463,7 @@ msgstr "Laajennukset"
 msgid "general_addontype_lpaddon"
 msgstr "Kielipaketti (lisäosan)"
 
-# 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Kielipaketit (lisäosan)"
@@ -3418,7 +5472,7 @@ msgstr "Kielipaketit (lisäosan)"
 msgid "general_addontype_lpapp"
 msgstr "Kielipaketti (ohjelman)"
 
-# 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Kielipaketit (ohjelman)"
@@ -3427,7 +5481,7 @@ msgstr "Kielipaketit (ohjelman)"
 msgid "general_addontype_plugin"
 msgstr "Liitännäinen"
 
-# 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Liitännäiset"
@@ -3436,7 +5490,7 @@ msgstr "Liitännäiset"
 msgid "general_addontype_search"
 msgstr "Hakukone"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Hakukoneet"
@@ -3445,11 +5499,12 @@ msgstr "Hakukoneet"
 msgid "general_addontype_theme"
 msgstr "Teema"
 
-# 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Teemat"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3480,12 +5535,12 @@ msgid "header_navlink_addons"
 msgstr "Lisäosat"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Kirjaudu ulos"
 
@@ -3493,36 +5548,41 @@ msgstr "Kirjaudu ulos"
 msgid "header_navlink_myaccount"
 msgstr "Tilini"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Rekisteröidy"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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
+#. %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 "<a href=\"%1$s\">Kirjaudu sisään</a> asentaaksesi lisäosan"
 
+#. %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 "Asenna %s %siin"
 
-# %1 is the add-on name, %2 is the app name
+#. %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 "Asenna lisäosa %1$s %2$siin"
 
+#. %1$s is the add-on name
 #: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3546,7 +5606,7 @@ msgid "langtools_download_langpack"
 msgstr "Lataa kielipaketti"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Oikolukusanastot ja kielipaketit"
 
@@ -3604,7 +5664,7 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3641,7 +5701,7 @@ msgstr "Themes"
 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:214
 msgid "other_users"
 msgstr "muut"
@@ -3656,42 +5716,41 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_experimental_addons"
 msgstr "Experimental Add-ons"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 #, fuzzy
 msgid "page_title_policy"
 msgstr "Add-ons Policy"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 #, fuzzy
 msgid "page_title_privacy"
 msgstr "Mozilla Privacy Policy"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 #, fuzzy
 msgid "page_title_review_guide"
 msgstr "Review Guidelines"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 #, fuzzy
 msgid "page_title_sandbox"
 msgstr "Sandbox Review System"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 #, fuzzy
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
@@ -3711,6 +5770,7 @@ msgstr ""
 "ja toimia ainakin yhdessä tuetuista ohjelmista. Vain alla luetellut versiot "
 "näistä ohjelmista on sallittu."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3718,6 +5778,8 @@ msgstr ""
 "Vaikka tukemasi sallittu ohjelma ei vaatisi install.rdf-tiedostoa, sellainen "
 "täytyy lisäosassa kuitenkin olla, kuten %s."
 
+#. 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 "on määritelty"
@@ -3726,7 +5788,6 @@ msgstr "on määritelty"
 msgid "pages_appversions_versions"
 msgstr "Versiot"
 
-#: views/pages/experimental_addons.thtml:56
 #, fuzzy
 msgid "pages_experimental_addons_backbutton"
 msgstr "Back to the previous page"
@@ -3739,7 +5800,7 @@ msgstr "Hiekkalaatikon tietosivu"
 msgid "pagination_next_page"
 msgstr "seuraava"
 
-# %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"
@@ -3766,8 +5827,8 @@ 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
+#. %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"
@@ -3775,8 +5836,8 @@ 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
+#. %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"
@@ -3794,7 +5855,7 @@ msgstr "Are you human?"
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 #, fuzzy
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
@@ -3825,7 +5886,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 #, fuzzy
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
@@ -3842,7 +5903,7 @@ 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
+#. %1 is the URL of the support section, %2 for the review guidelines
 #: views/reviews/add.thtml:48
 #, fuzzy
 msgid "review_guidelines_short"
@@ -3860,21 +5921,22 @@ msgstr ""
 "information.</li></ul><p>Please read the <a href=\"%2$s\">Review Guidelines</"
 "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: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:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Esiteltävät lisäsosat"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Uusimmat lisäosat"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 #, fuzzy
 msgid "rss_updatedaddons"
 msgstr "Updated Add-ons"
@@ -3915,6 +5977,7 @@ msgstr "Kaikki hakukoneet"
 msgid "search_landing_browse_search_engines"
 msgstr "Selaa hakukoneita"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3934,12 +5997,13 @@ msgstr "Etsi lisäosista"
 msgid "search_rss_description"
 msgstr "Syöte hakutuloksista"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Hakutulokset haulle: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Ylläpitäjien työkalut"
 
@@ -3947,7 +6011,7 @@ msgstr "Ylläpitäjien työkalut"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Kehittäjätyökalut"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Toimittajan työkalut"
 
@@ -3955,6 +6019,7 @@ msgstr "Toimittajan työkalut"
 msgid "sidebar_navlink_welcome"
 msgstr "Tervetuloa"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3996,6 +6061,7 @@ msgstr "Teema"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Add-ons"
 
+#. %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
@@ -4007,7 +6073,7 @@ msgstr "%1$s kt"
 msgid "stars_not_yet_rated"
 msgstr "Ei vielä pisteytetty"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -4025,24 +6091,32 @@ msgstr "Kehittäjän työkalut"
 msgid "statistics_addon_switch"
 msgstr "Vaihda lisäosaa"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "M. j"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "M. j, 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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -4084,7 +6158,7 @@ msgstr "Tilastosivu"
 msgid "statistics_index_view_button"
 msgstr "Näytä tilastoja"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
@@ -4102,7 +6176,7 @@ msgstr "Poista tämä tietosarja"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
@@ -4112,104 +6186,109 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s löydettiin rajauksella"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Lisää tietosarja"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Lisää tietosarja tähän kuvaajaan"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Piilota yhteyslukumäärä"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Näytä yhteyslukumäärä"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Näytä data (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Lataa tämä data pilkkueroteltuna tiedostona (CSV)"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Piilota %s tapahtumat"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "NÄytä %s tapahtumat"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Piilota Firefox-tapahtumat"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Näytä Firefox-tapahtumat"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Supista kuvaaja"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Laajenna kuvaaja"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Muuta kuvaajan kokoa"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Aktiiviset päivittäiskäyttäjät"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Ohjelma"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Oma"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Latauksia"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Käyttöjärjestelmä"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Lisäosan tila"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Yhteenveto"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Lisäosan versio"
 
@@ -4233,13 +6312,13 @@ msgstr "Tuntematon"
 msgid "statistics_longnames_version"
 msgstr "Lisäosan versio"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "Tähän kuvaajaan ei ole vielä kerätty riittävästi dataa. Yritä myöhemmin "
 "uudestaan."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "Emme vielä ole keränneet yhtään dataa lisäosastasi. Yritä muutaman päivän "
@@ -4253,12 +6332,12 @@ msgstr ""
 "may be incomplete as our scripts work to update this information. Please "
 "check back in a few minutes."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr ""
 "Tilastosivu on tällä hetkellä poissa käytöstä. Yritä myöhemmin uudestaan."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "Tilastosivun kuvaajat vaativat näkyäkseen JavaScriptin olevan päällä."
 
@@ -4273,36 +6352,36 @@ msgstr "Asetuksesi on päivitetty."
 msgid "statistics_pagetitle"
 msgstr "Tilastosivu"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Aktiivista päivittäiskäyttäjää"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Latausta päivässä"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Lähennä"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Lähennä yhteen kuukauteen"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Loitonna"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Loitonna yksi kuukausi"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Päivän tilastoyhteenveto lisäosalle %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "RSS-syöte yhteenvedosta"
 
@@ -4343,23 +6422,23 @@ msgstr "Julkinen"
 msgid "statistics_settings_access_public_description"
 msgstr "Kuka tahansa voi katsoa lisäosan tilastoja"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Muokkaa asetuksia"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Nämä tiedot ovat luottamuksellisia."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Tämä tilastosivu on asetettu <b>yksityiseksi</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Tämä tilastosivu on asetettu <b>julkiseksi</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Lukittu"
 
@@ -4376,7 +6455,7 @@ msgstr "Tallenna asetukset"
 msgid "statistics_settings_title"
 msgstr "Tilastosivuasetukset kohteelle %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Ei lukittu"
 
@@ -4400,7 +6479,7 @@ msgstr "Tunt"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Päivittäisiä latauksia keskimäärin"
 
@@ -4408,37 +6487,37 @@ msgstr "Päivittäisiä latauksia keskimäärin"
 msgid "statistics_summary_downloads_heading"
 msgstr "Latauksia"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Viimeisin tieto"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Latauksia viimeisen 7 päivän aikana"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Latauksia yhteensä"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "%1$s lähtien"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Ei dataa vielä"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: 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"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Muutos viimeisestä mittauksesta"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s, %2$s"
@@ -4447,17 +6526,17 @@ msgstr "%1$s, %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Aktiivisia käyttäjiä päivittäin"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Aktiivisia käyttäjiä päivittäin"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: 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:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Tilastoja lisäosasta %1$s"
@@ -4483,7 +6562,7 @@ msgstr "Muuta salasanaa"
 msgid "user_confirmationcode_resent"
 msgstr "Varmistuskoodi lähetettiin uudestaan."
 
-# %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:49
 #, fuzzy
 msgid "user_del_account_deleted"
@@ -4507,7 +6586,7 @@ msgstr "Confirm Password"
 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:62
 #, fuzzy
 msgid "user_del_error_addons"
@@ -4517,7 +6596,7 @@ msgstr ""
 "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:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
@@ -4535,7 +6614,7 @@ msgstr ""
 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:83
 #, fuzzy
 msgid "user_del_error_unknown"
@@ -4548,7 +6627,7 @@ msgstr ""
 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:93
 #, fuzzy
 msgid "user_del_header_delete_account"
@@ -4578,7 +6657,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
@@ -4597,7 +6676,7 @@ msgstr "I understand that this step cannot be undone."
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 #, fuzzy
 msgid "user_edit_confirm_email_sent"
@@ -4611,9 +6690,9 @@ msgstr ""
 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
+#. 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"
@@ -4632,7 +6711,7 @@ msgstr ""
 "Kiitos rekisteröitymisestä %2$sin lisäosat -sivustolle\n"
 "-- %2$sin lisäosat -sivuston ylläpito"
 
-# %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, fuzzy, php-format
@@ -4656,8 +6735,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Kiitokset rekisteröitymisestä %sin lisäosat -sivustolle"
 
-# 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
 #, php-format
 msgid "user_email_pwreset"
@@ -4686,7 +6765,7 @@ msgstr "Nollaa salasanasi %sin lisäosiin"
 msgid "user_emailchange_error"
 msgstr "Error!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, fuzzy, php-format
 msgid "user_emailchange_subject"
@@ -4697,7 +6776,7 @@ msgstr "Please confirm your email address change at %1$s Add-ons"
 msgid "user_emailchange_success"
 msgstr "Success!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, fuzzy, php-format
 msgid "user_emailchange_successful_description"
@@ -4875,7 +6954,7 @@ msgstr "Lähetä linkki salasanan nollaamiseen"
 msgid "user_register_amo_link"
 msgstr "%sin lisäosat"
 
-# %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"
@@ -4884,7 +6963,7 @@ msgstr ""
 "käyttäjätilisi. Linkkiä pitää napsauttaa ennen kuin voit seuraavan kerran "
 "kirjautua sivustolle."
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4901,7 +6980,7 @@ msgstr "lähettää vahvistusviestin uudelleen"
 msgid "user_register_congratulations"
 msgstr "Onneksi olkoon! Käyttäjätilisi luonti onnistui."
 
-# %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"
@@ -4910,7 +6989,7 @@ msgstr ""
 "merkinnyt sähköpostia roskapostiksi. Jos haluat, voimme %1$s samaan "
 "sähköpostiosoitteeseen."
 
-# %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4974,7 +7053,7 @@ msgstr "Lempinimi"
 msgid "users_info_pagetitle"
 msgstr "Käyttäjän %1$s tiedot"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
@@ -4984,8 +7063,8 @@ msgstr "Reviews by %s"
 msgid "users_login_pagetitle"
 msgstr "Sisäänkirjautuminen"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4994,8 +7073,8 @@ msgstr ""
 "jo rekisteröitynyt Mozilla lisäosiin, kirjaudu sisään tai lue lisää </a><a "
 "href=\"%1$s\">hiekkalaatikosta.</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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -5011,3 +7090,34 @@ msgstr "Käyttäjän salasanan nollaaminen"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Uuden käyttäjän rekisteröityminen"
+
+#, fuzzy
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "The most recent version compatible with"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "sidebar_navlink_tools"
+#~ msgstr "Tools"
diff --git a/site/app/locale/fr/LC_MESSAGES/messages.po b/site/app/locale/fr/LC_MESSAGES/messages.po
index 96fae55..75ea2e0 100644
--- a/site/app/locale/fr/LC_MESSAGES/messages.po
+++ b/site/app/locale/fr/LC_MESSAGES/messages.po
@@ -20,6 +20,10 @@ msgstr ""
 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 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
@@ -48,38 +52,34 @@ msgstr "Public"
 msgid "a_header_sandbox"
 msgstr "Bac à sable"
 
-#, php-format
-#: views/elements/collections_interactive_addon.thtml:85
-msgid "added"
-msgstr "Ajouté le %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Mis à jour le %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "Total des téléchargements"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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
+#. %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"
@@ -96,21 +96,22 @@ msgstr "par page"
 msgid "addon_list_sortby"
 msgstr "Trier par&nbsp;:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s n'est pas disponible pour %2$s"
 
-# %1 is the addon name
+#. %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
@@ -119,7 +120,7 @@ msgstr "%1$s n'est pas disponible pour %2$s"
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Retour à %1$s..."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -138,6 +139,7 @@ msgstr "Critique&nbsp;:"
 msgid "addon_review_add_submit"
 msgstr "Envoyer votre critique"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -171,23 +173,25 @@ msgstr "Oui"
 msgid "addon_review_delete_header"
 msgstr "Effacer la critique"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Critique effacée avec succès."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Éditer la critique de %s"
 
-# %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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ème lors du marquage de la critique&nbsp;: La longueur des commentaires "
 "des critiques marquées doit être de 10 à 100 caractères. Votre commentaire "
 "contenait %1$s caractères."
 
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -198,9 +202,9 @@ msgstr ""
 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.
-#, php-format
+#. %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] ""
@@ -208,16 +212,16 @@ msgstr[0] ""
 msgstr[1] ""
 "Afficher %1$s critiques précédemment envoyées par %2$s pour ce module"
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Critique de %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -231,14 +235,13 @@ msgstr "Réponse du développeur&nbsp;:"
 msgid "addon_review_saved_successfully"
 msgstr "Votre critique a bien été enregistrée. Merci&nbsp;!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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 (localized) date, y is the rating
-# erreur, %1 n'est pas une date mais une personne !
+#. %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
@@ -261,11 +264,13 @@ msgstr "Module précédent"
 msgid "addon_version_permalink"
 msgstr "Lien permanent vers cette version"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "La plus récente version compatible avec "
+#. %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 "La version la plus récente compatible avec %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Ok"
 
@@ -273,19 +278,20 @@ msgstr "Ok"
 msgid "addons_author_tooltip"
 msgstr "Afficher le profil de l'auteur"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "Parcourir tous les thèmes :: %1$s modules"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "parcourir %1$s thèmes :: %2$s modules"
 
@@ -293,7 +299,7 @@ msgstr "parcourir %1$s thèmes :: %2$s modules"
 msgid "addons_display_add_review"
 msgstr "Ajouter une critique"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Détails avancés"
 
@@ -301,11 +307,11 @@ msgstr "Détails avancés"
 msgid "addons_display_categories"
 msgstr "Catégories"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "critique détaillée"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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"
@@ -314,95 +320,102 @@ msgstr "Opinion négative"
 msgid "addons_display_edit_review"
 msgstr "Éditer votre critique"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Ce module est pourvu d'une politique de confidentialité spécifique."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Commentaires du développeur"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Page d'accueil"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Critiques"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Assistance"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Opinion positive"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Description détaillée"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Plus d'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.
-#: views/addons/display.thtml:421
+#. %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] "Autres modules de %1$s"
 msgstr[1] "Autres modules de ces auteurs"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
 "L'assistance pour cette extension est disponible auprès de son développeur "
 "ici&nbsp;: %s."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "L'assistance pour cette extension est disponible auprès de son développeur "
 "ici&nbsp;: %s ou bien par courriel à cette adresse&nbsp;: %s"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Votre évaluation"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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 "
@@ -410,51 +423,51 @@ msgstr ""
 "hors ceux-ci pourraient avoir besoin de vous contacter pour résoudre votre "
 "problème."
 
-# %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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
+#. %1 is the support section link
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
 #, php-format
-#: views/addons/display.thtml:396 views/addons/display.thtml:400
 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:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Enregistrer"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Voir toutes les critiques (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Historique complet des versions"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Afficher la source"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Voir les statistiques"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Qu'en pensez-vous&nbsp;?"
 
@@ -464,7 +477,7 @@ msgstr "Fonctionne avec&nbsp;"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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 "
@@ -475,10 +488,11 @@ msgstr "par "
 msgid "addons_home_feature_head"
 msgstr "Nous vous recommandons"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -493,7 +507,9 @@ msgstr "Ajouts récents"
 msgid "addons_home_other_applications"
 msgstr "Autres applications"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -503,19 +519,20 @@ msgstr "Autres applications"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -613,6 +630,7 @@ msgstr "pour Mac&nbsp;OS&nbsp;X"
 msgid "addons_plugins_for_windows"
 msgstr "pour Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -633,12 +651,13 @@ msgstr ""
 "multimédias. Les plugins diffèrent donc légèrement des extensions qui ont "
 "elles pour but la modification ou l'ajout de fonctionnalités."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugins courants pour %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
@@ -649,6 +668,7 @@ msgstr "Plugins"
 msgid "addons_plugins_support_documentation"
 msgstr "Documentation de support"
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -656,25 +676,25 @@ msgstr ""
 "%s implique l'acceptation du Contrat de Licence Utilisateur Final ci-dessous "
 "avant de procéder à l'installation"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Prévisualisations de %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Modules recommandés"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Modules recommandés"
 
@@ -682,6 +702,7 @@ msgstr "Modules recommandés"
 msgid "addons_searchengines_additional_resources"
 msgstr "Ressources supplémentaires"
 
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
@@ -700,36 +721,35 @@ msgstr ""
 "réactiver JavaScript avant d'essayer d'installer un des moteurs de recherche "
 "ci-dessous."
 
-# %1 is "make your own" link
-# %2 is MDC link
-#, php-format
+#. %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 "Apprenez à %1$s sur le site %2$s."
 
-# link path to search plugins instructions, relative to devmo
+#. 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 "/fr/docs/Cr%C3%A9ation_de_plugins_OpenSearch_pour_Firefox"
 
-# link text for "make your own" (opensearch engine)
+#. link text for "make your own" (opensearch engine)
 #: 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
-#, php-format
+#. %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 "Découvrez de nombreux autres moteurs de recherche sur le site %1$s"
 
-# link text to mycroft.mozdev.org
+#. 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"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Moteurs de recherche"
 
@@ -743,7 +763,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Désactivé"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Version incomplète"
 
@@ -782,11 +802,12 @@ msgstr ""
 "fortement conseillé d'utiliser la toute dernière version du module et non "
 "une ancienne version."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Historique des versions et modifications correspondantes"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Historique de version de %1$s"
@@ -799,6 +820,7 @@ msgstr "Ajouter un groupe"
 msgid "admin_group_delete_pagetitle"
 msgstr "Effacer un groupe"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -924,16 +946,20 @@ msgstr "Ignorer la vérification de version"
 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: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: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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -946,23 +972,23 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Mettez à jour votre Firefox</a> pour "
 "utiliser ce module"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Modules par nom"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Modules récents"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Modules populaires"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Modules selon leur évaluation"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Modules mis à jour récemment"
 
@@ -994,7 +1020,7 @@ msgstr "Les plus récemment mis à jour en premier"
 msgid "category_extra_mostpopular"
 msgstr "Les plus populaires en premier"
 
-# %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"
@@ -1004,11 +1030,19 @@ msgstr "%1$s, tout afficher"
 msgid "collection_not_found"
 msgstr "Collection introuvable&nbsp;!"
 
+#. %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"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
@@ -1041,6 +1075,8 @@ msgstr "Ajuster maxVersion sans renvoyer le fichier"
 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:130
 msgid "compatibility_developers_login_first"
 msgstr ""
@@ -1064,6 +1100,10 @@ msgstr "Vérification des résultats relatifs au statut des modules"
 msgid "compatibility_developers_retrieving"
 msgstr "Extraction du statut des modules hébergés..."
 
+#. %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 utilisateurs de %2$s (%3$s&#37; du total)"
@@ -1078,6 +1118,8 @@ msgstr ""
 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:69
 msgid "compatibility_report_intro"
 msgstr ""
@@ -1089,6 +1131,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Versions alphas"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Modules compatibles avec une version alpha de %1$s"
@@ -1097,6 +1140,7 @@ msgstr "Modules compatibles avec une version alpha de %1$s"
 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:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
@@ -1106,6 +1150,7 @@ msgstr ""
 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:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Modules acutualisé pour les dernières compilations de %1$s"
@@ -1114,6 +1159,7 @@ msgstr "Modules acutualisé pour les dernières compilations de %1$s"
 msgid "compatibility_report_legend_other"
 msgstr "Autres versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Modules non-compatibles avec une quelconque version de %1$s"
@@ -1131,14 +1177,15 @@ msgstr "Informations pour les utilisateurs du module"
 msgid "compatibility_view_report"
 msgstr "Afficher le rapport de compatibilité"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: 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:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "Page wiki"
 
@@ -1180,26 +1227,35 @@ msgstr ""
 "\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution "
 "2.5</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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)
+#. 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 "%x %X"
@@ -1225,14 +1281,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 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"
@@ -1281,36 +1365,36 @@ msgstr "Étape 5&nbsp;: succès"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Aide à la soumission"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Module désactivé avec succès"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Éditer le module"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Module activé avec succès"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Description du module"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "CLUF"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: 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:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Nom du module"
 
@@ -1319,40 +1403,298 @@ msgstr "Nom du module"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Vignette de prévisualisation"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Politique de confidentialité"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: 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:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Courriel d'assistance"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL d'assistance"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Notes de version"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Proposer le module"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Module proposé avec succès&nbsp;!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1376,7 +1718,7 @@ msgstr ""
 "serez averti par courriel lorsqu'une mesure concernant votre module aura été "
 "prise."
 
-# %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"
@@ -1388,7 +1730,7 @@ msgstr ""
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "ici"
 
-# %1 is the "nominate" link
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1411,16 +1753,16 @@ msgstr ""
 "Votre module étant considéré de confiance, cette version a été approuvée "
 "automatiquement pour la zone publique."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Soumettre un module"
 
-#: controllers/developers_controller.php:2375
+#: 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
+#. %1 is the link to the preview upload page
 #: views/developers/add_step5.thtml:71
 #, php-format
 msgid "devcp_addon_upload_preview"
@@ -1430,7 +1772,7 @@ msgstr "Vous désirez peut-être %s afin de promouvoir votre module."
 msgid "devcp_addon_upload_preview_link"
 msgstr "Envoyer une pré-version"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1459,10 +1801,102 @@ msgstr "Suivant"
 msgid "devcp_change_addontype"
 msgstr "Modifier le type de module&nbsp;:"
 
-#: controllers/developers_controller.php:1402
+#: 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"
+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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Ajouter une prévisualisation"
@@ -1555,6 +1989,7 @@ msgstr "Le développeur n'a pas fourni d'URL d'assistance."
 msgid "devcp_details_trusted"
 msgstr "De confiance"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1585,6 +2020,7 @@ msgstr ""
 "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"
@@ -1605,11 +2041,65 @@ msgstr ""
 "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"
+msgstr "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Ajouter l'auteur"
@@ -1622,10 +2112,297 @@ msgstr "Courriel de l'auteur"
 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:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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"
@@ -1692,6 +2469,206 @@ 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: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 "Mettre à jour"
@@ -1702,11 +2679,66 @@ 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"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Modules essentiels"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1715,7 +2747,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Une révision modérée"
 msgstr[1] "Révisions modérées (%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
 #, php-format
@@ -1724,7 +2756,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Un module nominé"
 msgstr[1] "Modules nominés (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1737,8 +2769,8 @@ msgstr[1] "Mises à jour en attente (%s)"
 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)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
 #: views/developers/editversion.thtml:58
 #, php-format
 msgid "devcp_editversion_filename_size"
@@ -1764,29 +2796,30 @@ msgstr "Notes au réviseur"
 msgid "devcp_editversion_submit_update"
 msgstr "Mettre à jour"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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 "
@@ -1795,20 +2828,34 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Veuillez consulter %s pour référence."
 
+#. 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 "cette page"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, fuzzy, php-format
+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"
@@ -1816,7 +2863,7 @@ 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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Les GUIDs de tous les fichiers ne correspondent pas"
 
@@ -1845,6 +2892,8 @@ msgstr "La taille de fichier à l'envoi dépasse la limite maximale."
 msgid "devcp_error_http_nofile"
 msgstr "Aucun fichier envoyé"
 
+#. %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"
@@ -1852,14 +2901,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:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "install.rdf manquant."
 
@@ -1867,21 +2917,26 @@ msgstr "install.rdf manquant."
 msgid "devcp_error_install_manifest"
 msgstr "Les erreurs suivantes ont été trouvées dans install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Veuillez sélectionner un type de module valide."
 
+#. %$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 "%s n'est pas une version valide pour %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "L'ID de ce module est invalide&nbsp;: %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"
@@ -1902,6 +2957,7 @@ msgstr ""
 "La version de ce module est invalide&nbsp;: les versions ne peuvent contenir "
 "d'espaces."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1913,6 +2969,7 @@ msgstr ""
 msgid "devcp_error_move_file"
 msgstr "Impossible de déplacer le fichier"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1935,15 +2992,15 @@ 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:2718
+#: 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:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr ""
 "Vous ne pouvez nominer que des modules actuellement dans le bac à sable."
@@ -1956,6 +3013,8 @@ msgstr "Veuillez sélectionner au moins une catégorie."
 msgid "devcp_error_one_user"
 msgstr "Il doit y avoir au moins un auteur mentionné pour ce module."
 
+#. %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"
@@ -1963,13 +3022,13 @@ 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:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Vous n'avez pas l'autorisation de mettre à jour ce module."
 
@@ -1985,7 +3044,7 @@ msgstr ""
 "Les modules ne peuvent utiliser un updateURL externe. Veuillez l'effacer de "
 "votre fichier install.rdf et réessayer."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Veuillez envoyer un fichier."
@@ -2207,7 +3266,7 @@ msgstr "Mes modules"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Champs localisés"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2251,33 +3310,68 @@ msgstr "Soumettre un module"
 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: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 "Revenir aux détails du module"
 
-# %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 "Nominer %s"
 
-# %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 "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: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 ""
 "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)
+#. %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"
@@ -2293,9 +3387,14 @@ msgstr ""
 "Choisir ceci comme prévisualisation par défaut supprimera le statut par "
 "défaut de la prévisualisation par défaut actuelle."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2324,6 +3423,60 @@ msgstr "Éditer la prévisualisation"
 msgid "devcp_preview_updated_successfully"
 msgstr "La prévisualisation a bien été mise à jour."
 
+#: 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 ""
@@ -2335,10 +3488,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Ajouter une prévisualisation"
 
+#: 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 "Éditer la prévisualisation"
 
+#: 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 "Prévisualiser le fichier"
@@ -2347,6 +3510,34 @@ msgstr "Prévisualiser le fichier"
 msgid "devcp_previews_label_makedefault"
 msgstr "Choisir comme image de prévisualisation par défaut"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Effacer la prévisualisation"
@@ -2363,45 +3554,160 @@ msgstr "Éditer la prévisualisation"
 msgid "devcp_previews_submit_upload"
 msgstr "Envoyer la prévisualisation"
 
+#: 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 "Incorrect&nbsp;?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Êtes-vous sûr de vouloir effacer ce fichier&nbsp;?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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 "
 "poursuivre."
 
+#: 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 "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:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> utilisateurs actifs par jour"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> téléchargements au total"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> téléchargements par semaine"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "Les soumissions de modules sont actuellement désactivées. Veuillez réessayer "
@@ -2409,13 +3715,13 @@ msgstr ""
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "J'accepte"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Je refuse"
 
@@ -2431,11 +3737,11 @@ msgstr "Désactivé"
 msgid "devcp_summary_header_trusted"
 msgstr "De confiance"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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 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"
@@ -2445,7 +3751,7 @@ msgstr "Vous n'avez pas de modules. Cliquez %s pour en soumettre un."
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "ici"
 
-# %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"
@@ -2455,30 +3761,667 @@ msgstr "Assurez-vous d'%s de votre thème."
 msgid "devcp_theme_upload_preview_link"
 msgstr "envoyer une prévisualisation"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Veuillez consulter %s pour référence."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "cette page"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Éditer la version"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Version mise à jour avec succès."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Ce module est désactivé."
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "Ce module n'a pas été nominé."
+
+#: controllers/components/editors.php:213
+msgid "editor_review_error_file_not_pending"
+msgstr "Ce fichier n'est oas en attente de critique."
+
+#. Actions are, for example: approving or rejecting
+#: controllers/components/editors.php:79
+#: controllers/components/editors.php:182
+msgid "editor_review_error_no_action"
+msgstr "Veuillez sélectioner une action de révision."
+
+#: controllers/components/editors.php:192
+msgid "editor_review_error_no_applications"
+msgstr "Veuillez indiquer les applications que vous avez testées."
+
+#. 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 "Veuillez associer un commentaire à vos critiques."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Ceuillez sélectionner au moins un fichier à critiquer."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "Veuillez indiquer les systèmes d'exploitations que vous avez testés."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filtrer"
@@ -2487,7 +4430,7 @@ msgstr "Filtrer"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtrer par type/action"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Journal des évènements"
 
@@ -2539,6 +4482,7 @@ msgstr "Cacher les commentaires"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Afficher les commentaires"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2548,7 +4492,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "journal des révisions"
 
@@ -2572,24 +4516,24 @@ msgstr "Activité récente de l'éditeur"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Ensemble des révisions"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Révision du module"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Veuillez remplir les champs suivants&nbsp;:"
 
-#: controllers/editors_controller.php:461
+#: 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:395
+#: 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:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Logiciel externe"
 
@@ -2601,39 +4545,39 @@ msgstr "Ajouter aux essentiels"
 msgid "editors_featured_add_feature_submit"
 msgstr "Ajouter"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: 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:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Modules essentiels"
 
@@ -2667,39 +4611,40 @@ 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
+#. %1 is the queue mode
 #: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 jour"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 heure"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minute"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: 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"
 
-#: controllers/editors_controller.php:286
+#. %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 "%s uniquement"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Pré-version"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2713,21 +4658,26 @@ msgstr "Nettoyer"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Action de révision"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Envoi sur le site public"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Demande de super-révision"
 
@@ -2735,34 +4685,42 @@ msgstr "Demande de super-révision"
 msgid "editors_review_action_sandbox"
 msgstr "Garder dans le bac à sable"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Commentaire de révision"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "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:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Ceci gardera le module dans le bac à sable."
 
-#: views/editors/review.thtml:159
+#: 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:162
+#: 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:174
+#: 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 "
@@ -2790,15 +4748,15 @@ msgstr "Catégories&nbsp;:"
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilité&nbsp;:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Description"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Commentaires du développeur"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "CLUF"
 
@@ -2806,85 +4764,111 @@ msgstr "CLUF"
 msgid "editors_review_header_files"
 msgstr "Fichiers&nbsp;:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Item de l'historique"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Message de nomination"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Prévisualisation"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Politique de confidentialité"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "révision de&nbsp: %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes au réviseur"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Résumé"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Notes de version"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "révision administrateur"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Nomination Approuvé/Public"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomination Refusé/Bac à sable"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Aucune révision antérieure trouvée."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "révision administrateur"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Approuvé/Public"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Refusé/Bac à sable"
 
-#: views/editors/review.thtml:198
+#. 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 "Applications&nbsp;:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "ou bien sélectionnez une réponse type&nbsp;:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Commentaires&nbsp;:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Systèmes d'exploitation&nbsp;:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Haut de page"
 
@@ -2892,7 +4876,7 @@ msgstr "Haut de page"
 msgid "editors_review_next_link"
 msgstr "suivant &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Aucune prévisualisation trouvée."
 
@@ -2900,41 +4884,47 @@ msgstr "Aucune prévisualisation trouvée."
 msgid "editors_review_previous_link"
 msgstr "&laquo; précédent"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %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> sur %2$s en attente"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Lancer l'action"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Action"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Commentaires"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Date"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Réviseur"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Version/Fichier"
 
-#: controllers/editors_controller.php:411
+#: 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:422
 msgid "editors_reviewed_successfully"
 msgstr "Révision traitée avec succès."
 
@@ -2950,6 +4940,14 @@ msgstr "Suprimer le marquage, garder la critique"
 msgid "editors_reviews_action_skip"
 msgstr "Passer"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: views/editors/reviews_queue.thtml:100
 msgid "editors_reviews_header_action"
 msgstr "Action"
@@ -2958,7 +4956,7 @@ msgstr "Action"
 msgid "editors_reviews_in_reply_to"
 msgstr "En réponse à&nbsp;:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Révisions traitées avec succès&nbsp;!"
 
@@ -2970,23 +4968,23 @@ 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:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Specifique à un site"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Nouveau"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Mis à jour"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Application testée"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Systèmes d'exploitation testés"
 
@@ -3027,17 +5025,20 @@ msgstr "Plateformes"
 msgid "editors_th_submissiontypes"
 msgstr "Types de soumissions"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s jours"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s heures"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutes"
@@ -3046,8 +5047,8 @@ msgstr "%s minutes"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Accès refusé"
 
@@ -3055,12 +5056,13 @@ msgstr "Accès refusé"
 msgid "error_access_denied_message"
 msgstr "Vous n'êtes pas autorisé à afficher cette page"
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3070,18 +5072,19 @@ msgstr "Vous n'êtes pas autorisé à afficher cette page"
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Module non trouvé&nbsp;!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Ce module n'est pas affichable ici."
 
@@ -3089,7 +5092,7 @@ 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:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Pas de module dans cette catégorie&nbsp;!"
 
@@ -3111,24 +5114,25 @@ msgstr "Cette adresse est invalide."
 msgid "error_field_required"
 msgstr "Ce champ doit être rempli."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Fichier introuvable&nbsp;!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Erreur fichier&nbsp;: %s n'existe pas."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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 ""
@@ -3147,16 +5151,18 @@ msgstr ""
 "Cette URL a un format non valide. Une URL valide ressemble à ceci&nbsp;: "
 "http://exemple.com/ma_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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3174,7 +5180,7 @@ msgstr "Avertissement"
 msgid "error_preview_notfound"
 msgstr "Prévisualisation introuvable&nbsp;!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Vous devez fournir une évaluation."
 
@@ -3226,8 +5232,8 @@ msgstr "Veuillez confirmer votre compte utilisateur."
 msgid "error_username_or_pw_wrong"
 msgstr "Identifiant ou mot de passe incorrect&nbsp!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Version introuvable&nbsp;!"
 
@@ -3239,13 +5245,14 @@ msgstr "Mot de passe erroné&nbsp;!"
 msgid "feature_learnmore"
 msgstr "En savoir plus"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "En savoir plus sur %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3257,6 +5264,40 @@ msgstr[1] "%1$s critiques"
 msgid "feature_view_more_from_category"
 msgstr "Afficher plus&nbsp;:"
 
+#. 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 "Retour au module"
+
+#. 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 "Tout afficher"
+
+#. 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 "Retour à la critique"
+
+#. 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 :: Navigateur de fichiers :: Module %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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Tous droits réservés."
@@ -3286,7 +5327,6 @@ msgstr "Ok !"
 msgid "footer_legal_notices"
 msgstr "Avertissement légal"
 
-# This is the lang code -- should be the same as the dir for this locale.
 #: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Autres langues&nbsp;:"
@@ -3295,7 +5335,7 @@ msgstr "Autres langues&nbsp;:"
 msgid "footer_privacy_policy"
 msgstr "Politique de confidentialité"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Enregistrer"
 
@@ -3303,7 +5343,7 @@ msgstr "Enregistrer"
 msgid "general_addontype_dict"
 msgstr "Dictionnaire"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Dictionnaires"
@@ -3312,7 +5352,7 @@ msgstr "Dictionnaires"
 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensions"
@@ -3321,7 +5361,7 @@ msgstr "Extensions"
 msgid "general_addontype_lpaddon"
 msgstr "Pack de langue (module)"
 
-# 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Packs de langues (module)"
@@ -3330,7 +5370,7 @@ msgstr "Packs de langues (module)"
 msgid "general_addontype_lpapp"
 msgstr "Pack de langue (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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Packs de langues (application)"
@@ -3339,7 +5379,7 @@ msgstr "Packs de langues (application)"
 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
@@ -3348,7 +5388,7 @@ msgstr "Plugins"
 msgid "general_addontype_search"
 msgstr "Moteur de recherche"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Moteurs de recherche"
@@ -3357,11 +5397,12 @@ msgstr "Moteurs de recherche"
 msgid "general_addontype_theme"
 msgstr "Thème"
 
-# 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Thèmes"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3392,12 +5433,12 @@ msgid "header_navlink_addons"
 msgstr "Modules"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Déconnexion"
 
@@ -3405,36 +5446,41 @@ msgstr "Déconnexion"
 msgid "header_navlink_myaccount"
 msgstr "Mon compte"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Inscription"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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
+#. %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 "<a href=\"%1$s\">Connectez-vous</a> pour installer ce module."
 
+#. %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 "Ajouter à %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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3457,7 +5503,7 @@ msgid "langtools_download_langpack"
 msgstr "Télécharger le paquetage linguistique"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dictionnaires et paquetages linguistiques"
 
@@ -3513,7 +5559,7 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3546,7 +5592,7 @@ msgstr "Thèmes"
 msgid "other_apps_tooltip"
 msgstr "Trouver des modules pour d'autres logiciels"
 
-# In a user list: user 1, user 2, "others"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "Autres"
@@ -3559,35 +5605,34 @@ msgstr "Versions des logiciels"
 msgid "page_title_credits"
 msgstr "Remerciements"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Modules expérimentaux"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
 msgstr "Foire Aux Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "FAQ de 'Fashion your Firefox'"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Polique de confidentialité du module"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Politique de confidentialité de Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Instructions pour les critiques"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Système de révision du bac à sable"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Aide à l'envoi"
 
@@ -3607,6 +5652,7 @@ msgstr ""
 "dessous. Seules les versions listées ci-dessous sont autorisées pour ces "
 "applications."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3615,6 +5661,8 @@ msgstr ""
 "vous devez tout de même inclure ce fichier avec les propriétés requises "
 "comme spécifié %s."
 
+#. 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 "ici"
@@ -3623,7 +5671,6 @@ msgstr "ici"
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Retour à la page précédente"
 
@@ -3635,7 +5682,7 @@ msgstr "Page d'information du bac à sable"
 msgid "pagination_next_page"
 msgstr "suivant"
 
-# %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"
@@ -3659,16 +5706,16 @@ msgstr "Tapez votre réponse ici&nbsp;:"
 msgid "recaptcha_enter_whatyouhear"
 msgstr "Veuillez taper ce que vous entendez."
 
-# %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 ""
 "Si c'est difficilement compréhensible, vous pouvez <a href=\"%1$s\">écouter "
 "autre chose </a> ou bien <a href=\"%2$s\">utiliser le test textuel</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
 msgid "recaptcha_hardtoread_text"
 msgstr ""
@@ -3683,7 +5730,7 @@ msgstr "Êtes-vous un être humain&nbsp;?"
 msgid "recaptcha_whatsthis"
 msgstr "Qu'est-ce que ceci&nsbp;?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Erreur lors du marquage de cette critique&nbsp;!"
 
@@ -3708,7 +5755,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam ou contenu qui n'est pas une critique du module"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr ""
 "Merci. Cette critique est maintenant en attente d'approbation par un "
@@ -3724,7 +5771,7 @@ msgstr ""
 "Cette critique est-elle inappropriée, inexacte ou du spam&nbsp;? Cliquez ici "
 "pour demander sa modération."
 
-# %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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3744,21 +5791,22 @@ msgstr ""
 "pour la critique</a> pour obtenir d'avantage de détails sur les critiques de "
 "modules.</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 "Critique de %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Modules essentiels"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Modules récemment ajoutés"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Modules mis à jour"
 
@@ -3795,6 +5843,7 @@ msgstr "Tous les moteurs de recherche"
 msgid "search_landing_browse_search_engines"
 msgstr "Naviguer dans les moteurs de recherche"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3814,12 +5863,13 @@ msgstr "Recherche de modules"
 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:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Résultat de la recherche pour&nbsp;: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Outils d'administration"
 
@@ -3827,7 +5877,7 @@ msgstr "Outils d'administration"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Outils de développement"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Outils d'édition"
 
@@ -3835,6 +5885,7 @@ msgstr "Outils d'édition"
 msgid "sidebar_navlink_welcome"
 msgstr "Bienvenue"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3872,6 +5923,7 @@ msgstr "Thème"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Modules mis à jour"
 
+#. %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
@@ -3883,7 +5935,7 @@ msgstr "%1$s Ko"
 msgid "stars_not_yet_rated"
 msgstr "Pas encore évalué"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3901,24 +5953,32 @@ msgstr "Outils de développement"
 msgid "statistics_addon_switch"
 msgstr "Changer de module"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "j M"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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:147 views/statistics/addon.thtml:158
+#: 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 "%1$s créé"
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3960,7 +6020,7 @@ msgstr "Tableau de bord des statistiques"
 msgid "statistics_index_view_button"
 msgstr "Voir les Statistiques"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Afficher ce tableau au format CSV"
 
@@ -3976,7 +6036,7 @@ msgstr "Retirer cette courbe"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Grouper par&nbsp;: jour"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Grouper par&nbsp;: mois"
 
@@ -3984,105 +6044,109 @@ msgstr "Grouper par&nbsp;: mois"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Grouper par&nbsp;: semaine"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Comparer par: semaine"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s trouvés sur cette tranche"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Ajouter une courbe"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Ajouter une autre courbe sur ce graphique"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Cacher le compte total"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Afficher le compte total"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Afficher les données (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Cacher %s évènements"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Afficher %s évènements"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Cacher les évènements Firefox"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Afficher les évènements Firefox"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Réduire le graphique"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Dévelopepr le graphique"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Redimensionner le graphique"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Utilisateurs actifs par jour"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personnalisé"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Téléchargements"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Système d'exploitation"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Statut du module"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Résumé"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Version du module"
 
@@ -4106,13 +6170,13 @@ msgstr "Inconnu"
 msgid "statistics_longnames_version"
 msgstr "Version du module"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "Il n'y a pas assez de données pour afficher le graphique. Revenez un peu "
 "plus tard."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "Nous ne disposons pas encore d'assez de données pour votre module. Revenez "
@@ -4125,13 +6189,13 @@ msgstr ""
 "récentes peuvent donc être incomplètes pendant cette opération. Revenez "
 "d'ici quelques minutes."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr ""
 "Le tableau de bord des statistiques est actuellement désactivé. Revenez un "
 "peu plus tard."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr ""
 "JavaScript est nécessaire pour afficher les graphiques du tableau de bord "
@@ -4148,36 +6212,36 @@ msgstr "Vos réglages ont été mis à jour&nbsp;!"
 msgid "statistics_pagetitle"
 msgstr "Tableau de bord des statistiques"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Utilisateurs actifs par jour"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Téléchargements par jour"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Zoomer"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Zoomer un mois"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Dézoomer"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Dézoomer un mois"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Résumé quotidien des statistiques pour %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Flux RSS du résumé des données"
 
@@ -4217,23 +6281,23 @@ msgstr "Public"
 msgid "statistics_settings_access_public_description"
 msgstr "Quiconque peut voir les statistiques de ce module"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Changer les réglages"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Veuillez considérer ces informations comme confidentielles."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Ce tableau de bord est actuellement <b>privé</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Ce tableau de bord est actuellement <b>public</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Verrouillé"
 
@@ -4250,7 +6314,7 @@ msgstr "Enregistrer les réglages"
 msgid "statistics_settings_title"
 msgstr "Réglages du tableau de bord des statistiques pour %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "déverrouillé"
 
@@ -4274,7 +6338,7 @@ msgstr "??"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Moyenne des téléchargements quotidiens"
 
@@ -4282,37 +6346,37 @@ msgstr "Moyenne des téléchargements quotidiens"
 msgid "statistics_summary_downloads_heading"
 msgstr "Téléchargements"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Dernier jour compté"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Téléchargements ces 7 derniers jours"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Téléchargements totaux"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Depuis %1$s"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Pas encore de données"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Moyenne des utilisateurs actifs par jour"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Changement depuis le comptage précédent"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s sur %2$s"
@@ -4321,17 +6385,17 @@ msgstr "%1$s sur %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Utilisateurs actifs par jour"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Utilisateurs actifs par jour"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Sur %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Statistiques %1$s"
@@ -4356,7 +6420,7 @@ msgstr "Changer le mot de passe"
 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
+#. %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 ""
@@ -4376,7 +6440,7 @@ msgstr "Confirmez le mot de passe"
 msgid "user_del_deletenow"
 msgstr "Effacer mon compte utilisateur maintenant"
 
-# %1 is the URL of the user's info page
+#. %1 is the URL of the user's info page
 #: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4386,7 +6450,7 @@ msgstr ""
 "auteurs de vos modules. Une fois ceci fait, vous pourrez effacer votre "
 "compte depuis cette page."
 
-# %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr ""
@@ -4404,7 +6468,7 @@ 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
+#. %1 is a link to the amo-admins mailing list
 #: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4416,7 +6480,7 @@ msgstr ""
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirmer la suppression du compte"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Supprimer le compte utilisateur %1$s"
@@ -4441,7 +6505,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4459,7 +6523,7 @@ msgstr ""
 msgid "user_deleted_nickname"
 msgstr "Utilisateur supprimé"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4472,9 +6536,9 @@ msgstr ""
 msgid "user_edit_delete_user"
 msgstr "Supprimer le compte utilisateur"
 
-# 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4495,10 +6559,10 @@ msgstr ""
 "-- \n"
 "L'équipe %2$s Add-ons"
 
-# %1 is the confirmation url, %2 is the application name
-#, php-format
+#. %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 ""
 "Vous avez demandé un changement de votre adresse électronique sur %2$s Add-"
@@ -4522,8 +6586,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Merci de vous être inscrit à Mozilla Add-ons"
 
-# This is the password reset email
-# %1 is the pw reset URL
+#. 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"
@@ -4552,9 +6616,9 @@ msgstr "Réinitialiser votre mot de passe AMO"
 msgid "user_emailchange_error"
 msgstr "Erreur&nbsp;!"
 
-# %1 is the application name
-#, php-format
+#. %1 is the application name
 #: 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"
@@ -4563,9 +6627,9 @@ msgstr ""
 msgid "user_emailchange_success"
 msgstr "Bravo&nbsp;!"
 
-# %1 is the new email address
-#, php-format
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Votre adresse électronique a bien été changée. À partir de maintenant, "
@@ -4735,6 +6799,7 @@ msgstr "Envoyer un lien pour réinitialiser le mot de passe"
 msgid "user_register_amo_link"
 msgstr "%s AMO"
 
+#. %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"
@@ -4743,6 +6808,7 @@ msgstr ""
 "à l'adresse %1$s. Vous devez cliquer sur ce lien avant de pouvoir vous "
 "connecter à Mozilla Add-ons."
 
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4759,7 +6825,7 @@ msgstr "envoyer à nouveau le message de confirmation"
 msgid "user_register_congratulations"
 msgstr "Félicitations&nbsp;! Votre compte utilisateur a bien été créé."
 
-# %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"
@@ -4769,7 +6835,7 @@ msgstr ""
 "courrier. Si nécessaire, nous pouvons %1$s à l'adresse de messagerie "
 "mentionnée ci-dessus."
 
-# %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4829,8 +6895,7 @@ msgstr "Pseudo"
 msgid "users_info_pagetitle"
 msgstr "Information sur %1$s"
 
-# %1 is the user's name
-#, php-format
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Critiques de %s"
@@ -4839,8 +6904,8 @@ msgstr "Critiques de %s"
 msgid "users_login_pagetitle"
 msgstr "Connexion utilisateur"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4849,8 +6914,8 @@ msgstr ""
 "avez déjà un compte Mozilla Add-ons, veuillez vous connecter, sinon, <a href="
 "\"%1$s\">consultez ces informations sur la zone de bac à sable.</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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4867,3 +6932,63 @@ msgstr "Mot de passe utilisateur réinitialisé"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Inscription d'un nouvel utilisateur"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "La plus récente version compatible avec "
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+# This contains the email sent to users when they signed up for a new
+# account:
+# %1 is the confirmation URL
+# %2 is the username
+# %3 is the password
+#~ msgid "user_email_confirm_account"
+#~ msgstr ""
+#~ "Bienvenue à Mozilla Add-ons.\n"
+#~ "\n"
+#~ "Avant de pouvoir utiliser votre nouveau compte, vous devez l'activer, "
+#~ "ceci assure que l'adresse de courrier utilisée est bien valide et vous "
+#~ "appartient.\n"
+#~ "Afin d'activer votre compte, cliquez sur le lien ci-dessous ou bien "
+#~ "copiez-collez ce lien dans la barre d'adresse de votre navigateur :\n"
+#~ "\n"
+#~ "%1$s\n"
+#~ "\n"
+#~ "Conservez ce message dans vos archives, les détails de votre compte "
+#~ "sont :\n"
+#~ "\n"
+#~ "Courriel :   %2$s\n"
+#~ "Mot de passe : %3$s\n"
+#~ "Merci de participer à Mozilla Addons\n"
+#~ "-- L'équipe de Mozilla Add-ons"
+<<<<<<< HEAD:site/app/locale/fr/LC_MESSAGES/messages.po
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+=======
+>>>>>>> merged w/ en_US and compiled.:site/app/locale/fr/LC_MESSAGES/messages.po
diff --git a/site/app/locale/fy_NL/LC_MESSAGES/messages.po b/site/app/locale/fy_NL/LC_MESSAGES/messages.po
index 7c5bdd4..e35c9b3 100644
--- a/site/app/locale/fy_NL/LC_MESSAGES/messages.po
+++ b/site/app/locale/fy_NL/LC_MESSAGES/messages.po
@@ -23,6 +23,10 @@ msgstr ""
 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. :(
 #: 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
@@ -55,42 +59,39 @@ msgstr "Public"
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, fuzzy, php-format
-msgid "added"
-msgstr "Added %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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
 #, fuzzy
 msgid "addon_detail_last_updated"
 msgstr "Updated %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, fuzzy, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 #, fuzzy
 msgid "addon_downloads_total"
 msgstr "total downloads"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, fuzzy, php-format
 msgid "addon_list_category_totalcount"
@@ -109,25 +110,27 @@ msgstr "per page"
 msgid "addon_list_sortby"
 msgstr "Sort by:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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: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: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
@@ -137,6 +140,7 @@ 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, fuzzy, php-format
@@ -158,6 +162,7 @@ msgstr "Review:"
 msgid "addon_review_add_submit"
 msgstr "Submit your review"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, fuzzy, php-format
 msgid "addon_review_add_title"
@@ -198,18 +203,20 @@ msgstr "Yes"
 msgid "addon_review_delete_header"
 msgstr "Delete Review"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 #, fuzzy
 msgid "addon_review_deleted_successfully"
 msgstr "Review deleted successfully."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, fuzzy, 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.
-#: controllers/reviews_controller.php:534
+#. %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 ""
@@ -217,6 +224,7 @@ msgstr ""
 "and 100 characters; your character length was %1$s."
 
 # Removing an extra comma
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 #, fuzzy
 msgid "addon_review_in_moderation"
@@ -230,6 +238,7 @@ 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:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
@@ -238,15 +247,17 @@ 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 addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, fuzzy, php-format
 msgid "addon_review_pagetitle"
 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:164
 #, fuzzy, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -262,13 +273,14 @@ msgstr "Developer Reply:"
 msgid "addon_review_saved_successfully"
 msgstr "Your review was saved successfully. Thanks!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, fuzzy, php-format
@@ -294,12 +306,16 @@ msgstr "Previous Add-on"
 msgid "addon_version_permalink"
 msgstr "Permanent link to this version"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
+# %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:118
 #, fuzzy
-msgid "addon_versions_getlatesttext"
-msgstr "The most recent version compatible with"
+msgid "addon_versions_getlatestversion"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 #, fuzzy
 msgid "addons_author_addons_submit"
 msgstr "Go"
@@ -310,19 +326,23 @@ msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
 # %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
@@ -332,7 +352,7 @@ msgstr "Browse %1$s Themes :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "Add a review"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 #, fuzzy
 msgid "addons_display_advanced_details"
 msgstr "Advanced Details"
@@ -342,12 +362,12 @@ msgstr "Advanced Details"
 msgid "addons_display_categories"
 msgstr "Categories"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 #, fuzzy
 msgid "addons_display_detailed_review"
 msgstr "detailed review"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 #, fuzzy
 msgid "addons_display_dont_like_it"
@@ -358,55 +378,55 @@ msgstr "Don't like it"
 msgid "addons_display_edit_review"
 msgstr "Edit your review"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 #, fuzzy
 msgid "addons_display_has_privacy"
 msgstr "This add-on has a privacy policy."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 #, fuzzy
 msgid "addons_display_header_developer_comments"
 msgstr "Developer Comments"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 #, fuzzy
 msgid "addons_display_header_homepage"
 msgstr "Homepage"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 #, fuzzy
 msgid "addons_display_header_reviews"
 msgstr "Reviews"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 #, fuzzy
 msgid "addons_display_header_support"
 msgstr "Support"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 #, fuzzy
 msgid "addons_display_like_it"
 msgstr "Like it"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 #, fuzzy
 msgid "addons_display_long_description"
 msgstr "Long Description"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 #, fuzzy
 msgid "addons_display_more_images"
 msgstr "More Images"
@@ -414,48 +434,58 @@ 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.
-#: views/addons/display.thtml:421
+#. %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
 #, fuzzy
 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"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, fuzzy, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: 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"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "Support for this add-on is provided by the developer at %s or by sending an "
 "e-mail to %s"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 #, fuzzy
 msgid "addons_display_rate_it"
 msgstr "Rate It"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 #, fuzzy
 msgid "addons_display_review_etiquette"
 msgstr ""
@@ -464,56 +494,59 @@ msgstr ""
 "resolve your issue."
 
 # %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %1 is the support section link
+#: 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:379
+#: views/addons/display.thtml:403
 #, fuzzy
 msgid "addons_display_review_submit"
 msgstr "Save"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, fuzzy, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "See all reviews (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 #, fuzzy
 msgid "addons_display_version_history"
 msgstr "Complete Version History"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 #, fuzzy
 msgid "addons_display_view_source"
 msgstr "View the source"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 #, fuzzy
 msgid "addons_display_view_stats"
 msgstr "View statistics"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 #, fuzzy
 msgid "addons_display_what_do_you_think"
 msgstr "What do you think?"
@@ -525,7 +558,7 @@ msgstr "Works with:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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"
@@ -538,10 +571,11 @@ msgstr "by"
 msgid "addons_home_feature_head"
 msgstr "We Recommend"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, fuzzy, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -558,7 +592,9 @@ msgstr "Newest:"
 msgid "addons_home_other_applications"
 msgstr "Other Applications"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -568,19 +604,20 @@ msgstr "Other Applications"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -692,6 +729,7 @@ msgstr "for Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "for Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, fuzzy, php-format
 msgid "addons_plugins_looking_for_more"
@@ -713,12 +751,13 @@ msgstr ""
 "graphic formats or playing multimedia files. Plugins are slightly different "
 "from extensions, which modify or add to existing functionality."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, fuzzy, php-format
 msgid "addons_plugins_main_header"
 msgstr "Common Plugins for %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 #, fuzzy
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
@@ -731,6 +770,7 @@ msgstr "Plugins"
 msgid "addons_plugins_support_documentation"
 msgstr "Support Documentation: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, fuzzy, php-format
 msgid "addons_policy_eula_require"
@@ -739,25 +779,26 @@ msgstr ""
 "installation can proceed:"
 
 # %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, fuzzy, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Previews for %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 #, 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 #, fuzzy
 msgid "addons_recommended_pagetitle"
 msgstr "Recommended Add-ons"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 #, fuzzy
 msgid "addons_recommended_title"
 msgstr "Recommended Add-ons"
@@ -768,6 +809,7 @@ msgid "addons_searchengines_additional_resources"
 msgstr "Additional Resources"
 
 # link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 #, fuzzy
 msgid "addons_searchengines_devmo_link"
@@ -790,36 +832,42 @@ msgstr ""
 
 # %1 is "make your own" link
 # %2 is MDC link
+#. %1 is "make your own" link
+#. %2 is MDC link
 #: 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: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: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: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:149 views/addons/searchengines.thtml:166
 #, fuzzy
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 #, fuzzy
 msgid "addons_searchengines_pagetitle"
 msgstr "Search Engines"
@@ -836,7 +884,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Disabled"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 #, fuzzy
 msgid "addons_status_incomplete"
 msgstr "Incomplete Version"
@@ -883,12 +931,13 @@ msgstr ""
 "These versions are displayed for reference and testing purposes. You should "
 "always use the latest version of an add-on."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 #, fuzzy
 msgid "addons_versions_history"
 msgstr "Version History with Changelogs"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, fuzzy, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s Version History"
@@ -903,6 +952,7 @@ msgstr "Add Group"
 msgid "admin_group_delete_pagetitle"
 msgstr "Delete Group"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, fuzzy, php-format
 msgid "admin_group_deleted"
@@ -1058,6 +1108,7 @@ 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
 #: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
@@ -1065,11 +1116,14 @@ 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: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:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
@@ -1082,27 +1136,27 @@ msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Upgrade Firefox</a> to use this add-on"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 #, fuzzy
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 #, fuzzy
 msgid "browse_addons_newest"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 #, fuzzy
 msgid "browse_addons_popular"
 msgstr "Popular Add-ons"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 #, fuzzy
 msgid "browse_addons_rated"
 msgstr "Add-ons by Rating"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 #, fuzzy
 msgid "browse_addons_updated"
 msgstr "Recently Updated Add-ons"
@@ -1143,6 +1197,7 @@ msgid "category_extra_mostpopular"
 msgstr "Most Popular First"
 
 # %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"
@@ -1153,12 +1208,20 @@ msgstr "See All %1$s"
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
+#. %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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 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:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
@@ -1198,6 +1261,8 @@ 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
 #: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
@@ -1226,6 +1291,10 @@ 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)
 #: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
@@ -1243,6 +1312,8 @@ msgstr ""
 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:69
 #, fuzzy
 msgid "compatibility_report_intro"
@@ -1256,6 +1327,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
@@ -1266,6 +1338,7 @@ 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
 #: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
@@ -1276,6 +1349,7 @@ 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
 #: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
@@ -1286,6 +1360,7 @@ 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
 #: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
@@ -1307,12 +1382,13 @@ msgstr "Information for Add-on Users"
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, fuzzy, php-format
 msgid "credits_contributing"
 msgstr "For information on contributing, please see our %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 #, fuzzy
 msgid "credits_contributing_wikipage"
 msgstr "wiki page"
@@ -1363,18 +1439,27 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
+#: 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>."
+
 # 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/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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
@@ -1383,7 +1468,10 @@ msgid "date"
 msgstr "%B %e, %Y"
 
 # date and time format string (strftime)
+#. 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
 #, fuzzy
 msgid "datetime"
@@ -1413,16 +1501,44 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 #, fuzzy
 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"
+#: 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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 #, fuzzy
 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"
@@ -1479,42 +1595,42 @@ msgstr "Step 5: Success"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Submission Help"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 #, fuzzy
 msgid "devcp_addon_disabled_successfully"
 msgstr "Add-on disabled successfully"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 #, fuzzy
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Edit Add-on"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 #, fuzzy
 msgid "devcp_addon_enabled_successfully"
 msgstr "Add-on enabled successfully"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: 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:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 #, fuzzy
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: 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:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 #, fuzzy
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Add-on Name"
@@ -1525,47 +1641,307 @@ msgstr "Add-on Name"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Preview Caption"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 #, fuzzy
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Privacy Policy"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: 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:2455
+#: controllers/developers_controller.php:2540
 #, fuzzy
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Support Email"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 #, fuzzy
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "Support URL"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 #, fuzzy
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Version Notes"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 #, fuzzy
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Nominate Add-on"
 
-#: controllers/developers_controller.php:2729
+#: 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: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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1592,6 +1968,7 @@ msgstr ""
 "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"
@@ -1603,6 +1980,7 @@ 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"
@@ -1628,18 +2006,19 @@ msgstr ""
 "Because your add-on is trusted, this version has automatically been approved "
 "for the public area."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 #, fuzzy
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Submit Add-on"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1651,6 +2030,7 @@ 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"
@@ -1684,11 +2064,103 @@ msgstr "Next"
 msgid "devcp_change_addontype"
 msgstr "Change add-on type:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 #, fuzzy
 msgid "devcp_comments_updated"
 msgstr "Developer Comments updated."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 #, fuzzy
 msgid "devcp_details_addpreview_link"
@@ -1804,6 +2276,7 @@ msgstr "No support url provided by developer."
 msgid "devcp_details_trusted"
 msgstr "Trusted"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, fuzzy, php-format
 msgid "devcp_details_version"
@@ -1838,6 +2311,7 @@ msgstr ""
 "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"
@@ -1861,11 +2335,65 @@ msgstr ""
 "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"
+msgstr "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 #, fuzzy
 msgid "devcp_edit_author_add"
@@ -1881,11 +2409,298 @@ msgstr "Author's Email Address"
 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:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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"
@@ -1966,6 +2781,206 @@ msgstr "Target Locale"
 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: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
 #, fuzzy
 msgid "devcp_edit_submit_update"
@@ -1978,12 +2993,68 @@ 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"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 #, fuzzy
 msgid "devcp_editorsqueue_featured"
 msgstr "Featured Add-ons"
 
 # %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, fuzzy, php-format
@@ -1993,6 +3064,7 @@ msgstr[0] "Moderated Reviews (%s)"
 msgstr[1] "Moderated Reviews (%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
 #, fuzzy, php-format
@@ -2002,6 +3074,7 @@ msgstr[0] "Nominated Add-ons (%s)"
 msgstr[1] "Nominated Add-ons (%s)"
 
 # %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, fuzzy, php-format
@@ -2017,6 +3090,8 @@ 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"
@@ -2047,14 +3122,14 @@ msgstr "Notes to Reviewer"
 msgid "devcp_editversion_submit_update"
 msgstr "Update"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
@@ -2062,16 +3137,17 @@ msgstr "Update"
 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: controllers/developers_controller.php:1992
 #, fuzzy
 msgid "devcp_error_addonname_not_unique"
 msgstr ""
@@ -2080,21 +3156,35 @@ msgstr ""
 "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
 #, fuzzy, 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.
 #: controllers/components/developers.php:591
 #, fuzzy
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "this page"
 
-#: controllers/developers_controller.php:2013
+#: controllers/developers_controller.php:2098
 #, fuzzy
 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
+#, fuzzy, php-format
+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
 #, fuzzy, php-format
 msgid "devcp_error_file_extension"
@@ -2102,7 +3192,7 @@ 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:1654
+#: controllers/developers_controller.php:1739
 #, fuzzy
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Not all file GUIDs match"
@@ -2137,6 +3227,8 @@ 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
 #: controllers/components/developers.php:401
 #, fuzzy, php-format
 msgid "devcp_error_icon_extension"
@@ -2144,13 +3236,14 @@ msgstr ""
 "That file extension (%s) is not allowed for an icon. Please use one of the "
 "following: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 #, fuzzy
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No install.rdf present."
@@ -2160,22 +3253,27 @@ msgstr "No install.rdf present."
 msgid "devcp_error_install_manifest"
 msgstr "The following errors were found in install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 #, fuzzy
 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.
 #: controllers/components/developers.php:569
 #: controllers/components/developers.php:581
 #, fuzzy, php-format
 msgid "devcp_error_invalid_appversion"
 msgstr "%s is not a valid version for %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, fuzzy, 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.
 #: controllers/components/developers.php:572
 #, fuzzy, php-format
 msgid "devcp_error_invalid_minversion"
@@ -2193,6 +3291,7 @@ msgstr ""
 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.
 #: controllers/components/developers.php:501
 #, fuzzy, php-format
 msgid "devcp_error_manifest_parse"
@@ -2203,6 +3302,7 @@ 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
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -2228,17 +3328,17 @@ 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:2718
+#: controllers/developers_controller.php:2803
 #, fuzzy
 msgid "devcp_error_nominate_message"
 msgstr "You must supply the requested details for nomination."
 
-#: controllers/developers_controller.php:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 #, fuzzy
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "You can only nominate add-ons currently in the sandbox."
@@ -2253,6 +3353,8 @@ 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
 #: controllers/components/developers.php:1081
 #, fuzzy, php-format
 msgid "devcp_error_preview_extension"
@@ -2260,14 +3362,14 @@ msgstr ""
 "That file extension (%s) is not allowed for a preview. Please use one of the "
 "following: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 #, fuzzy
 msgid "devcp_error_update_access_denied"
 msgstr "You do not have permission to update this add-on."
@@ -2286,7 +3388,7 @@ msgstr ""
 "Add-ons cannot use an external updateURL. Please remove this from install."
 "rdf and try again."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 #, fuzzy
 msgid "devcp_error_upload_file"
@@ -2561,6 +3663,7 @@ msgid "devcp_localebox_header_localizedfields"
 msgstr "Localized Fields"
 
 # %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, fuzzy, php-format
 msgid "devcp_localebox_intro"
@@ -2611,12 +3714,27 @@ 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.
+#: 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
 #, 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
@@ -2624,11 +3742,33 @@ msgid "devcp_nominate_submit_nominate"
 msgstr "Nominate %s"
 
 # %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: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
 #, fuzzy
 msgid "devcp_notice_cleardefault"
@@ -2640,6 +3780,10 @@ msgstr ""
 # %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"
@@ -2656,9 +3800,14 @@ msgstr ""
 "Making this the default preview will remove default status from the current "
 "default preview."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2693,6 +3842,60 @@ msgstr "Edit Preview"
 msgid "devcp_preview_updated_successfully"
 msgstr "Preview updated successfully."
 
+#: 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
 #, fuzzy
 msgid "devcp_previews_filetype_info"
@@ -2706,11 +3909,21 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Add Preview"
 
+#: views/developers/previews.thtml:79
+#, fuzzy
+msgid "devcp_previews_header_caption"
+msgstr "Preview Caption"
+
 #: views/previews/edit.thtml:43
 #, fuzzy
 msgid "devcp_previews_header_edit"
 msgstr "Edit Preview"
 
+#: views/developers/previews.thtml:94
+#, fuzzy
+msgid "devcp_previews_label_default"
+msgstr "Default Preview"
+
 #: views/previews/add.thtml:54
 #, fuzzy
 msgid "devcp_previews_label_file"
@@ -2721,6 +3934,34 @@ msgstr "Preview File"
 msgid "devcp_previews_label_makedefault"
 msgstr "Make this the default preview image"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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
 #, fuzzy
 msgid "devcp_previews_submit_delete"
@@ -2741,48 +3982,163 @@ msgstr "Edit Preview"
 msgid "devcp_previews_submit_upload"
 msgstr "Upload Preview"
 
+#: 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
 #, fuzzy
 msgid "devcp_question_addontype_incorrect"
 msgstr "Incorrect?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 #, fuzzy
 msgid "devcp_question_delete_file"
 msgstr "Are you sure you want to delete this file?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 #, fuzzy
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Please review and accept the following Developer Agreement before proceeding."
 
+#: 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
 #, 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:76
+#: views/developers/dashboard.thtml:79
 #, fuzzy, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Active Daily Users"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, fuzzy, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> Total Downloads"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, fuzzy, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Weekly Downloads"
 
-#: controllers/developers_controller.php:1481
+#: 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
 #, fuzzy
 msgid "devcp_submissions_disabled"
 msgstr ""
@@ -2790,14 +4146,14 @@ msgstr ""
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 #, fuzzy
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "I Accept"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 #, fuzzy
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "I Decline"
@@ -2817,12 +4173,13 @@ msgstr "Disabled"
 msgid "devcp_summary_header_trusted"
 msgstr "Trusted"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2834,6 +4191,7 @@ 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"
@@ -2844,34 +4202,678 @@ msgstr "Please be sure to %s for your theme."
 msgid "devcp_theme_upload_preview_link"
 msgstr "upload a preview"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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
 #, fuzzy, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Please see %s for reference."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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
 #, fuzzy
 msgid "devcp_valid_app_reference_linktext"
 msgstr "this page"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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
 #, fuzzy
 msgid "devcp_version_edit_pagetitle"
 msgstr "Edit Version"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 #, fuzzy
 msgid "devcp_version_updated_successfully"
 msgstr "Version updated successfully."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 #, fuzzy
 msgid "downloads_disable_warning"
 msgstr "This add-on is disabled"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 #, fuzzy
 msgid "editorcp_logs_button_filter"
@@ -2882,7 +4884,7 @@ msgstr "Filter"
 msgid "editorcp_logs_filter_by"
 msgstr "Filter by type/action"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 #, fuzzy
 msgid "editorcp_logs_page_heading"
 msgstr "Event Log"
@@ -2947,6 +4949,7 @@ msgstr "Hide Comments"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Show Comments"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, fuzzy, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2957,7 +4960,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 #, fuzzy
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Review Log"
@@ -2987,28 +4990,28 @@ msgstr "Recent Editor Activity"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total Reviews"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 #, fuzzy
 msgid "editors_addon_review_pagetitle"
 msgstr "Review Add-on"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 #, fuzzy
 msgid "editors_error_js-formerror"
 msgstr "Please complete the following fields:"
 
-#: controllers/editors_controller.php:461
+#: 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:395
+#: controllers/editors_controller.php:398
 #, fuzzy
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Self-reviews are not allowed."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 #, fuzzy
 msgid "editors_external_software"
 msgstr "External Software"
@@ -3023,46 +5026,46 @@ msgstr "Add feature"
 msgid "editors_featured_add_feature_submit"
 msgstr "Add"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 #, fuzzy
 msgid "editors_featured_addon_remove_success"
 msgstr "Successfully removed feature."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 #, fuzzy
 msgid "editors_featured_addons_pagetitle"
 msgstr "Featured Add-ons"
@@ -3103,44 +5106,47 @@ 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: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:258
+#: controllers/editors_controller.php:261
 #, fuzzy
 msgid "editors_one_day"
 msgstr "1 day"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 #, fuzzy
 msgid "editors_one_hour"
 msgstr "1 hour"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 #, fuzzy
 msgid "editors_one_minute"
 msgstr "1 minute"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 #, fuzzy
 msgid "editors_pagetitle"
 msgstr "Editor Tools"
 
-#: controllers/editors_controller.php:286
+#. %s is a comma separated list of platforms.  Example:  Windows, OS X
 #: 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:301
+#: 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:78
 #, fuzzy, php-format
 msgid "editors_queue_app_compatibility"
@@ -3156,23 +5162,28 @@ msgstr "Clear"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 #, fuzzy
 msgid "editors_review_action"
 msgstr "Review Action"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 #, fuzzy
 msgid "editors_review_action_public"
 msgstr "Push to Public"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 #, fuzzy
 msgid "editors_review_action_request_superreview"
 msgstr "Request Super-Review"
@@ -3182,12 +5193,20 @@ msgstr "Request Super-Review"
 msgid "editors_review_action_sandbox"
 msgstr "Retain in Sandbox"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 #, fuzzy
 msgid "editors_review_comments"
 msgstr "Review Comments"
 
-#: views/editors/review.thtml:167
+#: 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
 #, fuzzy
 msgid "editors_review_details_nominated_public"
 msgstr ""
@@ -3195,26 +5214,26 @@ msgstr ""
 "Future versions will go into the sandbox until they are reviewed by an "
 "editor."
 
-#: views/editors/review.thtml:170
+#: 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:159
+#: 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:162
+#: 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:174
+#: views/editors/review.thtml:181
 #, fuzzy
 msgid "editors_review_details_superreview"
 msgstr ""
@@ -3247,17 +5266,17 @@ msgstr "Categories:"
 msgid "editors_review_header_compatibility"
 msgstr "Compatibility:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 #, fuzzy
 msgid "editors_review_header_description"
 msgstr "Description"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 #, fuzzy
 msgid "editors_review_header_devcomments"
 msgstr "Developer Comments"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 #, fuzzy
 msgid "editors_review_header_eula"
 msgstr "EULA"
@@ -3267,103 +5286,130 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Files:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 #, fuzzy
 msgid "editors_review_header_itemhistory"
 msgstr "Item History"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 #, fuzzy
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomination Message"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 #, fuzzy
 msgid "editors_review_header_previews"
 msgstr "Previews"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, fuzzy, php-format
 msgid "editors_review_header_review"
 msgstr "Review %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 #, fuzzy
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes to Reviewer"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 #, fuzzy
 msgid "editors_review_header_summary"
 msgstr "Summary"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 #, fuzzy
 msgid "editors_review_header_versionnotes"
 msgstr "Version Notes"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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
 #, fuzzy
 msgid "editors_review_history_nominated_adminreview"
 msgstr "Admin Review"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 #, fuzzy
 msgid "editors_review_history_nominated_approved"
 msgstr "Nomination Approved/Public"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 #, fuzzy
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomination Denied/Sandbox"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 #, fuzzy
 msgid "editors_review_history_nonefound"
 msgstr "No previous review entries could be found."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 #, fuzzy
 msgid "editors_review_history_pending_adminreview"
 msgstr "Admin Review"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 #, fuzzy
 msgid "editors_review_history_pending_approved"
 msgstr "Approved/Public"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 #, fuzzy
 msgid "editors_review_history_pending_denied"
 msgstr "Denied/Sandbox"
 
-#: views/editors/review.thtml:198
+#. 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
 #, fuzzy
 msgid "editors_review_label_applications"
 msgstr "Applications:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 #, fuzzy
 msgid "editors_review_label_cannedresponse"
 msgstr "or select a canned response:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 #, fuzzy
 msgid "editors_review_label_comments"
 msgstr "Comments:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 #, fuzzy
 msgid "editors_review_label_operating_systems"
 msgstr "Operating Systems:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 #, fuzzy
 msgid "editors_review_link_pagetop"
 msgstr "Top"
@@ -3373,7 +5419,7 @@ msgstr "Top"
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 #, fuzzy
 msgid "editors_review_previews_notfound"
 msgstr "No previews found."
@@ -3383,49 +5429,57 @@ msgstr "No previews found."
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 #, fuzzy
 msgid "editors_review_submit_process_action"
 msgstr "Process Action"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 #, fuzzy
 msgid "editors_review_th_action"
 msgstr "Action"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 #, fuzzy
 msgid "editors_review_th_comments"
 msgstr "Comments"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 #, fuzzy
 msgid "editors_review_th_date"
 msgstr "Date"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 #, fuzzy
 msgid "editors_review_th_reviewer"
 msgstr "Reviewer"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 #, fuzzy
 msgid "editors_review_th_version_file"
 msgstr "Version/File"
 
-#: controllers/editors_controller.php:411
+#: 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
 #, fuzzy
 msgid "editors_reviewed_successfully"
 msgstr "Review successfully processed."
@@ -3455,7 +5509,7 @@ msgstr "Action"
 msgid "editors_reviews_in_reply_to"
 msgstr "In reply to:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 #, fuzzy
 msgid "editors_reviews_processed"
 msgstr "Reviews processed successfully!"
@@ -3470,27 +5524,27 @@ msgstr "There are currently no reviews in moderation."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Process Reviews"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 #, fuzzy
 msgid "editors_site_specific"
 msgstr "Site Specific"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 #, fuzzy
 msgid "editors_submissiontype_new"
 msgstr "New"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 #, fuzzy
 msgid "editors_submissiontype_updated"
 msgstr "Updated"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 #, fuzzy
 msgid "editors_tested_app"
 msgstr "Tested Application"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 #, fuzzy
 msgid "editors_tested_os"
 msgstr "Tested Operating Systems"
@@ -3541,17 +5595,20 @@ msgstr "Platforms"
 msgid "editors_th_submissiontypes"
 msgstr "Submission Types"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, fuzzy, php-format
 msgid "editors_x_days"
 msgstr "%s days"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, fuzzy, php-format
 msgid "editors_x_hours"
 msgstr "%s hours"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, fuzzy, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutes"
@@ -3560,8 +5617,8 @@ msgstr "%s minutes"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 #, fuzzy
 msgid "error_access_denied"
 msgstr "Access Denied"
@@ -3571,12 +5628,13 @@ msgstr "Access Denied"
 msgid "error_access_denied_message"
 msgstr "You are not authorized to view this page."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3586,19 +5644,20 @@ msgstr "You are not authorized to view this page."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 #, fuzzy
 msgid "error_addon_notfound"
 msgstr "Add-on not found!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 #, fuzzy
 msgid "error_addon_notviewable"
 msgstr "This add-on is not viewable here."
@@ -3608,7 +5667,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:624
+#: controllers/addons_controller.php:753
 #, fuzzy
 msgid "error_browse_no_addons"
 msgstr "No add-ons in this category!"
@@ -3633,25 +5692,26 @@ msgstr "This is not a valid email address."
 msgid "error_field_required"
 msgstr "This field must not be empty."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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
 #, fuzzy
 msgid "error_file_notfound"
 msgstr "File not found!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, fuzzy, php-format
 msgid "error_file_x_notfound"
 msgstr "File error: %s does not exist."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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"
@@ -3671,16 +5731,18 @@ 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
 #: 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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, fuzzy, php-format
 msgid "error_missing_argument"
@@ -3701,7 +5763,7 @@ msgstr "Notice"
 msgid "error_preview_notfound"
 msgstr "Preview not found!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 #, fuzzy
 msgid "error_review_rating_required"
 msgstr "You must select a rating."
@@ -3763,8 +5825,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Wrong username or password!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 #, fuzzy
 msgid "error_version_notfound"
 msgstr "Version not found!"
@@ -3780,12 +5842,14 @@ msgid "feature_learnmore"
 msgstr "Learn more"
 
 # %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, fuzzy, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Learn more about %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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
 #, fuzzy, php-format
 msgid "feature_reviews"
@@ -3798,6 +5862,45 @@ 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
+#: views/files/browse.thtml:65
+#, fuzzy
+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)
+#: views/files/browse.thtml:67
+#, fuzzy
+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)
+#: views/files/browse.thtml:64
+#, fuzzy
+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)
+#: views/files/browse.thtml:46
+#, fuzzy
+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.
+#: views/files/browse.thtml:68
+#, fuzzy
+msgid "file_browser_toggle_expand_collapse"
+msgstr "+/-"
+
 #: views/elements/footer.thtml:67
 #, fuzzy
 msgid "footer_all_rights_reserved"
@@ -3842,7 +5945,7 @@ msgstr "Other languages:"
 msgid "footer_privacy_policy"
 msgstr "Privacy Policy"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 #, fuzzy
 msgid "forum_save"
 msgstr "Save"
@@ -3853,6 +5956,7 @@ 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:110
 #, fuzzy
 msgid "general_addontype_dict_plural"
@@ -3864,6 +5968,7 @@ 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:108
 #, fuzzy
 msgid "general_addontype_extension_plural"
@@ -3875,6 +5980,7 @@ 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:113
 #, fuzzy
 msgid "general_addontype_lpaddon_plural"
@@ -3886,6 +5992,7 @@ 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:112
 #, fuzzy
 msgid "general_addontype_lpapp_plural"
@@ -3897,6 +6004,7 @@ 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:114
 #, fuzzy
 msgid "general_addontype_plugin_plural"
@@ -3908,6 +6016,7 @@ 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:111
 #, fuzzy
 msgid "general_addontype_search_plural"
@@ -3919,11 +6028,13 @@ 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:109
 #, fuzzy
 msgid "general_addontype_theme_plural"
 msgstr "Themes"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, fuzzy, php-format
 msgid "header_home_tooltip"
@@ -3960,13 +6071,13 @@ msgid "header_navlink_addons"
 msgstr "Add-ons"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 #, fuzzy
 msgid "header_navlink_logout"
 msgstr "Log out"
@@ -3976,15 +6087,16 @@ msgstr "Log out"
 msgid "header_navlink_myaccount"
 msgstr "My Account"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 #, fuzzy
 msgid "header_navlink_register"
 msgstr "Register"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, fuzzy, php-format
 msgid "img_preview_of"
@@ -3992,6 +6104,8 @@ msgstr "Preview Image of %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/install.thtml:229
 #, fuzzy
 msgid "install_a_login_to_install"
@@ -3999,18 +6113,22 @@ 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)
 #: 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/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/install.thtml:158
 #, fuzzy, php-format
 msgid "install_download"
@@ -4037,7 +6155,7 @@ msgid "langtools_download_langpack"
 msgstr "Download Language Pack"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 #, fuzzy
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dictionaries & Language Packs"
@@ -4107,7 +6225,11 @@ msgstr "Firefox"
 #: config/bootstrap.php:277
 #, fuzzy
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -4147,6 +6269,7 @@ 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:214
 #, fuzzy
 msgid "other_users"
@@ -4162,42 +6285,41 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_experimental_addons"
 msgstr "Experimental Add-ons"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 #, fuzzy
 msgid "page_title_policy"
 msgstr "Add-ons Policy"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 #, fuzzy
 msgid "page_title_privacy"
 msgstr "Mozilla Privacy Policy"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 #, fuzzy
 msgid "page_title_review_guide"
 msgstr "Review Guidelines"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 #, fuzzy
 msgid "page_title_sandbox"
 msgstr "Sandbox Review System"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 #, fuzzy
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
@@ -4220,6 +6342,7 @@ msgstr ""
 "least one of the below applications supported. Only the versions listed "
 "below are allowed for these applications."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, fuzzy, php-format
 msgid "pages_appversions_required_files"
@@ -4227,6 +6350,8 @@ 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.
 #: views/pages/appversions.thtml:92
 #, fuzzy
 msgid "pages_appversions_required_files_link"
@@ -4237,7 +6362,6 @@ msgstr "here"
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/experimental_addons.thtml:56
 #, fuzzy
 msgid "pages_experimental_addons_backbutton"
 msgstr "Back to the previous page"
@@ -4253,6 +6377,7 @@ 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"
@@ -4282,6 +6407,8 @@ msgstr "Please type what you hear."
 
 # %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
 #, fuzzy
 msgid "recaptcha_hardtohear_text"
@@ -4291,6 +6418,8 @@ msgstr ""
 
 # %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
 #, fuzzy
 msgid "recaptcha_hardtoread_text"
@@ -4308,7 +6437,7 @@ msgstr "Are you human?"
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 #, fuzzy
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
@@ -4339,7 +6468,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 #, fuzzy
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
@@ -4357,6 +6486,7 @@ msgstr ""
 "editor review."
 
 # %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:48
 #, fuzzy
 msgid "review_guidelines_short"
@@ -4375,23 +6505,24 @@ msgstr ""
 "Guidelines</a> for more detail about user add-on reviews.</p>"
 
 # %1 is the addon name
+#. %1 is the add-on name
 #: 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:261
+#: controllers/addons_controller.php:390
 #, fuzzy
 msgid "rss_featuredaddons"
 msgstr "Featured Add-ons"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 #, fuzzy
 msgid "rss_newestaddons"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 #, fuzzy
 msgid "rss_updatedaddons"
 msgstr "Updated Add-ons"
@@ -4437,6 +6568,7 @@ msgstr "All Search Engines"
 msgid "search_landing_browse_search_engines"
 msgstr "Browse Search Engines"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, fuzzy, php-format
 msgid "search_matching_addons_number"
@@ -4459,12 +6591,13 @@ msgstr "Search Add-ons"
 msgid "search_rss_description"
 msgstr "Search results feed"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, fuzzy, php-format
 msgid "search_rss_results_for"
 msgstr "Search results for: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 #, fuzzy
 msgid "sidebar_navlink_admin_tools"
 msgstr "Admin Tools"
@@ -4474,7 +6607,7 @@ msgstr "Admin Tools"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Developer Tools"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 #, fuzzy
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editor Tools"
@@ -4484,6 +6617,7 @@ msgstr "Editor Tools"
 msgid "sidebar_navlink_welcome"
 msgstr "Welcome"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, fuzzy, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -4529,6 +6663,7 @@ msgstr "Theme"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Add-ons"
 
+#. %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
@@ -4542,6 +6677,7 @@ 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/stars.thtml:54
 #, fuzzy, php-format
 msgid "stars_rated_x_outof_5"
@@ -4562,27 +6698,35 @@ msgstr "Developer Tools"
 msgid "statistics_addon_switch"
 msgstr "Switch Add-on"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. This is a date format.
+#. http://php.net/strftime
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, fuzzy
 msgid "statistics_date_shortmonth"
 msgstr "%b. %e"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. This is a date format.
+#. http://php.net/strftime
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, fuzzy
 msgid "statistics_date_shortmonthwithyear"
 msgstr "%b. %e, %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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 #, fuzzy
 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: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:498
 #, fuzzy, php-format
 msgid "statistics_events_app_released"
@@ -4633,7 +6777,7 @@ msgstr "Statistics Dashboard"
 msgid "statistics_index_view_button"
 msgstr "View Statistics"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
@@ -4653,7 +6797,7 @@ msgstr "Remove this plot"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
@@ -4663,127 +6807,132 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 #, fuzzy
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s found in range"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 #, fuzzy
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Add Plot"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 #, fuzzy
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Add another plot to this graph"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Hide Total Count"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Show Total Count"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 #, fuzzy
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "View Data (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Hide %s Events"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Show %s Events"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Hide Firefox Events"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Show Firefox Events"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Collapse Graph"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expand Graph"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Resize the graph"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 #, fuzzy
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Active Daily Users"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 #, fuzzy
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 #, fuzzy
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Custom"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 #, fuzzy
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 #, fuzzy
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operating System"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 #, fuzzy
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Add-on Status"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 #, fuzzy
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Summary"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 #, fuzzy
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Add-on Version"
@@ -4813,13 +6962,13 @@ msgstr "Unknown"
 msgid "statistics_longnames_version"
 msgstr "Add-on Version"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 #, fuzzy
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "There is not yet enough data to display this graph. Please check back later."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 #, fuzzy
 msgid "statistics_notice_data_none"
 msgstr ""
@@ -4833,13 +6982,13 @@ msgstr ""
 "may be incomplete as our scripts work to update this information. Please "
 "check back in a few minutes."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 #, fuzzy
 msgid "statistics_notice_disabled"
 msgstr ""
 "The Statistics Dashboard is currently disabled. Please check back later."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 #, fuzzy
 msgid "statistics_notice_nojavascript"
 msgstr "JavaScript is required to view the Statistics Dashboard graphs."
@@ -4857,42 +7006,42 @@ msgstr "Your settings have been updated!"
 msgid "statistics_pagetitle"
 msgstr "Statistics Dashboard"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 #, fuzzy
 msgid "statistics_plot_legend_adu"
 msgstr "Active Daily Users"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 #, fuzzy
 msgid "statistics_plot_legend_downloads"
 msgstr "Daily Downloads"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 #, fuzzy
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Zoom In"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 #, fuzzy
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Zoom in one month"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 #, fuzzy
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Zoom Out"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 #, fuzzy
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out one month"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, fuzzy, php-format
 msgid "statistics_rss_description"
 msgstr "Daily summary of statistics for %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 #, fuzzy
 msgid "statistics_rss_icon_title"
 msgstr "RSS feed of summary data"
@@ -4940,27 +7089,27 @@ msgstr "Public"
 msgid "statistics_settings_access_public_description"
 msgstr "Anyone can view this add-on's statistics"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 #, fuzzy
 msgid "statistics_settings_change_link"
 msgstr "Change Settings"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 #, fuzzy
 msgid "statistics_settings_confidential"
 msgstr "Please treat this information as confidential."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 #, fuzzy
 msgid "statistics_settings_currently_private"
 msgstr "This dashboard is currently <b>private</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 #, fuzzy
 msgid "statistics_settings_currently_public"
 msgstr "This dashboard is currently <b>public</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 #, fuzzy
 msgid "statistics_settings_locked_alt"
 msgstr "Locked"
@@ -4980,7 +7129,7 @@ msgstr "Save Settings"
 msgid "statistics_settings_title"
 msgstr "Statistics Dashboard Settings for %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 #, fuzzy
 msgid "statistics_settings_unlocked_alt"
 msgstr "Unlocked"
@@ -5010,7 +7159,7 @@ msgstr "Uk"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 #, fuzzy
 msgid "statistics_summary_downloads_average"
 msgstr "Average Daily Downloads"
@@ -5020,43 +7169,43 @@ msgstr "Average Daily Downloads"
 msgid "statistics_summary_downloads_heading"
 msgstr "Downloads"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 #, fuzzy
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Last Day Count"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 #, fuzzy
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in the last 7 days"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 #, fuzzy
 msgid "statistics_summary_downloads_total"
 msgstr "Total Downloads"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, fuzzy, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Since %1$s"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 #, fuzzy
 msgid "statistics_summary_nodata"
 msgstr "No data yet"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 #, fuzzy
 msgid "statistics_summary_updatepings_average"
 msgstr "Average Daily Active Users"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 #, fuzzy
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Change from previous count"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, fuzzy, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s on %2$s"
@@ -5066,18 +7215,18 @@ msgstr "%1$s on %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Active Daily Users"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 #, fuzzy
 msgid "statistics_summary_updatepings_total"
 msgstr "Active Daily Users"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, fuzzy, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "On %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, fuzzy, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Statistics"
@@ -5108,6 +7257,7 @@ 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:49
 #, fuzzy
 msgid "user_del_account_deleted"
@@ -5132,6 +7282,7 @@ 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:62
 #, fuzzy
 msgid "user_del_error_addons"
@@ -5142,6 +7293,7 @@ msgstr ""
 "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:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
@@ -5160,6 +7312,7 @@ 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:83
 #, fuzzy
 msgid "user_del_error_unknown"
@@ -5173,6 +7326,7 @@ 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:93
 #, fuzzy
 msgid "user_del_header_delete_account"
@@ -5203,6 +7357,7 @@ msgstr ""
 "associated with you."
 
 # %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
@@ -5222,6 +7377,7 @@ msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 #, fuzzy
 msgid "user_edit_confirm_email_sent"
@@ -5238,6 +7394,9 @@ 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
+#. 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
 #, fuzzy, php-format
 msgid "user_email_confirm_account_nopass"
@@ -5258,6 +7417,7 @@ msgstr ""
 "-- %2$s Add-ons Staff"
 
 # %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, fuzzy, php-format
@@ -5283,6 +7443,8 @@ msgstr "Thanks for joining %s Add-ons"
 
 # 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
 #, fuzzy, php-format
 msgid "user_email_pwreset"
@@ -5311,6 +7473,7 @@ msgid "user_emailchange_error"
 msgstr "Error!"
 
 # %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, fuzzy, php-format
 msgid "user_emailchange_subject"
@@ -5322,6 +7485,7 @@ msgid "user_emailchange_success"
 msgstr "Success!"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, fuzzy, php-format
 msgid "user_emailchange_successful_description"
@@ -5522,6 +7686,7 @@ msgid "user_register_amo_link"
 msgstr "%s Add-ons"
 
 # %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
 #, fuzzy, php-format
 msgid "user_register_click_confirm_link"
@@ -5530,6 +7695,7 @@ msgstr ""
 "You have to click it before you can log into %2$s Add-ons."
 
 # %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, fuzzy, php-format
 msgid "user_register_confirm_email_sent"
@@ -5549,6 +7715,7 @@ msgid "user_register_congratulations"
 msgstr "Congratulations! Your user account was successfully created."
 
 # %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
 #, fuzzy, php-format
 msgid "user_register_resend_confirmation_link"
@@ -5558,6 +7725,7 @@ msgstr ""
 "us %1$s to your email address mentioned above."
 
 # %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:52
 #, fuzzy, php-format
 msgid "user_register_welcome"
@@ -5629,6 +7797,7 @@ 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:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
@@ -5641,6 +7810,8 @@ msgstr "User Login"
 
 # %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
 #, fuzzy, php-format
 msgid "users_login_sandbox_display_warning"
@@ -5651,6 +7822,8 @@ msgstr ""
 
 # %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
 #, fuzzy, php-format
 msgid "users_login_sandbox_page_warning"
@@ -5668,3 +7841,50 @@ msgstr "User Password Reset"
 #, fuzzy
 msgid "users_register_pagetitle"
 msgstr "New User Registration"
+
+#, fuzzy
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "The most recent version compatible with"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "recaptcha_enter_numbers"
+#~ msgstr "Please enter the <strong>numbers</strong> you are hearing below."
+
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to a text captcha
+#, fuzzy
+#~ msgid "recaptcha_hardtohear"
+#~ msgstr ""
+#~ "If this is hard to understand, you can <a href=\"%1$s\">try different "
+#~ "numbers</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
+#, fuzzy
+#~ msgid "recaptcha_hardtoread"
+#~ msgstr ""
+#~ "If this is hard to read, you can <a href=\"%1$s\">try different words</a> "
+#~ "or <a href=\"%2$s\">listen to numbers</a> instead."
diff --git a/site/app/locale/ga_IE/LC_MESSAGES/messages.po b/site/app/locale/ga_IE/LC_MESSAGES/messages.po
index 35cae82..b7c9b9d 100644
--- a/site/app/locale/ga_IE/LC_MESSAGES/messages.po
+++ b/site/app/locale/ga_IE/LC_MESSAGES/messages.po
@@ -21,6 +21,10 @@ msgstr ""
 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 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
@@ -49,41 +53,38 @@ msgstr "Poiblí"
 msgid "a_header_sandbox"
 msgstr "Bosca Gainimh"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Curtha Leis %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Nuashonraithe %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Leagan %s"
 
 # preceded by a number I think
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "íosluchtú san iomlán"
 
 # preceded by a number
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
@@ -103,22 +104,24 @@ msgstr "sa leathanach"
 msgid "addon_list_sortby"
 msgstr "Sórtáil de réir:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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:57
 msgid "addon_not_available_for_platform"
 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: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
@@ -128,6 +131,7 @@ 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -146,6 +150,7 @@ msgstr "Léirmheas:"
 msgid "addon_review_add_submit"
 msgstr "Seol do léirmheas"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -179,21 +184,24 @@ msgstr "Tá"
 msgid "addon_review_delete_header"
 msgstr "Scrios an Léirmheas"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Scriosadh an léirmheas."
 
+#. %s is the name of the add-on
 #: 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.
-#: controllers/reviews_controller.php:534
+#. %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 ""
 
 # Removing an extra comma
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -205,6 +213,7 @@ 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:135
 #, php-format
 msgid "addon_review_others_by_user"
@@ -221,15 +230,17 @@ msgstr[4] ""
 "Féach ar %1$s léirmheas a rinne %2$s ar an mbreiseán seo roimhe seo."
 
 # %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -243,13 +254,14 @@ msgstr "Freagra ón Fhorbróir:"
 msgid "addon_review_saved_successfully"
 msgstr "Sábháladh do léirmheas.  Go raibh maith agat!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, php-format
@@ -272,11 +284,16 @@ msgstr "An Breiseán Roimhe Seo"
 msgid "addon_version_permalink"
 msgstr "Nasc buan leis an leagan seo"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "An leagan is déanaí atá comhoiriúnach do"
+# %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:118
+#, fuzzy
+msgid "addon_versions_getlatestversion"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Téigh"
 
@@ -285,18 +302,22 @@ msgid "addons_author_tooltip"
 msgstr "Féach ar Phróifíl an Údair"
 
 # %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "Brabhsáil gach Téama :: Breiseáin %1$s"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Brabhsáil %s"
 
 # %1 is the name of the theme category (eg. Modern)
 # %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "Brabhsáil Téamaí %1$s :: Breiseáin %2$s"
 
@@ -304,7 +325,7 @@ msgstr "Brabhsáil Téamaí %1$s :: Breiseáin %2$s"
 msgid "addons_display_add_review"
 msgstr "Cuir léirmheas leis"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Mionsonraí Casta"
 
@@ -312,11 +333,11 @@ msgstr "Mionsonraí Casta"
 msgid "addons_display_categories"
 msgstr "Catagóirí"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "léirmheas mionsonraithe"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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 é"
@@ -325,50 +346,53 @@ msgstr "Ní maith liom é"
 msgid "addons_display_edit_review"
 msgstr "Cuir do léirmheas in eagar"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Tá polasaí príobháideachta ag an mbreiseán seo."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Nótaí ón Fhorbróir"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Leathanach Baile"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Léirmheasanna"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Tacaíocht"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Is maith liom é"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Cur Síos Fada"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Tuilleadh �omhánna"
 
-#: views/addons/display.thtml:421
+#. %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] "Breiseáin eile scríofa ag %1$s"
@@ -377,39 +401,46 @@ msgstr[2] "Breiseáin eile scríofa ag na húdair seo"
 msgstr[3] "Breiseáin eile scríofa ag na húdair seo"
 msgstr[4] "Breiseáin eile scríofa ag na húdair seo"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Soláthraíonn an forbróir ag %s tacaíocht le haghaidh an bhreiseáin seo"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "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"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Rátáil É"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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 "
@@ -417,51 +448,54 @@ msgstr ""
 "mbeidh orthu dul i dteagmháil leat chun an fhadhb a réiteach."
 
 # %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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
-#: views/addons/display.thtml:396 views/addons/display.thtml:400
+#. %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 ""
 "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:379
+#: 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:415
+#: 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
-#: views/addons/display.thtml:302
+#. %1 is the number of reviews
+#: 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:195 views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Stair Iomlán na Leaganacha"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Amharc ar fhoinse"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Amharc ar staitisticí"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Cad é do bharúil?"
 
@@ -471,7 +505,7 @@ msgstr "Oibríonn sé le:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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"
@@ -482,10 +516,11 @@ msgstr "le"
 msgid "addons_home_feature_head"
 msgstr "Molaimid"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -500,7 +535,9 @@ msgstr "Is Nuaí:"
 msgid "addons_home_other_applications"
 msgstr "Feidhmchláir Eile"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -510,19 +547,20 @@ msgstr "Feidhmchláir Eile"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -618,6 +656,7 @@ msgstr "le haghaidh Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "le haghaidh Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -638,12 +677,13 @@ msgstr ""
 "sheinm.  Ní ionann forlíontáin agus 'eisínteachtaí', cláir a athraíonn nó a "
 "fheabhsaíonn feidhmiúlacht atá ann cheana."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Forlíontáin Choitianta le haghaidh %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Forlíontáin"
 
@@ -654,6 +694,7 @@ msgstr "Forlíontáin"
 msgid "addons_plugins_support_documentation"
 msgstr "Doiciméadú: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -662,24 +703,25 @@ msgstr ""
 "dul ar aghaidh leis an tsuiteáil:"
 
 # %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Réamhamhairc at %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Breiseáin Mholta"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Breiseáin Mholta"
 
@@ -688,6 +730,7 @@ msgid "addons_searchengines_additional_resources"
 msgstr "Acmhainní Eile"
 
 # link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Lárionad Forbartha Mozilla"
@@ -708,33 +751,39 @@ msgstr ""
 
 # %1 is "make your own" link
 # %2 is MDC link
+#. %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 "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: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: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: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:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Innill Chuardaigh"
 
@@ -748,7 +797,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Díchumasaithe"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Leagan Neamhiomlán"
 
@@ -786,11 +835,12 @@ 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í."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Stair na Leaganacha le Logchomhaid Athruithe"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Stair na Leaganacha %1$s"
@@ -803,6 +853,7 @@ msgstr "Cuir Grúpa Leis"
 msgid "admin_group_delete_pagetitle"
 msgstr "Scrios Grúpa"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -929,16 +980,20 @@ msgstr "Déan neamhaird ar chinntiú an leagain"
 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: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: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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -951,23 +1006,23 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Nuashonraigh Firefox</a> chun an breiseán "
 "seo a úsáid"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Breiseáin de réir Ainm"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Breiseáin Is Nuaí"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Breiseáin is mó éilimh orthu"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Breiseáin de réir Rátála"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Breiseáin Nuashonraithe Le Déanaí"
 
@@ -1002,6 +1057,7 @@ 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:135 views/addons/category_landing.thtml:51
 #, php-format
 msgid "category_extra_see_all"
@@ -1011,11 +1067,19 @@ msgstr "Taispeáin na %1$s go léir"
 msgid "collection_not_found"
 msgstr "Bailiúchán gan aimsiú!"
 
+#. %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"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
@@ -1046,6 +1110,8 @@ msgstr "Athraigh maxVersion gan uasluchtú"
 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:130
 msgid "compatibility_developers_login_first"
 msgstr ""
@@ -1070,6 +1136,10 @@ msgstr "Torthaí Seiceáil Stádais an Bhreiseáin"
 msgid "compatibility_developers_retrieving"
 msgstr "Stádas do bhreiseáin óstáilte á fháil..."
 
+#. %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 %2$s úsáideoirí (%3$s&#37; as an iomlán)"
@@ -1082,6 +1152,8 @@ msgstr ""
 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:69
 msgid "compatibility_report_intro"
 msgstr ""
@@ -1090,6 +1162,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Leaganacha Alfa"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Breiseáin atá comhoiriúnach le leagan alfa de %1$s"
@@ -1098,6 +1171,7 @@ msgstr "Breiseáin atá comhoiriúnach le leagan alfa de %1$s"
 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:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
@@ -1107,6 +1181,7 @@ msgstr ""
 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:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Breiseáin atá suas le dáta na leaganacha is déanaí de %1$s"
@@ -1115,6 +1190,7 @@ msgstr "Breiseáin atá suas le dáta na leaganacha is déanaí de %1$s"
 msgid "compatibility_report_legend_other"
 msgstr "Leaganacha Eile"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Breiseáin nach bhfuil comhoiriúnach le haon leagan de %1$s"
@@ -1132,14 +1208,15 @@ msgstr "Eolas le haghaidh Úsáideoirí"
 msgid "compatibility_view_report"
 msgstr "Féach ar Thuairisc Chomhoiriúnachta"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: 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 ár %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "leathanach vicí"
 
@@ -1181,18 +1258,27 @@ msgstr ""
 "<a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons "
 "Attribution, leagan 2.5</a>."
 
+#: 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>."
+
 # 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/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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
@@ -1200,7 +1286,10 @@ msgid "date"
 msgstr "%e %B, %Y"
 
 # date and time format string (strftime)
+#. 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"
@@ -1226,14 +1315,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1282,36 +1399,36 @@ msgstr "Céim 5: D'éirigh leat"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Cabhair le Seoladh Breiseán"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Díchumasaíodh an breiseán"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: 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:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Cumasaíodh an breiseán"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: 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:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: 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:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Ainm an Bhreiseáin"
 
@@ -1320,40 +1437,300 @@ msgstr "Ainm an Bhreiseáin"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Fotheideal an Réamhamhairc"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: 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:2185
-#: controllers/developers_controller.php:2473
+#: 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:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Ríomhphost Tacaíochta"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL Tacaíochta"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: 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:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Ainmnigh Breiseán"
 
-#: controllers/developers_controller.php:2729
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1377,6 +1754,7 @@ msgstr ""
 "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"
@@ -1387,6 +1765,7 @@ 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"
@@ -1409,16 +1788,17 @@ msgstr ""
 "Toisc go bhfuil breiseán iontaofa agat, cuirfear an leagan seo ar an taobh "
 "poiblí go huathoibríoch."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Seol Breiseán"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1429,6 +1809,7 @@ 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"
@@ -1457,10 +1838,102 @@ msgstr "Ar Aghaidh"
 msgid "devcp_change_addontype"
 msgstr "Athraigh cineál an bhreiseáin:"
 
-#: controllers/developers_controller.php:1402
+#: 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 "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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Cuir Réamhamharc Leis"
@@ -1553,6 +2026,7 @@ msgstr "Níor thug an forbróir URL le haghaidh tacaíochta."
 msgid "devcp_details_trusted"
 msgstr "Iontaofa"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1583,6 +2057,7 @@ msgstr ""
 "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"
@@ -1603,11 +2078,65 @@ msgstr ""
 "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 "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Cuir Údar Leis"
@@ -1620,10 +2149,297 @@ msgstr "Seoladh Ríomhphoist an Údair"
 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 "Add New Author"
+
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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"
@@ -1689,6 +2505,206 @@ msgstr "Logchaighdeán Sprice"
 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 "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 "Nuashonraigh"
@@ -1699,11 +2715,67 @@ 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 "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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Breiseáin Mhór-Le-Rá"
 
 # %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1716,6 +2788,7 @@ msgstr[3] "Léirmheasanna Iniúchta (%s)"
 msgstr[4] "Léirmheasanna Iniúchta (%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
 #, php-format
@@ -1728,6 +2801,7 @@ msgstr[3] "Breiseáin Ainmnithe (%s)"
 msgstr[4] "Breiseáin Ainmnithe (%s)"
 
 # %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1745,6 +2819,8 @@ 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"
@@ -1770,29 +2846,30 @@ msgstr "Nótaí don Eagarthóir"
 msgid "devcp_editversion_submit_update"
 msgstr "Nuashonraigh"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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 /"
@@ -1801,20 +2878,34 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Féach ar %s mar thagairt."
 
+#. 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 "an leathanach seo"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+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"
@@ -1822,7 +2913,7 @@ msgstr ""
 "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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Níl gach GUID comhaid comhoiriúnach"
 
@@ -1851,6 +2942,8 @@ msgstr "Níos mó ná uasmhéid uasluchtaithe"
 msgid "devcp_error_http_nofile"
 msgstr "Níor uasluchtaíodh aon chomhad"
 
+#. %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"
@@ -1858,14 +2951,15 @@ msgstr ""
 "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:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Níl install.rdf ann."
 
@@ -1873,21 +2967,26 @@ 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:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Roghnaigh cineál bailí breiseáin."
 
+#. %$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 "Ní leagan bailí é %s le haghaidh %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "Tá aitheantas an bhreiseáin seo neamhbhailí: %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"
@@ -1905,6 +3004,7 @@ msgstr ""
 "Uimhir neamhbhailí leagain ar an mbreiseán seo: ní cheadaítear spásanna sa "
 "leagan."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1914,6 +3014,7 @@ msgstr "Tharla an earráid seo a leanas agus install.rdf á pharsáil: %s"
 msgid "devcp_error_move_file"
 msgstr "Níorbh fhéidir an comhad a bhogadh"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1938,16 +3039,16 @@ msgstr ""
 msgid "devcp_error_no_platform"
 msgstr "Níor roghnaíodh ardán"
 
-#: controllers/developers_controller.php:2718
+#: 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:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Ní féidir leat ach breiseáin sa bhosca gainimh a ainmniú."
 
@@ -1959,6 +3060,8 @@ msgstr "Roghnaigh catagóir amháin ar a laghad."
 msgid "devcp_error_one_user"
 msgstr "Ní mór údar amháin ar a laghad a bheith ag an mbreiseán seo."
 
+#. %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"
@@ -1966,13 +3069,13 @@ msgstr ""
 "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:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Níl cead agat an breiseán seo a nuashonrú."
 
@@ -1988,7 +3091,7 @@ 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Uasluchtaigh comhad, le do thoil."
@@ -2210,6 +3313,7 @@ msgid "devcp_localebox_header_localizedfields"
 msgstr "Réimsí Logánaithe"
 
 # %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2253,11 +3357,26 @@ msgstr "Seol Breiseán"
 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: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 "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
@@ -2265,11 +3384,33 @@ msgid "devcp_nominate_submit_nominate"
 msgstr "Ainmnigh %s"
 
 # %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: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 ""
@@ -2280,6 +3421,10 @@ msgstr ""
 # %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"
@@ -2295,9 +3440,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."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2326,6 +3476,60 @@ msgstr "Cuir an Réamhamharc in Eagar"
 msgid "devcp_preview_updated_successfully"
 msgstr "Nuashonraíodh an réamhamharc."
 
+#: 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 ""
@@ -2337,10 +3541,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Cuir Réamhamharc Leis"
 
+#: 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 "Cuir Réamhamharc in Eagar"
 
+#: 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 "Comhad Réamhamhairc"
@@ -2349,6 +3563,34 @@ msgstr "Comhad Réamhamhairc"
 msgid "devcp_previews_label_makedefault"
 msgstr "Úsáid é seo mar réamhamharc réamhshocraithe"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Scrios an Réamhamharc"
@@ -2365,43 +3607,158 @@ msgstr "Cuir Réamhamharc in Eagar"
 msgid "devcp_previews_submit_upload"
 msgstr "Uasluchtaigh Réamhamharc"
 
+#: 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 "Mícheart?"
 
-#: controllers/developers_controller.php:2632
+#: 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/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
 
+#: 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 "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:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Úsáideoirí Gníomhacha Laethúla"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 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:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Líon na n�osluchtuithe sa tSeachtain"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "Ní féidir breiseáin a sheoladh chugainn faoi láthair. Déan iarracht eile ar "
@@ -2409,13 +3766,13 @@ msgstr ""
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Glacaim Leis"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Diúltaím"
 
@@ -2431,11 +3788,12 @@ msgstr "Díchumasaithe"
 msgid "devcp_summary_header_trusted"
 msgstr "Iontaofa"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2446,6 +3804,7 @@ 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"
@@ -2455,30 +3814,674 @@ msgstr "Tá sé tábhachtach %s le haghaidh do théama."
 msgid "devcp_theme_upload_preview_link"
 msgstr "réamhamharc a uasluchtú"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Féach ar %s mar thagairt."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "an leathanach seo"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Cuir an Leagan in Eagar"
 
-#: controllers/developers_controller.php:2572
+#: 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 "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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Tá an breiseán seo díchumasaithe"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Scag"
@@ -2487,7 +4490,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:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Logchomhad Imeachtaí"
 
@@ -2539,6 +4542,7 @@ msgstr "Folaigh Nótaí"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Taispeáin Nótaí"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2548,7 +4552,7 @@ msgstr "Féach ar iontrálacha idir %s agus %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Níor aimsíodh aon rud sa tréimhse seo."
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Logchomhad Iniúchta"
 
@@ -2572,24 +4576,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:369
-#: controllers/editors_controller.php:370
+#: 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:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Líon isteach na réimsí seo a leanas:"
 
-#: controllers/editors_controller.php:461
+#: 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:395
+#: 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:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Bogearra Seachtrach"
 
@@ -2601,39 +4605,39 @@ msgstr "Cuir gné leis"
 msgid "editors_featured_add_feature_submit"
 msgstr "Cuir Leis"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Baineadh an ghné amach."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Breiseáin Shuntasacha"
 
@@ -2667,38 +4671,41 @@ 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: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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 lá"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 uair"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 nóiméad"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Uirlisí Eagarthóra"
 
-#: controllers/editors_controller.php:286
+#. %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 "%s amháin"
 
-#: controllers/editors_controller.php:301
+#: 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:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2712,20 +4719,25 @@ msgstr "Glan"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Gníomh"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Cuir ar an taobh Poiblí"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Déan Iarratas ar Fhorbhreithniú"
 
@@ -2733,34 +4745,42 @@ msgstr "Déan Iarratas ar Fhorbhreithniú"
 msgid "editors_review_action_sandbox"
 msgstr "Coinnigh sa Bhosca Gainimh"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Nótaí ón Eagarthóir"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "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:170
+#: 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:159
+#: 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:162
+#: 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:174
+#: 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ó "
@@ -2787,15 +4807,15 @@ msgstr "Catagóirí:"
 msgid "editors_review_header_compatibility"
 msgstr "Comhoiriúnacht:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Cur Síos"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Nótaí ón Fhorbróir"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2803,85 +4823,112 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Comhaid:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Stair na Míre"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Teachtaireacht Ainmnithe"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Réamhamhairc"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Déan Iniúchadh ar %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Nótaí don Eagarthóir"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Achoimre"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Nótaí Eisiúna"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "Iniúchadh Riaracháin"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Glacadh leis an Ainmniú/Poiblí"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Diúltaíodh an tAinmniú/Bosca Gainimh"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Níor aimsíodh aon iontrálacha iniúchta roimhe seo."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Iniúchadh Riaracháin"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Ceadaithe/Poiblí"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Diúltaithe/Bosca Gainimh"
 
-#: views/editors/review.thtml:198
+#. 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 "Feidhmchláir:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "nó roghnaigh freagra coitianta:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Nótaí:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Córais Oibriúcháin:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Barr"
 
@@ -2889,7 +4936,7 @@ msgstr "Barr"
 msgid "editors_review_next_link"
 msgstr "ar aghaidh &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Níor aimsíodh réamhamharc."
 
@@ -2897,41 +4944,49 @@ msgstr "Níor aimsíodh réamhamharc."
 msgid "editors_review_previous_link"
 msgstr "&laquo; roimhe seo"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> as %2$s sa chiú"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Próiseáil Gníomh"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Gníomh"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Nótaí"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Dáta"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Eagarthóir"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Leagan/Comhad"
 
-#: controllers/editors_controller.php:411
+#: 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 "Próiseáladh an léirmheas."
 
@@ -2955,7 +5010,7 @@ msgstr "Gníomh"
 msgid "editors_reviews_in_reply_to"
 msgstr "I bhfreagra ar:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Próiseáladh na léirmheasanna!"
 
@@ -2967,23 +5022,23 @@ 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:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Sainiúil do Shuíomh"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Nua"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Nuashonraithe"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Feidhmchlár Profa"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Córais Oibriúcháin Profa"
 
@@ -3024,17 +5079,20 @@ msgstr "Ardáin"
 msgid "editors_th_submissiontypes"
 msgstr "Cineálacha na mBreiseán"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s lá"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s uair"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s nóiméad"
@@ -3043,8 +5101,8 @@ msgstr "%s nóiméad"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Cead Rochtana Diúltaithe"
 
@@ -3052,12 +5110,13 @@ msgstr "Cead Rochtana Diúltaithe"
 msgid "error_access_denied_message"
 msgstr "Níl cead agat féachaint ar an leathanach seo."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3067,18 +5126,19 @@ msgstr "Níl cead agat féachaint ar an leathanach seo."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Breiseán gan aimsiú!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Níl an breiseán seo infheicthe anseo."
 
@@ -3086,7 +5146,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:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Níl aon bhreiseán sa chatagóir seo!"
 
@@ -3108,24 +5168,25 @@ msgstr "Ní seoladh ríomhphoist bailí é seo."
 msgid "error_field_required"
 msgstr "Caithfidh tú an réimse seo a líonadh."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Comhad gan aimsiú!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Earráid chomhaid: níl %s ann."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3142,16 +5203,18 @@ msgstr ""
 "Tá formáid an URL seo neamhbhailí. Ba chóir dó a bheith cosúil le http://"
 "sampla.com/mo_leathanach."
 
+#. %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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3169,7 +5232,7 @@ msgstr "Fógra"
 msgid "error_preview_notfound"
 msgstr "Réamhamharc gan aimsiú!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: 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ú."
 
@@ -3222,8 +5285,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Ainm an úsáideora nó focal faire mícheart!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Leagan gan aimsiú!"
 
@@ -3236,12 +5299,14 @@ msgid "feature_learnmore"
 msgstr "Tuilleadh eolais"
 
 # %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Tuilleadh eolais faoi %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3256,6 +5321,45 @@ msgstr[4] "%1$s léirmheas"
 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Gach ceart ar cosaint."
@@ -3292,7 +5396,7 @@ msgstr "Teangacha eile:"
 msgid "footer_privacy_policy"
 msgstr "Polasaí Príobháideachta"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Sábháil"
 
@@ -3301,6 +5405,7 @@ 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Foclóirí"
@@ -3310,6 +5415,7 @@ 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Eisínteachtaí"
@@ -3319,6 +5425,7 @@ 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Pacáistí Teanga (Breiseán)"
@@ -3328,6 +5435,7 @@ 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Pacáistí Teanga (Feidhmchlár)"
@@ -3337,6 +5445,7 @@ 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Breiseán"
@@ -3346,6 +5455,7 @@ 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:111
 msgid "general_addontype_search_plural"
 msgstr "Innill Chuardaigh"
@@ -3355,10 +5465,12 @@ 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Téamaí"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3389,12 +5501,12 @@ msgid "header_navlink_addons"
 msgstr "Breiseáin"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Logáil amach"
 
@@ -3402,14 +5514,15 @@ msgstr "Logáil amach"
 msgid "header_navlink_myaccount"
 msgstr "Mo Chuntas"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Cláraigh"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
@@ -3417,24 +5530,30 @@ msgstr "�omhá Réamhamhairc de %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/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$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 "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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3457,7 +5576,7 @@ msgid "langtools_download_langpack"
 msgstr "�osluchtaigh Pacáiste Teanga"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Foclóirí agus Pacáistí Teanga"
 
@@ -3513,7 +5632,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3547,6 +5670,7 @@ 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:214
 msgid "other_users"
 msgstr "eile"
@@ -3559,35 +5683,34 @@ msgstr "Leaganacha Feidhmchláir"
 msgid "page_title_credits"
 msgstr "Admhálacha"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Breiseáin Thurgnamhacha"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
 msgstr "Ceisteanna Coitianta"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr ""
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Polasaí Breiseán"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Polasaí Príobháideachta Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Treoirlínte d'Eagarthóirí"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Córas Bosca Gainimh"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Cabhair le Seoladh Breiseán"
 
@@ -3607,6 +5730,7 @@ msgstr ""
 "a laghad. Ní cheadaítear ach na leaganacha seo a leanas do na feidhmchláir "
 "seo."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3615,6 +5739,8 @@ msgstr ""
 "é a chur san áireamh mar sin féin, leis na réimsí riachtanacha mar a "
 "shonraítear %s."
 
+#. 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 "anseo"
@@ -3623,7 +5749,6 @@ msgstr "anseo"
 msgid "pages_appversions_versions"
 msgstr "Leaganacha"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Leathanach roimhe seo"
 
@@ -3636,6 +5761,7 @@ 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"
@@ -3661,6 +5787,8 @@ msgstr "Clóscríobh an rud a chloiseann tú."
 
 # %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 ""
@@ -3670,6 +5798,8 @@ msgstr ""
 
 # %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
 msgid "recaptcha_hardtoread_text"
 msgstr ""
@@ -3684,7 +5814,7 @@ msgstr "An neach daonna thú?"
 msgid "recaptcha_whatsthis"
 msgstr "Cad é seo?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Earráid agus bratach á cur leis an léirmheas seo!"
 
@@ -3709,7 +5839,7 @@ msgid "review_flag_reason_spam"
 msgstr "Turscar nó ábhar nach mbaineann le léirmheas"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr ""
 "Go raibh maith agat; cuireadh bratach leis an léirmheas seo agus déanfaidh "
@@ -3727,25 +5857,27 @@ msgstr ""
 "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:48
 msgid "review_guidelines_short"
 msgstr ""
 
+#. %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 "Léirmheasanna ar %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Breiseáin Mhór-Le-Rá"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Breiseáin Is Nuaí"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Breiseáin Nuashonraithe"
 
@@ -3785,6 +5917,7 @@ msgstr "Gach Inneall Cuardaigh"
 msgid "search_landing_browse_search_engines"
 msgstr "Brabhsáil Innill Chuardaigh"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3807,12 +5940,13 @@ msgstr "Cuardaigh Breiseáin"
 msgid "search_rss_description"
 msgstr "Fotha na dtorthaí cuardaigh"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Torthaí cuardaigh le haghaidh: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Uirlisí Riaracháin"
 
@@ -3820,7 +5954,7 @@ msgstr "Uirlisí Riaracháin"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Uirlisí Forbróra"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Uirlisí Eagarthóra"
 
@@ -3828,6 +5962,7 @@ msgstr "Uirlisí Eagarthóra"
 msgid "sidebar_navlink_welcome"
 msgstr "Fáilte"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3865,6 +6000,7 @@ msgstr "Téama"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Breiseáin Nuashonraithe"
 
+#. %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
@@ -3877,6 +6013,7 @@ 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3894,24 +6031,32 @@ msgstr "Uirlisí Forbróra"
 msgid "statistics_addon_switch"
 msgstr "Athraigh an Breiseán"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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."
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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:147 views/statistics/addon.thtml:158
+#: 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 "Cruthaíodh %1$s"
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3953,7 +6098,7 @@ msgstr "Painéal na Staitisticí"
 msgid "statistics_index_view_button"
 msgstr "Amharc ar Staitisticí"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: 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"
 
@@ -3969,7 +6114,7 @@ msgstr "Bain an graf seo"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Grúpáil de réir: Lá"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Grúpáil de réir: Mí"
 
@@ -3977,103 +6122,108 @@ msgstr "Grúpáil de réir: Mí"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Grúpáil de réir: Seachtain"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "Aimsíodh %s i raon"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Cuir Graf Leis"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Cuir graf eile leis"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Folaigh an Líon Iomlán"
 
-#: controllers/statistics_controller.php:237
+#: 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:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Amharc ar na Sonraí (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Faigh comhad CSV leis na sonraí seo"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Folaigh Imeachtaí %s"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Taispeáin Imeachtaí %s"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Folaigh Imeachtaí Firefox"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Taispeáin Imeachtaí Firefox"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Laghdaigh an Graf"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Leathnaigh an Graf"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Athraigh méid an ghraif"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Úsáideoirí Gníomhacha Laethúla"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Feidhmchlár"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Saincheaptha"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "�osluchtuithe"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Córas Oibriúcháin"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Stádas an Bhreiseáin"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Achoimre"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Leagan an Bhreiseáin"
 
@@ -4097,13 +6247,13 @@ msgstr "Anaithnid"
 msgid "statistics_longnames_version"
 msgstr "Leagan an Bhreiseáin"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "Níl go leor sonraí faoi láthair chun an graf seo a thaispeáint. Déan "
 "iarracht eile ar ball."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "Níl aon sonraí againn le haghaidh do bhreiseáin fós.  Déan iarracht eile i "
@@ -4116,13 +6266,13 @@ msgstr ""
 "sonraí is déanaí ar iarraidh fad a oibríonn ár gcuid scripteanna chun an "
 "fhaisnéis seo a nuashonrú. Déan iarracht eile faoi cheann cúpla nóiméad."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr ""
 "Tá Painéal na Staitisticí díchumasaithe faoi láthair.  Déan iarracht eile ar "
 "ball."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "Tá JavaScript de dhíth chun Painéal na Staitisticí a fheiceáil."
 
@@ -4137,36 +6287,36 @@ msgstr "Nuashonraíodh do chuid socruithe!"
 msgid "statistics_pagetitle"
 msgstr "Painéal na Staitisticí"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Úsáideoirí Gníomhacha Laethúla"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "�osluchtuithe Laethúla"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Súmáil Isteach"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Súmáil isteach mí amháin"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Súmáil Amach"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Súmáil amach mí amháin"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Achoimre laethúil ar staitisticí do %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Fotha RSS le sonraí achoimrithe"
 
@@ -4207,23 +6357,23 @@ msgstr "Poiblí"
 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:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Athraigh Socruithe"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "�irigh é seo mar eolas faoi rún."
 
-#: views/statistics/addon.thtml:233
+#: 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:229
+#: 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:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Faoi Ghlas"
 
@@ -4240,7 +6390,7 @@ msgstr "Sábháil na Socruithe"
 msgid "statistics_settings_title"
 msgstr "Socruithe Phainéal na Staitisticí le haghaidh %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Díghlasáilte"
 
@@ -4264,7 +6414,7 @@ msgstr "An"
 msgid "statistics_shortnames_version"
 msgstr "Leag"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: 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á"
 
@@ -4272,37 +6422,37 @@ msgstr "Meánlíon na n�osluchtuithe sa lá"
 msgid "statistics_summary_downloads_heading"
 msgstr "�osluchtuithe"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Líon sa lá is déanaí"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: 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í"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "�osluchtuithe Iomlána"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: 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:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Gan sonraí fós"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: 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á"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Athrú ón líon roimhe seo"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s ar %2$s"
@@ -4311,17 +6461,17 @@ msgstr "%1$s ar %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Úsáideoirí Gníomhacha Laethúla"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Úsáideoirí Gníomhacha Laethúla"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Ar %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Staitisticí %1$s"
@@ -4347,6 +6497,7 @@ 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:49
 msgid "user_del_account_deleted"
 msgstr ""
@@ -4367,11 +6518,13 @@ 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:62
 msgid "user_del_error_addons"
 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:69
 msgid "user_del_error_addons_more_questions"
 msgstr "Má tá ceisteanna eile agat, téigh i dteagmháil le %1$s."
@@ -4388,6 +6541,7 @@ 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:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4399,6 +6553,7 @@ 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:93
 msgid "user_del_header_delete_account"
 msgstr "Scrios Cuntas %1$s"
@@ -4424,6 +6579,7 @@ msgstr ""
 "leatsa a thuilleadh."
 
 # %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4439,6 +6595,7 @@ msgid "user_deleted_nickname"
 msgstr "Úsáideoir Scriosta"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4454,6 +6611,9 @@ msgstr "Scrios cuntas úsáideora"
 # 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4474,6 +6634,7 @@ msgstr ""
 "-- Foireann Breiseáin %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4500,6 +6661,8 @@ msgstr "Go raibh maith agat as liostáil le Breiseáin %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
 #, php-format
 msgid "user_email_pwreset"
@@ -4527,6 +6690,7 @@ msgid "user_emailchange_error"
 msgstr "Earráid!"
 
 # %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4537,6 +6701,7 @@ msgid "user_emailchange_success"
 msgstr "D'éirigh leis!"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4706,6 +6871,7 @@ msgid "user_register_amo_link"
 msgstr "Breiseáin %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"
@@ -4715,6 +6881,7 @@ msgstr ""
 "mBreiseáin %2$s."
 
 # %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4732,6 +6899,7 @@ msgid "user_register_congratulations"
 msgstr "Comhghairdeas! Cruthaíodh do chuntas úsáideora."
 
 # %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"
@@ -4741,6 +6909,7 @@ msgstr ""
 "chuig an seoladh ríomhphoist thuas."
 
 # %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4801,6 +6970,7 @@ 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:110
 msgid "users_info_reviews_by_user"
 msgstr "Léirmheasanna le %s"
@@ -4811,6 +6981,8 @@ msgstr "Logáil Isteach"
 
 # %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4821,6 +6993,8 @@ msgstr ""
 
 # %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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4836,3 +7010,33 @@ msgstr "Athshocrú Focail Faire"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Clárú Úsáideora Nua"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "An leagan is déanaí atá comhoiriúnach do"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "search_form_submit"
+#~ msgstr "Search"
diff --git a/site/app/locale/he/LC_MESSAGES/messages.po b/site/app/locale/he/LC_MESSAGES/messages.po
index 769a0af..68d1031 100644
--- a/site/app/locale/he/LC_MESSAGES/messages.po
+++ b/site/app/locale/he/LC_MESSAGES/messages.po
@@ -23,6 +23,10 @@ msgstr ""
 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 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
@@ -51,38 +55,34 @@ msgstr "ציבורי"
 msgid "a_header_sandbox"
 msgstr "�רגז החול"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, fuzzy, php-format
-msgid "added"
-msgstr "Added %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "%s עודכן"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "גירסה %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "סה\"כ הורדות"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
@@ -99,22 +99,22 @@ msgstr "לפי עמוד"
 msgid "addon_list_sortby"
 msgstr "מיין לפי:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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: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: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
@@ -123,7 +123,7 @@ msgstr "%1$s ל� זמין עבור %2$s."
 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -142,6 +142,7 @@ msgstr "סקירה:"
 msgid "addon_review_add_submit"
 msgstr "שלח �ת הסקירה שלך"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -175,23 +176,25 @@ msgstr "כן"
 msgid "addon_review_delete_header"
 msgstr "מחק סקירה"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "סקירה נמחקה בהצלחה."
 
+#. %s is the name of the add-on
 #: 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:534
+#. %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
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr "שי� לב: לפני שהסקירה שלך תוצג ב�תר, הי� תעבור ביקורת על־ידי עורך."
@@ -200,7 +203,7 @@ msgstr "שי� לב: לפני שהסקירה שלך תוצג ב�תר, הי� ת
 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:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
@@ -208,16 +211,16 @@ 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 addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -231,13 +234,13 @@ msgstr "תשובת מפתח:"
 msgid "addon_review_saved_successfully"
 msgstr "הסקירה שלך נשמרה בהצלחה. תודה!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, php-format
@@ -262,11 +265,14 @@ msgstr "Previous Add-on"
 msgid "addon_version_permalink"
 msgstr "קישור קבוע לגירסה זו"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "הגירסה ה�חרונה תו�מת ל-"
+#. %1 is the current Application name (e.g. Firefox)
+#. %2 is the Application's version number
+#: 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:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "לך"
 
@@ -274,20 +280,21 @@ msgstr "לך"
 msgid "addons_author_tooltip"
 msgstr "צפה בפרופיל המחבר"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
@@ -296,7 +303,7 @@ msgstr "Browse %1$s Themes :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "הוסף סקירה"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "פרטי� מתקדמי�"
 
@@ -304,11 +311,11 @@ msgstr "פרטי� מתקדמי�"
 msgid "addons_display_categories"
 msgstr "קטגוריות"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "סקירה מפורטת"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "ל� �והב"
@@ -317,66 +324,70 @@ msgstr "ל� �והב"
 msgid "addons_display_edit_review"
 msgstr "ערוך סקירה"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "לתוספת זו יש מדיניות פרטיות."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "הערות המפתח"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "דף הבית"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "סקירות"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "תמיכה"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "�והב"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "תי�ור �רוך"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 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:421
+#. %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
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "תוספות �חרות של %1$s"
 msgstr[1] "Other add-ons by these authors"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -386,7 +397,9 @@ msgstr ""
 "ההרחבות לצפות בכתובת הדו�\"ל שלך כש�תה מפרס� סקירה, ה� ל� יוכלו ליצור �יתך "
 "קשר כדי לבקש עוד פרטי� �ו להודיע לך על תיקון הב�ג בגירס�ות הב�ות."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -396,7 +409,8 @@ msgstr ""
 "למפתחי ההרחבות לצפות בכתובת הדו�\"ל שלך כש�תה מפרס� סקירה, ה� ל� יוכלו ליצור "
 "�יתך קשר כדי לבקש עוד פרטי� �ו להודיע לך על תיקון הב�ג בגירס�ות הב�ות."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -406,66 +420,66 @@ msgstr ""
 "ההרחבות לצפות בכתובת הדו�\"ל שלך כש�תה מפרס� סקירה, ה� ל� יוכלו ליצור �יתך "
 "קשר כדי לבקש עוד פרטי� �ו להודיע לך על תיקון הב�ג בגירס�ות הב�ות."
 
-#: views/addons/display.thtml:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "דרג"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "בקר ב<a href=\"%1$s\">�יזור התמיכה</a> כדי לגלות �יפה ניתן לקבל  סיוע לתוספת "
 "זו."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "שמור"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "הצג כל הסקירות (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "צפה בכל הגירס�ות"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "היסטורית גירס�ות מל�ה"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "הצג קוד מקור"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "צפה בסטיסטיקות"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "מה �תה חושב?"
 
@@ -475,7 +489,7 @@ msgstr "עובד ע�:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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 "מ�ת"
@@ -486,10 +500,11 @@ msgstr "מ�ת"
 msgid "addons_home_feature_head"
 msgstr "ההמלצות שלנו"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -504,7 +519,9 @@ msgstr "החדש ביותר:"
 msgid "addons_home_other_applications"
 msgstr "יישומי� �חרי�"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -514,19 +531,20 @@ msgstr "יישומי� �חרי�"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -622,6 +640,7 @@ msgstr "עבור Mac OS X"
 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"
@@ -640,12 +659,13 @@ msgstr ""
 "השמעת קבצי מולטימדיה. תוספי� שוני� במקצת מהרחבות, שמשנות �ו מתווספות לפעולות "
 "הקיימות."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "תוספי� שכיחי� עבור %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "תוספי�"
 
@@ -656,29 +676,30 @@ msgstr "תוספי�"
 msgid "addons_plugins_support_documentation"
 msgstr "תיעוד לתמיכה: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr "%s דורש שתסכי� להסכ� המשתמש הב� כדי להמשיך בהתקנה:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "סקירות עבור %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 msgid "addons_recommended_introduction"
 msgstr ""
 "ע� �לף תוספות זמינות, יש משהו לכל �חד. בתור התחלה, הנה רשימה של כמה "
 "מהמעודפי� שלנו. תהנה!"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "תוספות מומלצות"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "תוספות מומלצות"
 
@@ -686,7 +707,7 @@ msgstr "תוספות מומלצות"
 msgid "addons_searchengines_additional_resources"
 msgstr "מש�בי� נוספי�"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "מרכז המפתחי� של מוזילה"
@@ -702,35 +723,35 @@ 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: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: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: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: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:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "מנועי חיפוש"
 
@@ -743,7 +764,7 @@ msgstr "תודה מיוחדת לפרוייקט Mycroft על עבודת� על מ
 msgid "addons_status_disabled"
 msgstr "Disabled"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 #, fuzzy
 msgid "addons_status_incomplete"
 msgstr "Incomplete Version"
@@ -787,11 +808,12 @@ msgstr ""
 "גירס�ות �לו מוצגות למטרות התייחסות ובדיקות. �תה מתבקש להשתמש תמיד בגירסה "
 "ה�חרונה של התוספת."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "היסטורית גירס�ות ע� רישו� שינויי�"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "היסטורית הגירס�ות של %1$s"
@@ -804,6 +826,7 @@ msgstr "הוסף קבוצה"
 msgid "admin_group_delete_pagetitle"
 msgstr "מחק קבוצה"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -929,6 +952,7 @@ msgstr "התעל� מבדיקת גירסה"
 msgid "app_compat_older_firefox_only"
 msgstr "התוספת הז�ת מיועדת לגירס�ות ישנות יותר של פיירפוקס"
 
+#. %1$s and %2$s are URLs
 #: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
@@ -936,10 +960,13 @@ 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: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:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
@@ -951,23 +978,23 @@ msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://firefox.co.il\">שדרג �ת פיירפוקס</a> כדי להשתמש בתוספת הזו"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "תוספות לפי ש�"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "התוספות החדשות ביותר"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "התוספות הפופולריות"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "תוספות לפי הדירוג"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "תוספות שעודכנו ל�חרונה"
 
@@ -999,7 +1026,7 @@ msgstr "עודכנו ל�חרונה ר�שונות"
 msgid "category_extra_mostpopular"
 msgstr "הפופולריות ביותר ר�שונות"
 
-# %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"
@@ -1010,12 +1037,20 @@ msgstr "הר�ה �ת כל %1$s"
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
+#. %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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 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:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
@@ -1055,6 +1090,8 @@ 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
 #: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
@@ -1083,6 +1120,10 @@ 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)
 #: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
@@ -1100,6 +1141,8 @@ msgstr ""
 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:69
 #, fuzzy
 msgid "compatibility_report_intro"
@@ -1113,6 +1156,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
@@ -1123,6 +1167,7 @@ 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
 #: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
@@ -1133,6 +1178,7 @@ 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
 #: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
@@ -1143,6 +1189,7 @@ 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
 #: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
@@ -1164,12 +1211,13 @@ msgstr "Information for Add-on Users"
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "למידע נוסף על תרומה, בבקשה ר�ה �ת %s שלנו."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "דף וויקי"
 
@@ -1211,23 +1259,35 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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/admin/addons_status.thtml:57
 msgid "datetime"
 msgstr "%e ב%B %Y, %H:%M"
@@ -1253,14 +1313,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1307,36 +1395,36 @@ msgstr "שלב חמישי: הצלחה"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "הגשת עזרה"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "תוספת נוטרלה בהצלחה"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "עריכת תוספת"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "תוספת �ופשרה בהצלחה"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "תי�ור התוספת"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "הסכ� משתמש (EULA)"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "דף הבית של התוספת"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "ש� התוספת"
 
@@ -1345,40 +1433,298 @@ msgstr "ש� התוספת"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "כותרת תצוגה מקדימה"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "מדיניות פרטיות "
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "סיכו� תוספת"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "דו�\"ל לתמיכה"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "כתובת �ינטרנט לתמיכה"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "הערות גירסה"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "הגשת תוספת"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "תוספת הוגשה בהצלחה!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1400,7 +1746,7 @@ msgstr ""
 " הגירסה הז�ת מוקמה ב�רגז החול  והי� מחכה לסקירה של בוחני �רגז החול ושל עורך "
 "התוספות של מוזילה. �תה תקבל הודעה בדו�\"ל כשהפעולה תבוצע."
 
-# %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"
@@ -1410,7 +1756,7 @@ msgstr "×�תה יכול לקרו×� עוד ×�ודות מערכת הסקירה ש×
 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"
@@ -1430,16 +1776,16 @@ msgstr "שליחת התוספת שלך הסתיימה בהצלחה."
 msgid "devcp_addon_submission_trusted_public"
 msgstr "משו� שהתוספת שלך �מינה, הגירסה הז�ת �וטומטית מ�ושרת ל�זור הציבורי."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "שלח תוספת"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1449,7 +1795,7 @@ msgstr "×�תה ×�ולי תרצה %s להגדיל ×�ת ההתעניינות בת×
 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"
@@ -1478,10 +1824,102 @@ msgstr "הב�"
 msgid "devcp_change_addontype"
 msgstr "שנה סוג תוספת:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "הערות המפתח עודכנו."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "הוסף תצוגה מקדימה"
@@ -1574,6 +2012,7 @@ msgstr "כתובת ×�ינטרנט לתמיכה ל×� סופקה על ידי המ×
 msgid "devcp_details_trusted"
 msgstr "�ומת"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1602,6 +2041,7 @@ msgstr ""
 "מה�תר והי� ל� תופיע במנהל העידכוני�. התוספת למעשה תמחק, למרות שתוכל לחזור "
 "לכ�ן ול�פשר �ותה שוב מתי שתרצה."
 
+#. %s is the name of an add-on
 #: views/developers/disable.thtml:55
 #, php-format
 msgid "devcp_disable_disable_title"
@@ -1621,11 +2061,65 @@ 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"
+msgstr "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "הוסף מחבר"
@@ -1638,10 +2132,297 @@ msgstr "כתובת דו�\"ל של המחבר"
 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 "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+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 "מחברי�"
@@ -1707,6 +2488,206 @@ msgstr "שפת מטרה"
 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: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 "עדכן"
@@ -1717,11 +2698,66 @@ 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 "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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+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
 #, php-format
@@ -1730,7 +2766,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "סקירות מרוסנות (%s)"
 msgstr[1] "סקירות מרוסנות (%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
 #, php-format
@@ -1739,7 +2775,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "תוספות שהוגשו (%s)"
 msgstr[1] "תוספות שהוגשו (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1752,8 +2788,8 @@ msgstr[1] "עדכוני� ממתיני� (%s)"
 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"
@@ -1779,29 +2815,30 @@ msgstr "הערות לסוקר"
 msgid "devcp_editversion_submit_update"
 msgstr "עדכן"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: controllers/developers_controller.php:1992
 msgid "devcp_error_addonname_not_unique"
 msgstr ""
 "הש� עבור התוספת שלך כבר רשו� במ�גר הנתוני�. בבקשה היה בטוח ש: <br /"
@@ -1809,19 +2846,33 @@ msgstr ""
 "מתו�מי�.</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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "ר�ה בבקשה %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 "עמוד זה"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+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"
@@ -1829,7 +2880,7 @@ msgstr ""
 "קובץ ההרחבה הזה (%s) �ינו מורשה עבור סוג התוספת שנבחר. השתמש בבקשה ב�חד "
 "מהב�י�: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "�ין מזהי קובץ (GUIDs) תו�מי�"
 
@@ -1858,19 +2909,22 @@ msgstr "חריגה מגודל ההעל�ה המרבי"
 msgid "devcp_error_http_nofile"
 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:401
 #, php-format
 msgid "devcp_error_icon_extension"
 msgstr ""
 "קובץ ההרחבה הזה (%s) �ינו מורשה עבור הצלמית. השתמש בבקשה ב�חד מהב�י�: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "�ין נוכחות install.rdf."
 
@@ -1878,21 +2932,26 @@ msgstr "�ין נוכחות install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "השגי�ות הב�ות נמצ�ו ב- install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "בחר בבקשה סוג תוספת חוקי."
 
+#. %$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 "%s הי� ל� גירסה חוקית עבור %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "הזהות של התוספת ל� חוקית: %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"
@@ -1908,6 +2967,7 @@ msgstr ""
 msgid "devcp_error_invalid_version_spaces"
 msgstr "גירסת התוספת הזו �ינה חוקית: גירס�ות �ינן יכולות להכיל רווחי�s."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1917,6 +2977,7 @@ msgstr "השגי�ה הב�ה התרחשה כשנותח install.rdf: %s"
 msgid "devcp_error_move_file"
 msgstr "ל� ניתן להעביר קובץ"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1939,15 +3000,15 @@ msgstr "ל� נמצ�ה זהות עבור תוספת זו ב-install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "ל� נבחרה פלטפורמה"
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "�תה צריך לספק �ת הפרטי� הנדרשי� על מנת להגיש."
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "�תה ל� יכול להגיש תוספת קד�-שחרור."
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "�תה יכול להגיש רק תוספות שכרגע ב�רגז החול."
 
@@ -1959,19 +3020,21 @@ msgstr "בחר בבקשה לפחות קטגוריה �חת."
 msgid "devcp_error_one_user"
 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"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
 msgid "devcp_error_saving"
 msgstr "התרחשה שגי�ה בניסיון לשמור �ת הנתוני� שלך."
 
-#: controllers/developers_controller.php:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "�ין לך רשות לעדכן �ת התוספת הז�ת."
 
@@ -1987,7 +3050,7 @@ msgstr ""
 "תוספת ל� יכולה להשתמש בכתובת עדכון חיצונית. בבקשה הסר ז�ת מ-install.rdf ונסה "
 "שוב."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "העלה קובץ בבקשה."
@@ -2206,7 +3269,7 @@ msgstr "התוספות שלי"
 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"
@@ -2249,33 +3312,68 @@ msgstr "שלח תוספת"
 msgid "devcp_myaddons_title"
 msgstr "כלי מפתח"
 
+#. %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 "חזרה לפרטי תוספת"
 
-# %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"
 
-# %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: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 ""
 "תצוגה זו �ינה ברירת המחדל מפני שתצוגה מקדימה �חרת נבחרה �וטומטית להיות ברירת "
 "המחדל."
 
-# %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"
@@ -2290,9 +3388,14 @@ msgstr ""
 "הפיכת התצוגה הזו לברירת המחדל  תסיר �ת מצב ברירת המחדל מתצוגת ברירת המחדל "
 "הנוכחית."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2321,6 +3424,60 @@ msgstr "עריכת תצוגה מקדימה"
 msgid "devcp_preview_updated_successfully"
 msgstr "תצוגה מקדימה עודכנה בהצלחה."
 
+#: 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 ""
@@ -2332,10 +3489,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "הוספת תצוגה מקדימה"
 
+#: 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 "ערוך תצוגה מקדימה"
 
+#: 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 "קובץ תצוגה מקדימה"
@@ -2344,6 +3511,34 @@ msgstr "קובץ תצוגה מקדימה"
 msgid "devcp_previews_label_makedefault"
 msgstr "קבע �ת זה כברירת מחדל לתמונת תצוגה מקדימה."
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "מחק תצוגה מקדימה"
@@ -2360,55 +3555,170 @@ msgstr "ערוך תצוגה מקדימה"
 msgid "devcp_previews_submit_upload"
 msgstr "העלה תצוגה מקדימה"
 
+#: 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 "שגוי?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "ה�� �תה בטוח שברצונך למחוק קובץ זה?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
+
+#: 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 "דלג על סיקור התוספת הנוכחית"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> משתמשי� פעילי� ליו�"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> סך ההורדות"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> הורדות לשבוע"
 
-#: controllers/developers_controller.php:1481
+#: 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 "שליחת תוספות כרגע מנוטרלת. בדוק בבקשה מ�וחר יותר."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "�ני מסכי�"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "�ני מסרב"
 
@@ -2424,11 +3734,11 @@ msgstr "מנוטרל"
 msgid "devcp_summary_header_trusted"
 msgstr "מ�ומת"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2438,7 +3748,7 @@ msgstr "�ין לך �ף תוספת. לחץ %s כדי לשלוח �חת."
 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"
@@ -2448,30 +3758,674 @@ msgstr "בבקשה ווד� ש%s לערכת הנוש� שלך."
 msgid "devcp_theme_upload_preview_link"
 msgstr "העלת תצוגה מקדימה"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "ר�ה %s  להתייחסות."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "דף זה"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "ערוך גירסה"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "גירסה עודכנה בהצלחה."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "תוספת זו מנוטרלת"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "סינון"
@@ -2480,7 +4434,7 @@ msgstr "סינון"
 msgid "editorcp_logs_filter_by"
 msgstr "סינון לפי סוג/פעולה"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "רישו� ה�ירועי�"
 
@@ -2532,6 +4486,7 @@ msgstr "הסתר תגובות"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "הצג תגובות"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2541,7 +4496,7 @@ msgstr "הצג ערכי� בין %s ל- %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "ל� נמצ�ו סקירות בפרק הזמן."
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "רישו� סקירה"
 
@@ -2565,24 +4520,24 @@ msgstr "פעילות עורך �חרונה"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "סה\"כ סקירות"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "סקירת תוספת"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "נ� השל� �ת השדות הב�י�:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "בחר בבקשה לפחות קובץ �חד לסקירה."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "סקירות עצמיות �ינן מותרות."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "תוכנה חיצונית"
 
@@ -2594,39 +4549,39 @@ msgstr "הוסף מ�פיין"
 msgid "editors_featured_add_feature_submit"
 msgstr "הוסף"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "הוספת המ�פיין הצליחה."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "הסרת המ�פיין נכשלה."
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "הסרת המ�פיין הצליחה."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "�יפיון תוספות"
 
@@ -2658,39 +4613,40 @@ msgstr "מדיניות תוספת"
 msgid "editors_notice_filter_session"
 msgstr "מסנני� �לו יש�רו במקומ� בהפעלה זו �ו עד שימחקו"
 
-# %1 is the queue mode
+#. %1 is the queue mode
 #: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "כרגע �ין %s תוספות לסקירה."
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "יו�"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "שעה"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "דקה"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "לוח בקרה לעורכי�"
 
-#: controllers/editors_controller.php:286
+#. %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 "%s בלבד"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "שחרור מקדי�"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2704,19 +4660,24 @@ msgstr "מחק"
 msgid "editors_queue_submit_filter"
 msgstr "סנן"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "כל תורות הסקירות כרגע מנוטרלי�. בדוק בבקשה מ�וחר יותר."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "פעולת סיקור"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "דחוף לציבורי"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "דרושה סקירת-על"
 
@@ -2724,29 +4685,37 @@ msgstr "דרושה סקירת-על"
 msgid "editors_review_action_sandbox"
 msgstr "שמור ב�רגז החול"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "הערות סקירה"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "זה יסמן �ת התוספת ו�ת הגירסה והקבצי� ה�חרוני� שלה כציבוריי�. גירס�ות עתידיות "
 "יופנו ל�רגז החול עד שיסוקרו בידי עורך."
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "זה ישמור �ת התוספת ב�רגז החול."
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr "זה י�שר לגירסת �רגז החול של התוספת הציבורית להופיע בצד הציבורי."
 
-#: views/editors/review.thtml:162
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "זה יגרו� שגירסת �רגז החול של התוספת הציבורית תש�ר ב�רגז החול."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "�� יש לך ד�גות �ודות ה�בטחה וזכויות היוצרי� של התוספת הזו �ו ד�גות �חרות "
@@ -2773,15 +4742,15 @@ msgstr "קטגוריות:"
 msgid "editors_review_header_compatibility"
 msgstr "ת�ימות:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "תי�ור"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "הערות המפתח"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "הסכ� משתמש (EULA)"
 
@@ -2789,85 +4758,111 @@ msgstr "הסכ� משתמש (EULA)"
 msgid "editors_review_header_files"
 msgstr "קבצי�:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "היסטוריית פריט"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "הודעת הגשה"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "תצוגות מקדימות"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "סקירת %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "הערות לסוקר"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "סיכו�"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "הערות גירסה"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "סקירת מנהל"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "הגשה �ושרה/ציבורי"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "הגשה נדחתה/�רגז החול"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "ל� נמצ�ו ערכי סקירה קודמי�."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "סקירת מנהל"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "מ�ושר/ציבורי"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "נדחה/�רגז חול"
 
-#: views/editors/review.thtml:198
+#. 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 "יישומי�:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "�ו בחר תגובה מוכנה:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "תגובות:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "מערכות הפעלה:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "למעלה"
 
@@ -2876,7 +4871,7 @@ msgstr "למעלה"
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "ל� נמצ�ו סקירות."
 
@@ -2885,42 +4880,49 @@ msgstr "ל� נמצ�ו סקירות."
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "בצע פעולה"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "פעולה"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "תגובות"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "ת�ריך"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "סוקר"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "גירסה/קובץ"
 
-#: controllers/editors_controller.php:411
+#: 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 "הסקירה עובדה בהצלחה."
 
@@ -2946,7 +4948,7 @@ msgstr "פעולה"
 msgid "editors_reviews_in_reply_to"
 msgstr "בתגובה ל:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "הסקירות עובדו בהצלחה!"
 
@@ -2958,23 +4960,23 @@ msgstr "ל� קיימות סקירות לניהול."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "עבד סקירות"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "�תר מסוי�"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "חדש"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "עודכן"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "ישו� נבדק"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "מערכות הפעלה שנבדקו"
 
@@ -3015,17 +5017,20 @@ msgstr "פלטפורמות"
 msgid "editors_th_submissiontypes"
 msgstr "סוגי הגשה"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s ימי�"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s שעות"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s דקות"
@@ -3034,8 +5039,8 @@ msgstr "%s דקות"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "�ין גישה"
 
@@ -3043,12 +5048,13 @@ msgstr "�ין גישה"
 msgid "error_access_denied_message"
 msgstr "�ינך רש�י לצפות בדף זה."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3058,18 +5064,19 @@ msgstr "�ינך רש�י לצפות בדף זה."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "התוספת ל� נמצ�ה!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "תוספת זו �ינה ניתנת לצפייה כ�ן."
 
@@ -3077,7 +5084,7 @@ msgstr "תוספת זו �ינה ניתנת לצפייה כ�ן."
 msgid "error_addon_selfreview"
 msgstr "�תה ל� יכול לסקור תוספת שלך."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "�ין תוספות בקטגוריה!"
 
@@ -3099,24 +5106,25 @@ msgstr "זוהי �ינה כתובת דו�\"ל חוקית."
 msgid "error_field_required"
 msgstr "שדה זה ל� יכול להיות ריק."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "קובץ ל� נמצ�!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "שגי�ת קובץ: %s ל� קיי�."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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 "קיימות שגי�ות בטופס זה. בבקשה תקן �ותן ושלח שוב."
@@ -3133,16 +5141,18 @@ 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3161,7 +5171,7 @@ msgstr "הערה"
 msgid "error_preview_notfound"
 msgstr "תצוגה מקדימה ל� נמצ�ה!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "�תה חייב לבחור דירוג."
 
@@ -3211,8 +5221,8 @@ msgstr "נ� ל�מת �ת החשבון לפני ביצוע הפעולה."
 msgid "error_username_or_pw_wrong"
 msgstr "ש� משתמש �ו סיסמה ל� נכוני�!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "גירסה ל� נמצ�ה!"
 
@@ -3224,13 +5234,14 @@ msgstr "הוכנסה סיסמה שגוייה!"
 msgid "feature_learnmore"
 msgstr "למד עוד"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "למד עוד על  %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3242,6 +5253,45 @@ msgstr[1] "סקירות"
 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "כל הזכויות שמורות."
@@ -3269,7 +5319,6 @@ msgstr "לך"
 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
 msgid "footer_other_languages"
 msgstr "שפות �חרות:"
@@ -3278,7 +5327,7 @@ msgstr "שפות �חרות:"
 msgid "footer_privacy_policy"
 msgstr "הצהרת פרטיות"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "שמור"
 
@@ -3286,7 +5335,7 @@ msgstr "שמור"
 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:110
 msgid "general_addontype_dict_plural"
 msgstr "מילוני�"
@@ -3295,7 +5344,7 @@ msgstr "מילוני�"
 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:108
 msgid "general_addontype_extension_plural"
 msgstr "הרחבות"
@@ -3304,7 +5353,7 @@ msgstr "הרחבות"
 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "חבילות שפה (תוספות)"
@@ -3313,7 +5362,7 @@ msgstr "חבילות שפה (תוספות)"
 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "חבילות שפה (תוכנות)"
@@ -3322,7 +5371,7 @@ msgstr "חבילות שפה (תוכנות)"
 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "תוספי�"
@@ -3331,7 +5380,7 @@ msgstr "תוספי�"
 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:111
 msgid "general_addontype_search_plural"
 msgstr "מנועי חיפוש"
@@ -3340,11 +5389,12 @@ msgstr "מנועי חיפוש"
 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:109
 msgid "general_addontype_theme_plural"
 msgstr "ערכות נוש�"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3375,12 +5425,12 @@ msgid "header_navlink_addons"
 msgstr "�תר התוספות של Mozilla"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "התנתקות"
 
@@ -3388,36 +5438,41 @@ msgstr "התנתקות"
 msgid "header_navlink_myaccount"
 msgstr "החשבון שלי"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "הרשמה"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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
+#. %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 "<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/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "הוסף  ל-%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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3440,7 +5495,7 @@ msgid "langtools_download_langpack"
 msgstr "הורד חבילת שפה"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "מילוני� וחבילות שפה"
 
@@ -3530,7 +5585,7 @@ msgstr "ערכות נוש�"
 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:214
 msgid "other_users"
 msgstr "�חרי�"
@@ -3545,42 +5600,41 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_experimental_addons"
 msgstr "Experimental Add-ons"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 #, fuzzy
 msgid "page_title_policy"
 msgstr "Add-ons Policy"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 #, fuzzy
 msgid "page_title_privacy"
 msgstr "Mozilla Privacy Policy"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 #, fuzzy
 msgid "page_title_review_guide"
 msgstr "Review Guidelines"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 #, fuzzy
 msgid "page_title_sandbox"
 msgstr "Sandbox Review System"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 #, fuzzy
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
@@ -3600,6 +5654,7 @@ msgstr ""
 "לפחות �חת מהתוכנות הב�ות נתמכות. רק הגירס�ות הרשומות בהמשך מותרות לתוכנות "
 "�לו."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3607,6 +5662,8 @@ 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:92
 msgid "pages_appversions_required_files_link"
 msgstr "כ�ן"
@@ -3615,7 +5672,6 @@ msgstr "כ�ן"
 msgid "pages_appversions_versions"
 msgstr "גירס�ות"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "חזור לעמוד הקוד�"
 
@@ -3627,7 +5683,7 @@ 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"
@@ -3652,8 +5708,8 @@ msgstr "הכנס כ�ן �ת התשובה שלך:"
 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
+#. %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"
@@ -3661,8 +5717,8 @@ 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
+#. %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"
@@ -3678,7 +5734,7 @@ msgstr "ה�� �תה �נושי?"
 msgid "recaptcha_whatsthis"
 msgstr "מה זה?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "סימון על שגי�ה בסקירה זו!"
 
@@ -3708,7 +5764,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "תודה; סקירה זו סומנה ל�ישור העורך."
 
@@ -3721,7 +5777,7 @@ 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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3735,21 +5791,22 @@ msgstr ""
 "הולמת ו�ל תפרס� מידע �ישי.</li></ul><p>קר� �ת <a href=\"%2$s\">קוי� מנחי� "
 "לסקירה</a> בשביל עוד פרטי� על סקירות של משתמשי�.</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 "סקירות עבור %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "תוספות מככבות"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "תוספות חדשות ביותר"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "תוספות שעודכנו"
 
@@ -3786,6 +5843,7 @@ msgstr "כל מנועי החיפוש"
 msgid "search_landing_browse_search_engines"
 msgstr "עיין במנועי חיפוש"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3805,12 +5863,13 @@ msgstr "חפש תוספות"
 msgid "search_rss_description"
 msgstr "הזנת תוצ�ות חיפוש"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "תוצ�ות חיפוש עבור %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "כלי מנהל"
 
@@ -3818,7 +5877,7 @@ msgstr "כלי מנהל"
 msgid "sidebar_navlink_developer_tools"
 msgstr "כלי מפתח"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "כלי עריכה"
 
@@ -3826,6 +5885,7 @@ msgstr "כלי עריכה"
 msgid "sidebar_navlink_welcome"
 msgstr "ברוך הב�"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3863,6 +5923,7 @@ msgstr "ערכת נוש�"
 msgid "sidebar_pitch_updated_addons"
 msgstr "תוספות שעודכנו"
 
+#. %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
@@ -3874,7 +5935,7 @@ msgstr "%1$s KB"
 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3892,24 +5953,32 @@ msgstr "כלי מפתח"
 msgid "statistics_addon_switch"
 msgstr "החלף תוספת"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "חודש, יו�"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "חודש, יו�, שנה"
 
+#. 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:147 views/statistics/addon.thtml:158
+#: 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3951,7 +6020,7 @@ msgstr "לוח סטיסטיקות"
 msgid "statistics_index_view_button"
 msgstr "צפה בסטיסטיקות"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
@@ -3969,7 +6038,7 @@ msgstr "הסר �ת התרשי� הזה"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
@@ -3979,104 +6048,109 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s נמצ�ו בטווח"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "הוסף תרשי�"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "הוסף תרשי� �חר לגרף זה"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "הסתר מונה כללי"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "הצג מונה כללי"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "צפה במידע (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "הורד קובץ CSV ע� המידע הזה"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "הסתר �ת ה�ירועי� של %s "
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "הצג �ת ה�ירועי� של %s "
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "הצג �ת ת�ריכי השחרור של התוספות על התרשימי�"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "הסתר �ת �ירועי פיירפוקס"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "הצג �ת �רועי פיירפוקס"
 
-#: controllers/statistics_controller.php:241
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "הצג �ת ת�ריכי השחרור של פיירפוקס על התרשימי�"
 
-#: controllers/statistics_controller.php:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "צמצ� גרף"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "הרחב גרף"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "שנה גודל גרף"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "פעילות משתמשי� יומית"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "יישו�"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "חופשי"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "הורדות"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "מערכת הפעלה"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "מצב תוספת"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "סיכו�"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "גירסת תוספת"
 
@@ -4100,11 +6174,11 @@ msgstr "ל� ידוע"
 msgid "statistics_longnames_version"
 msgstr "גירסת תוספת"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr "�ין עדיין מספיק מידע להציג בגרף זה. שוב בבקשה מ�וחר יותר."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr "עדיין �ין לנו מידע על התוספת שלך. חזור בבקשה עוד מספר ימי�."
 
@@ -4114,11 +6188,11 @@ msgstr ""
 "הסטיסטיקות של התוספת כרגע בתהליך עדכון. המידע ה�חרון �ולי יהיה חלקי "
 "כשהתסריטי� שלנו עובדי� כדי לעדכן �ותו. בדוק שוב בעוד כמה דקות."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "לוח הסטיסטיקות כרגע מנוטרל. נסה שוב מ�וחר יותר."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "ג'�ווהסקריפט צריך להיות מ�ופשר כדי לצפות בגרפי� בלוח הסטיסטיקות."
 
@@ -4133,36 +6207,36 @@ msgstr "ההגדרות שלך התעדכנו!"
 msgid "statistics_pagetitle"
 msgstr "לוח סטיסטיקות"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "משתמשי� פעילי� ליו�"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "הורדות ליו�"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "התקרבות"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "התקרבות לחודש"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "התרחקות"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "התרחקות לחודש"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "סיכו� יומי של סטיסטיקות עבור %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "עידכוני RSS של סיכו� המידע"
 
@@ -4201,23 +6275,23 @@ msgstr "ציבורי"
 msgid "statistics_settings_access_public_description"
 msgstr "כל �חד יכול לצפות בסטיסטיקות של התוספת הז�ת"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "שנה הגדרות"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "בבקשה התייחס למידע זה כחסוי."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "כרגע לוח זה הו� <b>פרטי</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "כרגע לוח זה הו� <b>ציבורי</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "ננעל"
 
@@ -4234,7 +6308,7 @@ msgstr "שמור הגדרות"
 msgid "statistics_settings_title"
 msgstr "מ�פייני לוח סטיסטיקות עבור %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "שוחרר"
 
@@ -4258,7 +6332,7 @@ msgstr "ל� ידוע"
 msgid "statistics_shortnames_version"
 msgstr "גיר'"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "מומצע הורדות יומי"
 
@@ -4266,37 +6340,37 @@ msgstr "מומצע הורדות יומי"
 msgid "statistics_summary_downloads_heading"
 msgstr "הורדות"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "�ין עדיין מידע"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s ב%2$s"
@@ -4305,17 +6379,17 @@ msgstr "%1$s ב%2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "פעילות משתמשי� יומית"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: 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:147
+#: 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:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "סטיסטיקות של %1$s"
@@ -4340,7 +6414,7 @@ msgstr "שינוי סיסמה"
 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:49
 #, fuzzy
 msgid "user_del_account_deleted"
@@ -4364,7 +6438,7 @@ msgstr "Confirm Password"
 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:62
 #, fuzzy
 msgid "user_del_error_addons"
@@ -4374,7 +6448,7 @@ msgstr ""
 "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:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
@@ -4392,7 +6466,7 @@ msgstr ""
 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:83
 #, fuzzy
 msgid "user_del_error_unknown"
@@ -4405,7 +6479,7 @@ msgstr ""
 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:93
 #, fuzzy
 msgid "user_del_header_delete_account"
@@ -4435,7 +6509,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
@@ -4454,7 +6528,7 @@ msgstr "I understand that this step cannot be undone."
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4467,9 +6541,9 @@ msgstr ""
 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
+#. 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"
@@ -4488,7 +6562,7 @@ msgstr ""
 "תודה שהצטרפת �ל �תר התוספות של %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4512,8 +6586,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "תודה שהצטרפת �ל Mozilla Add-ons"
 
-# This is the password reset email
-# %1 is the pw reset URL
+#. 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"
@@ -4539,7 +6613,7 @@ msgstr "�פס �ת הסיסמה שלך ב�תר התוספות"
 msgid "user_emailchange_error"
 msgstr "שגי�ה!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4549,7 +6623,7 @@ msgstr "×�שר בבקשה ×�ת שינו כתובת הדו×�\"ל שלך בתוס×
 msgid "user_emailchange_success"
 msgstr "בוצע בהצלחה!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4720,7 +6794,7 @@ msgstr "שלח קישור �יפוס סיסמה"
 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"
@@ -4728,7 +6802,7 @@ msgstr ""
 "קישור להפעלת החשבון שלך נשלח בדו�\"ל לכתובת %1$s. הינך נדרש ללחוץ על קישור "
 "זה לפני שתוכל להתחבר ל�תר התוספות של %2$s."
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4744,7 +6818,7 @@ msgstr "נשלח שוב �ת הודעת ה�ימות"
 msgid "user_register_congratulations"
 msgstr "ברכות! החשבון שלך נוצר בהצלחה."
 
-# %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"
@@ -4753,7 +6827,7 @@ msgstr ""
 "ההודעה בתור \"דו�ר זבל\" �ו \"ספ��\". �� יש צורך, �תה יכול לבקש ש%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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4808,7 +6882,6 @@ msgstr "כתובת דו�\"ל"
 msgid "users_info_homepage"
 msgstr "דף בית"
 
-# כינוי
 #: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "כינוי"
@@ -4818,7 +6891,7 @@ msgstr "כינוי"
 msgid "users_info_pagetitle"
 msgstr "פרטי משתמש עבור %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
@@ -4828,8 +6901,8 @@ msgstr "Reviews by %s"
 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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4838,8 +6911,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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4855,3 +6928,37 @@ msgstr "�יפוס סיסמת משתמש"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "הרשמת משתמש חדש"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "הגירסה ה�חרונה תו�מת ל-"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to an audio captcha
+#~ msgid "recaptcha_hardtoread"
+#~ msgstr ""
+#~ "�� זה קשה לקרו�, �תה יכול <a href=\"%1$s\">לנסות מילי� שונות</a> �ו <a "
+#~ "href=\"%2$s\">לשמוע מספרי�</a>במקו�."
diff --git a/site/app/locale/hu/LC_MESSAGES/messages.po b/site/app/locale/hu/LC_MESSAGES/messages.po
index 677f280..c424f09 100644
--- a/site/app/locale/hu/LC_MESSAGES/messages.po
+++ b/site/app/locale/hu/LC_MESSAGES/messages.po
@@ -22,6 +22,10 @@ msgstr ""
 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 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
@@ -50,38 +54,35 @@ msgstr "Nyilvános"
 msgid "a_header_sandbox"
 msgstr "Homokozó"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Hozzáadva: %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Frissítve: %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "%s verzió"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "letöltés összesen"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
@@ -98,22 +99,24 @@ msgstr "oldalanként"
 msgid "addon_list_sortby"
 msgstr "Rendezés:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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: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: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
@@ -123,6 +126,7 @@ 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -141,6 +145,7 @@ msgstr "Értékelés:"
 msgid "addon_review_add_submit"
 msgstr "Értékelés beküldése"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -174,23 +179,26 @@ msgstr "Igen"
 msgid "addon_review_delete_header"
 msgstr "Értékelés törlése"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 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:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "%s értékelésének szerkesztése"
 
 # %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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éma az értékelés megjelölésénél: A megjelölt értékelések megjegyzései "
 "10 és 100 karakter közötti hosszúságúak lehetnek; a karakterszám %1$s volt."
 
 # Removing an extra comma
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -202,6 +210,7 @@ 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:135
 #, php-format
 msgid "addon_review_others_by_user"
@@ -214,15 +223,17 @@ msgstr[1] ""
 "megtekintése."
 
 # %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -236,13 +247,14 @@ msgstr "A fejlesztő válasza:"
 msgid "addon_review_saved_successfully"
 msgstr "Az értékelését mentettük. Köszönjük!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, php-format
@@ -265,11 +277,15 @@ msgstr "Előző kiegészítő"
 msgid "addon_version_permalink"
 msgstr "�llandó hivatkozás erre a verzióra"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "A legújabb verzió kompatibilis:"
+# %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:118
+msgid "addon_versions_getlatestversion"
+msgstr "A legújabb verzió, amely még kompatibilis ezzel: %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Ugrás"
 
@@ -278,18 +294,22 @@ msgid "addons_author_tooltip"
 msgstr "A szerző profilja"
 
 # %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "Témák böngészése :: %1$s-kiegészítők"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "%s böngészése"
 
 # %1 is the name of the theme category (eg. Modern)
 # %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "%1$s témák böngészése :: %2$s-kiegészítők"
 
@@ -297,7 +317,7 @@ msgstr "%1$s témák böngészése :: %2$s-kiegészítők"
 msgid "addons_display_add_review"
 msgstr "Értékelés hozzáadása"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Részletek"
 
@@ -305,11 +325,11 @@ msgstr "Részletek"
 msgid "addons_display_categories"
 msgstr "Kategóriák"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "részletes értékelés"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Nem tetszett"
@@ -318,91 +338,101 @@ msgstr "Nem tetszett"
 msgid "addons_display_edit_review"
 msgstr "Értékelés szerkesztése"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Ez a kiegészítő rendelkezik adatvédelmi irányelvekkel."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Fejlesztői megjegyzések"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Honlap"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Értékelések"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Támogatás"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Szeretem"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Hosszú leírás"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Több kép"
 
 # %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:421
+#. %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] "%1$s további kiegészítői"
 msgstr[1] "További kiegészítők ezektől a szerzőktől"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: 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."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "Ehhez a kiegészítőhöz a fejlesztő a(z) %s helyen, illetve a(z) %s e-mail "
 "címen nyújt támogatást."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Értékelés"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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 "
@@ -410,50 +440,53 @@ msgstr ""
 "kapcsolatfelvételre a probléma megoldásához."
 
 # %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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
-#: views/addons/display.thtml:396 views/addons/display.thtml:400
+#. %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 ""
 "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:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Mentés"
 
-#: views/addons/display.thtml:415
+#: 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
-#: views/addons/display.thtml:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Minden értékelés (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Teljes verziótörténet"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Forrás megtekintése"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Statisztika megtekintése"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Mit gondol?"
 
@@ -463,7 +496,7 @@ msgstr "Kompatibilis:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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 ":"
@@ -474,10 +507,11 @@ msgstr ":"
 msgid "addons_home_feature_head"
 msgstr "Javasoljuk"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -492,7 +526,9 @@ msgstr "Legújabb:"
 msgid "addons_home_other_applications"
 msgstr "Más alkalmazások"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -502,19 +538,20 @@ msgstr "Más alkalmazások"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -610,6 +647,7 @@ msgstr "Mac OS X-re"
 msgid "addons_plugins_for_windows"
 msgstr "Windowsra"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -630,12 +668,13 @@ msgstr ""
 "bővítmények némileg különböznek a kiterjesztésektől, amelyek meglévő "
 "funkciót módosítanak vagy bővítenek."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "A %1$s legfontosabb bővítményei"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Bővítmények"
 
@@ -646,6 +685,7 @@ msgstr "Bővítmények"
 msgid "addons_plugins_support_documentation"
 msgstr "Támogató dokumentáció: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -654,23 +694,24 @@ msgstr ""
 "licencszerződést) a telepítés folytatása előtt:"
 
 # %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s előnézetei"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Javasolt kiegészítők"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Javasolt kiegészítők"
 
@@ -679,6 +720,7 @@ msgid "addons_searchengines_additional_resources"
 msgstr "További források"
 
 # link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
@@ -698,33 +740,39 @@ msgstr ""
 
 # %1 is "make your own" link
 # %2 is MDC link
+#. %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 "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: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: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: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:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Keresők"
 
@@ -738,7 +786,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Letiltva"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Nem teljes verzió"
 
@@ -776,11 +824,12 @@ 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."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Verziótörténet a módosítások naplójával"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s verziótörténete"
@@ -793,6 +842,7 @@ msgstr "Csoport hozzáadása"
 msgid "admin_group_delete_pagetitle"
 msgstr "Csoport törlése"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -918,16 +968,20 @@ msgstr "Verzió-ellenőrzés kihagyása"
 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: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: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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -940,23 +994,23 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Frissítse a Firefoxot</a> a kiegészítő "
 "használatához"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Kiegészítők név szerint"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Legújabb kiegészítők"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Népszerű kiegészítők"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Kiegészítők osztályzat szerint"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Nemrég frissített kiegészítők"
 
@@ -989,6 +1043,7 @@ 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:135 views/addons/category_landing.thtml:51
 #, php-format
 msgid "category_extra_see_all"
@@ -998,11 +1053,19 @@ msgstr "Minden %1$s megjelenítése"
 msgid "collection_not_found"
 msgstr "A gyűjtemény nem található!"
 
+#. %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"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
@@ -1035,6 +1098,8 @@ msgstr "A maxVersion módosítása feltöltés nélkül"
 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:130
 msgid "compatibility_developers_login_first"
 msgstr ""
@@ -1059,6 +1124,10 @@ msgstr "Kiegészítők állapotfelmérésének eredménye"
 msgid "compatibility_developers_retrieving"
 msgstr "A tárolt kiegészítők állapotának lekérdezése..."
 
+#. %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 %2$s felhasználó (az összes %3$s&#37;-a)"
@@ -1073,6 +1142,8 @@ msgstr ""
 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:69
 msgid "compatibility_report_intro"
 msgstr ""
@@ -1084,6 +1155,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alfaverziók"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "A %1$s alfaverzióival kompatibilis kiegészítők"
@@ -1092,6 +1164,7 @@ msgstr "A %1$s alfaverzióival kompatibilis kiegészítők"
 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:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
@@ -1102,6 +1175,7 @@ msgstr ""
 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:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "A %1$s legújabb verziójával kompatibilis kiegészítők"
@@ -1110,6 +1184,7 @@ msgstr "A %1$s legújabb verziójával kompatibilis kiegészítők"
 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:81
 msgid "compatibility_report_legend_other_description"
 msgstr "A %1$s egyik verziójával sem kompatibilis kiegészítők"
@@ -1127,12 +1202,13 @@ msgstr "Információk kiegészítő-felhasználóknak"
 msgid "compatibility_view_report"
 msgstr "Kompatibilitási jelentés"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: 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:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wikioldalunkat"
 
@@ -1174,18 +1250,27 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a> vonatkozik."
 
+#: 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>."
+
 # 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/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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
@@ -1193,7 +1278,10 @@ msgid "date"
 msgstr "%Y. %B %e."
 
 # date and time format string (strftime)
+#. 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 "%Y. %B %e., %I:%M %p"
@@ -1219,14 +1307,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 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"
@@ -1274,36 +1390,36 @@ msgstr "5. lépés: Siker"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Segítség a beküldéshez"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "A kiegészítő sikeresen le lett tiltva"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: 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:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "A kiegészítő sikeresen engedélyezve lett"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: 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:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: 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:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Kiegészítő neve"
 
@@ -1312,40 +1428,300 @@ msgstr "Kiegészítő neve"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Előnézet képfelirata"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Adatvédelmi nyilatkozat"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: 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:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Támogató e-mail cím"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "Támogató URL"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: 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:2683
-#: controllers/developers_controller.php:2684
+#: 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:2729
+#: 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: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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1369,6 +1745,7 @@ msgstr ""
 "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"
@@ -1379,6 +1756,7 @@ 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"
@@ -1401,16 +1779,17 @@ 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:1475
-#: controllers/developers_controller.php:1476
+#: 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:2375
+#: 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"
@@ -1421,6 +1800,7 @@ 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"
@@ -1449,10 +1829,102 @@ msgstr "Következő"
 msgid "devcp_change_addontype"
 msgstr "Kiegészítő típusának módosítása:"
 
-#: controllers/developers_controller.php:1402
+#: 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"
+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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Előnézet hozzáadása"
@@ -1545,6 +2017,7 @@ msgstr "A fejlesztő nem adott meg támogató URL-t."
 msgid "devcp_details_trusted"
 msgstr "Megbízható"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1574,6 +2047,7 @@ msgstr ""
 "ü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"
@@ -1594,11 +2068,65 @@ msgstr ""
 "é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"
+msgstr "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Szerző hozzáadása"
@@ -1611,10 +2139,297 @@ msgstr "Szerző e-mail címe"
 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:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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"
@@ -1680,6 +2495,206 @@ msgstr "Cél területi beállítások"
 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: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 "Frissítés"
@@ -1690,11 +2705,67 @@ 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"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Kiemelt kiegészítők"
 
 # %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1704,6 +2775,7 @@ msgstr[0] "Moderált értékelések (%s)"
 msgstr[1] "Moderált értékelések (%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
 #, php-format
@@ -1713,6 +2785,7 @@ msgstr[0] "Jelölt kiegészítők (%s)"
 msgstr[1] "Jelölt kiegészítők (%s)"
 
 # %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1727,6 +2800,8 @@ 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"
@@ -1752,29 +2827,30 @@ msgstr "Megjegyzések az értékelőnek"
 msgid "devcp_editversion_submit_update"
 msgstr "Frissítés"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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: "
@@ -1782,20 +2858,34 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Lásd %s referenciaként."
 
+#. 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 "ezt az oldalt"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, fuzzy, php-format
+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"
@@ -1803,7 +2893,7 @@ 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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Nem minden fájl GUID-ja egyezik"
 
@@ -1832,6 +2922,8 @@ msgstr "Túllépte a maximális feltöltési méretet"
 msgid "devcp_error_http_nofile"
 msgstr "Nincs fájl feltöltve"
 
+#. %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"
@@ -1839,14 +2931,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:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Nincs jelen az install.rdf."
 
@@ -1854,21 +2947,26 @@ 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:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Válasszon egy érvényes kiegészítőtípust."
 
+#. %$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 "%s nem érvényes verzió %s számára"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "A kiegészítő azonosítója érvénytelen: %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"
@@ -1885,6 +2983,7 @@ msgstr ""
 msgid "devcp_error_invalid_version_spaces"
 msgstr "A kiegészítő verziója érvénytelen: a verzió nem tartalmazhat szóközt."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1894,6 +2993,7 @@ msgstr "A következő hiba történt az install.rdf értelmezése közben: %s"
 msgid "devcp_error_move_file"
 msgstr "Fájl áthelyezése sikertelen"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1916,15 +3016,15 @@ 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:2718
+#: 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:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Csak a homokozóban levő kiegészítők jelölhetők."
 
@@ -1936,6 +3036,8 @@ msgstr "Válasszon legalább egy kategóriát."
 msgid "devcp_error_one_user"
 msgstr "Legalább egy szerzőt meg kell adni a kiegészítőhöz."
 
+#. %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"
@@ -1943,13 +3045,13 @@ 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:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Nincs joga frissíteni ezt a kiegészítőt."
 
@@ -1965,7 +3067,7 @@ 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Töltsön fel egy fájlt."
@@ -2188,6 +3290,7 @@ msgid "devcp_localebox_header_localizedfields"
 msgstr "Honosított mezők"
 
 # %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2232,11 +3335,26 @@ msgstr "Kiegészítő beküldése"
 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: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 "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
@@ -2244,11 +3362,33 @@ msgid "devcp_nominate_submit_nominate"
 msgstr "%s jelölése"
 
 # %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: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 ""
@@ -2259,6 +3399,10 @@ msgstr ""
 # %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"
@@ -2274,9 +3418,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."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2305,6 +3454,60 @@ msgstr "Előnézet szerkesztése"
 msgid "devcp_preview_updated_successfully"
 msgstr "Előnézet sikeresen frissítve."
 
+#: 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 ""
@@ -2316,10 +3519,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Előnézet hozzáadása"
 
+#: 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 "Előnézet szerkesztése"
 
+#: 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 "Előnézeti fájl"
@@ -2328,6 +3541,34 @@ 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:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Előnézet törlése"
@@ -2344,57 +3585,172 @@ msgstr "Előnézet szerkesztése"
 msgid "devcp_previews_submit_upload"
 msgstr "Előnézet feltöltése"
 
+#: 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 "Helytelen?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Biztosan törli a fájlt?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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 "
 "megállapodást."
 
+#: 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 "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:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> aktív felhasználó"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> letöltés összesen"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> letöltés a héten"
 
-#: controllers/developers_controller.php:1481
+#: 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 "Jelenleg nem lehet kiegészítőket feltölteni. Jöjjön vissza később."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Elfogadom"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Elutasítom"
 
@@ -2410,11 +3766,12 @@ msgstr "Letiltva"
 msgid "devcp_summary_header_trusted"
 msgstr "Megbízható"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2425,6 +3782,7 @@ 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"
@@ -2434,30 +3792,667 @@ msgstr "Ne felejtsen el %s a témájához."
 msgid "devcp_theme_upload_preview_link"
 msgstr "előnézetet feltölteni"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Lásd %s referenciaként."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "ezt az oldalt"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Verzió szerkesztése"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Verzió sikeresen frissítve."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Ez a kiegészítő le van tiltva"
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "Ezt a kiegészítőt még nem jelölték."
+
+#: controllers/components/editors.php:213
+msgid "editor_review_error_file_not_pending"
+msgstr "Erre a fájlra nincs függőben értékelés."
+
+#. Actions are, for example: approving or rejecting
+#: controllers/components/editors.php:79
+#: controllers/components/editors.php:182
+msgid "editor_review_error_no_action"
+msgstr "Válasszon egy értékelési műveletet."
+
+#: controllers/components/editors.php:192
+msgid "editor_review_error_no_applications"
+msgstr "Adja meg a tesztelt alkalmazásokat."
+
+#. 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 "�rja be az értékelő megjegyzéseket."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Válasszon legalább egy fájlt értékelésre."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "Adja meg az operációs rendszert, amin tesztelt."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Szűrő"
@@ -2466,7 +4461,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:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Eseménynapló"
 
@@ -2518,6 +4513,7 @@ msgstr "Hozzászólások elrejtése"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Hozzászólások megjelenítése"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2527,7 +4523,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Értékelési napló"
 
@@ -2551,24 +4547,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:369
-#: controllers/editors_controller.php:370
+#: 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:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Töltse ki a következő mezőket:"
 
-#: controllers/editors_controller.php:461
+#: 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:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Saját magát nem értékelheti."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Külső szoftver"
 
@@ -2580,39 +4576,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:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "A kiemelés eltávolítása sikeres."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Kiemelt kiegészítők"
 
@@ -2646,38 +4642,41 @@ 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: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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 nap"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 óra"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 perc"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Szerkesztőeszközök"
 
-#: controllers/editors_controller.php:286
+#. %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 "csak %s"
 
-#: controllers/editors_controller.php:301
+#: 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:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2691,19 +4690,24 @@ msgstr "Törlés"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Értékelési művelet"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Nyilvánossá tétel"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Super-Review kérése"
 
@@ -2711,33 +4715,41 @@ msgstr "Super-Review kérése"
 msgid "editors_review_action_sandbox"
 msgstr "Homokozóban tartás"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Értékelési megjegyzések"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "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:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "A kiegészítő a homokozóban marad."
 
-#: views/editors/review.thtml:159
+#: 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:162
+#: 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:174
+#: 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 "
@@ -2765,15 +4777,15 @@ msgstr "Kategóriák:"
 msgid "editors_review_header_compatibility"
 msgstr "Kompatibilitás:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Leírás"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Fejlesztői megjegyzések"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2781,85 +4793,112 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Fájlok:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Elem története"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Jelölési üzenet"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Előnézetek"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "%s értékelése"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Megjegyzések az értékelőnek"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Összefoglaló"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Megjegyzések a verzióhoz"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "Értékelés adminisztrálása"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Jelölés jóváhagyva/Nyilvános"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Jelölés elutasítva/Homokozó"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Nincsenek korábbi értékelő bejegyzések."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Értékelés adminisztrálása"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Jóváhagyva/Nyilvános"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Elutasítva/Homokozó"
 
-#: views/editors/review.thtml:198
+#. 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 "Alkalmazások:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "vagy válasszon egy konzervválaszt:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Megjegyzések:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Operációs rendszerek:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Fel"
 
@@ -2867,7 +4906,7 @@ msgstr "Fel"
 msgid "editors_review_next_link"
 msgstr "következő &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Nincs előnézet."
 
@@ -2875,41 +4914,48 @@ msgstr "Nincs előnézet."
 msgid "editors_review_previous_link"
 msgstr "&laquo; előző"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> / %2$s a sorban"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Művelet feldolgozása"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Művelet"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Megjegyzések"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Dátum"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Értékelő"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Verzió/Fájl"
 
-#: controllers/editors_controller.php:411
+#: 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:422
 msgid "editors_reviewed_successfully"
 msgstr "Az értékelés sikeresen fel lett dolgozva."
 
@@ -2933,7 +4979,7 @@ msgstr "Művelet"
 msgid "editors_reviews_in_reply_to"
 msgstr "Válasz:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Az értékelések sikeresen fel lettek dolgozva!"
 
@@ -2945,23 +4991,23 @@ msgstr "Jelenleg nincsenek moderálandó értékelések."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Értékelések feldolgozása"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Webhelyspecifikus"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Új"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Frissített"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Tesztelt alkalmazás"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Tesztelt operációs rendszer"
 
@@ -3002,17 +5048,20 @@ msgstr "Platformok"
 msgid "editors_th_submissiontypes"
 msgstr "Beküldési típusok"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s nap"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s óra"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s perc"
@@ -3021,8 +5070,8 @@ msgstr "%s perc"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Hozzáférés megtagadva"
 
@@ -3030,12 +5079,13 @@ msgstr "Hozzáférés megtagadva"
 msgid "error_access_denied_message"
 msgstr "Nincs joga megtekinteni ezt az oldalt."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3045,18 +5095,19 @@ msgstr "Nincs joga megtekinteni ezt az oldalt."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "A kiegészítő nem található!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Ez a kiegészítő nem megtekinthető innen."
 
@@ -3064,7 +5115,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:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Nincsenek kiegészítők ebben a kategóriában!"
 
@@ -3086,24 +5137,25 @@ msgstr "Ez nem érvényes e-mail cím."
 msgid "error_field_required"
 msgstr "Ez a mező nem maradhat üresen."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "A fájl nem található!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Fájlhiba: %s nem létezik."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3120,16 +5172,18 @@ msgstr ""
 "Ez az URL érvénytelen formátumban van. Az érvényes URL-ek formátuma ehhez "
 "hasonló: http://példa.hu/saját_oldal."
 
+#. %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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3147,7 +5201,7 @@ msgstr "Értesítés"
 msgid "error_preview_notfound"
 msgstr "Nincs előnézet!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Kötelező osztályzatot választani."
 
@@ -3200,8 +5254,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Rossz felhasználónév vagy jelszó"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "A verzió nem található!"
 
@@ -3214,12 +5268,14 @@ msgid "feature_learnmore"
 msgstr "Több infó"
 
 # %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "%1$s - további tudnivalók"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3231,6 +5287,40 @@ msgstr[1] "%1$s értékelés"
 msgid "feature_view_more_from_category"
 msgstr "Még több"
 
+#. 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 "Vissza a kiegészítőhöz"
+
+#. 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 "Kibontás"
+
+#. 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 "Vissza az értékeléshez"
+
+#. 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 :: Fájlböngésző :: %2$s-kiegészítők"
+
+#. 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Minden jog fenntartva."
@@ -3267,7 +5357,7 @@ msgstr "Más nyelvek:"
 msgid "footer_privacy_policy"
 msgstr "Adatvédelmi nyilatkozat"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Mentés"
 
@@ -3276,6 +5366,7 @@ 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Szótárak"
@@ -3285,6 +5376,7 @@ 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Kiterjesztések"
@@ -3294,6 +5386,7 @@ 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Nyelvi csomagok (kiegészítő)"
@@ -3303,6 +5396,7 @@ 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Nyelvi csomagok (alkalmazás)"
@@ -3312,6 +5406,7 @@ 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Bővítmények"
@@ -3321,6 +5416,7 @@ 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:111
 msgid "general_addontype_search_plural"
 msgstr "Keresők"
@@ -3330,10 +5426,12 @@ 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Témák"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3364,12 +5462,12 @@ msgid "header_navlink_addons"
 msgstr "Kiegészítők"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Kijelentkezés"
 
@@ -3377,14 +5475,15 @@ msgstr "Kijelentkezés"
 msgid "header_navlink_myaccount"
 msgstr "Saját fiók"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Regisztrálás"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
@@ -3392,24 +5491,30 @@ msgstr "%s előnézeti képe"
 
 # %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/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$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 "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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3432,7 +5537,7 @@ msgid "langtools_download_langpack"
 msgstr "Nyelvi csomag letöltése"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Szótárak és nyelvi csomagok"
 
@@ -3488,7 +5593,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3522,6 +5631,7 @@ 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:214
 msgid "other_users"
 msgstr "mások"
@@ -3534,35 +5644,34 @@ msgstr "Alkalmazásverziók"
 msgid "page_title_credits"
 msgstr "Stáblista"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Kísérleti kiegészítők"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
 msgstr "Gyakran ismétlődő kérdések"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Firefox testreszabása GYIK"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Irányelvek a kiegészítőkhöz"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "A Mozilla adatvédelmi nyilatkozata"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Értékelési útmutató"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "A homokozó értékelési rendszere"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Segítség a beküldéshez"
 
@@ -3582,6 +5691,7 @@ msgstr ""
 "egyet az alábbi alkalmazások közül. Ezekhez az alkalmazásokhoz csak az "
 "alábbi verziók engedélyezettek."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3589,6 +5699,8 @@ msgstr ""
 "Ha a támogatott alkalmazás nem igényli az install.rdf fájlt, akkor is "
 "mellékelni kell egyet az %s meghatározott tartalommal."
 
+#. 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 "itt"
@@ -3597,7 +5709,6 @@ msgstr "itt"
 msgid "pages_appversions_versions"
 msgstr "Verziók"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Vissza az előző oldalra"
 
@@ -3610,6 +5721,7 @@ 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"
@@ -3635,6 +5747,8 @@ msgstr "�rja be, amit hall."
 
 # %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 ""
@@ -3643,6 +5757,8 @@ msgstr ""
 
 # %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
 msgid "recaptcha_hardtoread_text"
 msgstr ""
@@ -3657,7 +5773,7 @@ msgstr "Ön ember?"
 msgid "recaptcha_whatsthis"
 msgstr "Mi ez?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Hiba az értékelés megjelölésénél!"
 
@@ -3682,7 +5798,7 @@ msgid "review_flag_reason_spam"
 msgstr "Hirdetés vagy nem értékeléssel kapcsolatos tartalom"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: 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."
 
@@ -3697,6 +5813,7 @@ msgstr ""
 "szerkesztői ellenőrzésre való megjelöléshez."
 
 # %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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3715,21 +5832,22 @@ msgstr ""
 "felhasználói értékelésével kapcsolatos további tudnivalókért.</p>"
 
 # %1 is the addon name
+#. %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 "%s értékelései"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Kiemeltek"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Legújabbak"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Frissítettek"
 
@@ -3766,6 +5884,7 @@ msgstr "Minden kereső"
 msgid "search_landing_browse_search_engines"
 msgstr "Tallózás a keresők között"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3785,12 +5904,13 @@ msgstr "Kiegészítők keresése"
 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:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Keresés eredményének: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Adminisztrációs eszközök"
 
@@ -3798,7 +5918,7 @@ msgstr "Adminisztrációs eszközök"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Fejlesztőeszközök"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Szerkesztőeszközök"
 
@@ -3806,6 +5926,7 @@ msgstr "Szerkesztőeszközök"
 msgid "sidebar_navlink_welcome"
 msgstr "Üdvözlet"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3843,6 +5964,7 @@ msgstr "Téma"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Frissítettek"
 
+#. %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
@@ -3855,6 +5977,7 @@ 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3872,24 +5995,32 @@ msgstr "Fejlesztőeszközök"
 msgid "statistics_addon_switch"
 msgstr "Kiegészítő váltása"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "%b. %e"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "%Y. %b. %e."
 
+#. 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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3931,7 +6062,7 @@ msgstr "Statisztikák"
 msgid "statistics_index_view_button"
 msgstr "Statisztika megtekintése"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Táblázat megtekintése CSV formátumban"
 
@@ -3947,7 +6078,7 @@ msgstr "Grafikon eltávolítása"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Csoportosítás: nap"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Csoportosítás: hónap"
 
@@ -3955,103 +6086,107 @@ msgstr "Csoportosítás: hónap"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Csoportosítás: hét"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Összehasonlítás: hét"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s van a tartományban"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Grafikon hozzáadása"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Másik grafikon hozzáadása"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Teljes szám elrejtése"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Teljes szám megjelenítése"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Adatok megtekintése (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "%s-események elrejtése"
 
-#: controllers/statistics_controller.php:243
+#: 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:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Firefox-események elrejtése"
 
-#: controllers/statistics_controller.php:240
+#: 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:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Diagram összecsukása"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Diagram széthúzása"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Diagram átméretezése"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Aktív felhasználók"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Alkalmazás"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Egyéni"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Letöltések"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operációs rendszer"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Kiegészítő állapota"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Összefoglaló"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Kiegészítő verziója"
 
@@ -4075,11 +6210,11 @@ msgstr "Ismeretlen"
 msgid "statistics_longnames_version"
 msgstr "Kiegészítő verziója"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr "Még nincs elég adat a diagram megjelenítéséhez. Próbálja újra később."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "Még nincsenek adatok ehhez kiegészítőhöz. Pár nap múlva próbálja meg újra."
@@ -4091,11 +6226,11 @@ msgstr ""
 "pontatlanok lehetnek, mert a programok most frissítik ezeket az "
 "információkat. Pár perc múlva próbálja meg újra."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "A Statisztika modul jelenleg le van tiltva. Próbálja újra később."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr ""
 "A Statisztika modul diagramjainak megtekintéséhez JavaScript szükséges."
@@ -4111,36 +6246,36 @@ msgstr "A beállítások frissítve lettek!"
 msgid "statistics_pagetitle"
 msgstr "Statisztikák"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Aktív felhasználók"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Napi letöltésszám"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Nagyítás"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Nagyítás egy hónapra"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Kicsinyítés"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Kicsinyítés egy hónapra"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "%1$s statisztikájának napi összefoglalója"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Összesített adatok RSS-forrása"
 
@@ -4181,23 +6316,23 @@ msgstr "Nyilvános"
 msgid "statistics_settings_access_public_description"
 msgstr "Bárki megnézheti ennek a kiegészítőnek a statisztikáit."
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Beállítások megváltoztatása"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Kezelje bizalmasan ezt az információt."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Ez az oldal jelenleg <b>privát</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Ez az oldal jelenleg <b>nyilvános</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Zárolva"
 
@@ -4214,7 +6349,7 @@ msgstr "Beállítások mentése"
 msgid "statistics_settings_title"
 msgstr "%1$s statisztikaoldalának beállításai"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Nem zárolt"
 
@@ -4238,7 +6373,7 @@ msgstr "Is"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "�tlagos napi letöltésszám"
 
@@ -4246,37 +6381,37 @@ msgstr "�tlagos napi letöltésszám"
 msgid "statistics_summary_downloads_heading"
 msgstr "Letöltések"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Utolsó napi szám"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: 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"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Összes letöltés"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "%1$s óta"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Nincsenek még adatok"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Aktív felhasználók átlaga"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Változás az előző számhoz képest"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s dátum:  %2$s"
@@ -4285,17 +6420,17 @@ msgstr "%1$s dátum:  %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Aktív felhasználók"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Aktív felhasználók"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Dátum: %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s statisztikája"
@@ -4321,6 +6456,7 @@ 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:49
 msgid "user_del_account_deleted"
 msgstr ""
@@ -4341,6 +6477,7 @@ 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:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4350,6 +6487,7 @@ msgstr ""
 "tudja törölni itt a fiókját."
 
 # %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: 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."
@@ -4363,6 +6501,7 @@ 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:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4375,6 +6514,7 @@ 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:93
 msgid "user_del_header_delete_account"
 msgstr "%1$s felhasználói fiókjának törlése"
@@ -4400,6 +6540,7 @@ msgstr ""
 "rendelve."
 
 # %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4416,6 +6557,7 @@ 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:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4431,6 +6573,9 @@ msgstr "Felhasználói fiók törlése"
 # 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4450,6 +6595,7 @@ msgstr ""
 "-- A %2$s Add-ons munkatársai"
 
 # %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4475,6 +6621,8 @@ msgstr "Köszönjük, hogy regisztrált a %s Add-ons webhelyen!"
 
 # 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
 #, php-format
 msgid "user_email_pwreset"
@@ -4502,6 +6650,7 @@ msgid "user_emailchange_error"
 msgstr "Hiba!"
 
 # %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4512,6 +6661,7 @@ msgid "user_emailchange_success"
 msgstr "Sikeres!"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4679,6 +6829,7 @@ msgid "user_register_amo_link"
 msgstr "%s kiegészítők"
 
 # %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"
@@ -4688,6 +6839,7 @@ msgstr ""
 "webhelyre."
 
 # %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4705,6 +6857,7 @@ msgid "user_register_congratulations"
 msgstr "Gratulálunk! A felhasználói fiók sikeresen létrejött."
 
 # %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"
@@ -4714,6 +6867,7 @@ msgstr ""
 "a %1$s a fenti e-mail címre."
 
 # %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4774,6 +6928,7 @@ 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:110
 msgid "users_info_reviews_by_user"
 msgstr "%s értékelései"
@@ -4784,6 +6939,8 @@ msgstr "Felhasználó bejelentkezése"
 
 # %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4794,6 +6951,8 @@ msgstr ""
 
 # %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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4809,3 +6968,34 @@ msgstr "Felhasználó jelszavának törlése"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Új felhasználó regisztrációja"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "A legújabb verzió, amely még kompatibilis ezzel:"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
diff --git a/site/app/locale/hu/pages/about.thtml b/site/app/locale/hu/pages/about.thtml
new file mode 100644
index 0000000..8cc3ab8
--- /dev/null
+++ b/site/app/locale/hu/pages/about.thtml
@@ -0,0 +1,45 @@
+<h2>Mi az addons.mozilla.org?</h2>

+<p>

+  Az addons.mozilla.org (AMO) a Mozilla hivatalos weboldala, ez a Mozilla-alkalmazások kiegészítőinek otthona.  A kiegészítők új funkciókat adnak hozzá a Firefox, Thunderbird, SeaMonkey és Sunbird alkalmazásokhoz.  Az AMO-ról több ezer kiegészítőt tölthet le, amelyekkel megváltoztathatja az internet felhasználásának módját.

+</p>

+

+<h2>Ki készíti ezeket a kiegészítőket?</h2>

+<p>

+  Kiegészítőfejlesztők ezrei, a hobbiprogramozóktól kezdve a nagy vállalatokig.  Minden nyilvános kiegészítőt elkötelezett önkéntesek csapata értékel a megjelenés előtt.  A kísérleti kiegészítők megjelölése „kísérleti�, és nincsenek értékelve.

+</p>

+

+<h2>Hogyan követhetem figyelemmel, hogy mi történik az AMO-n?</h2>

+<p>

+  A <a href="http://blog.mozilla.com/addons/">blogunk</a> rendszeresen frissül, és gyakran jelentetünk meg írásokat a közösségtől.  Van egy <a href="https://addons.mozilla.org/newsletter">hírlevelünk</a> is, amelyet havonta küldünk szét.

+</p>

+

+<h2>Ez jól hangzik!  Hogyan kapcsolódhatok be?</h2>

+<p>

+  Sok módon bekapcsolódhat:

+</p>

+<ul>

+  <li>

+    <a href="https://wiki.mozilla.org/AMO:Editors/Applying">Legyen szerkesztő</a>.  Szerkesztőink szakismeretekkel rendelkező AMO-rajongók, akik a kiegészítőket a kód minősége és a stabilitás szerint értékelik.

+  </li>

+  <li>

+    <a href="http://developer.mozilla.org/">Készítsen kiegészítőt</a>.  Az AMO ingyenes tárterületet és frissítési szolgáltatást kínál, hogy nagy számú felhasználót érhessen el.

+  </li>

+  <li>

+    Mondja el az ismerőseinek!  <a href="http://spreadfirefox.com/">Terjessze a Firefoxot</a>, és mondja el ismerőseinek, hogy milyen kiegészítőket használ.

+  </li>

+  <li>

+    Küldjön hibajelentéseket és javításokat. A <a href="https://bugzilla.mozilla.org/buglist.cgi?quicksearch=addons">Bugzilla</a> tartalmazza az AMO összes jelenlegi hibáját.  Ha itt nem találja egy hiba leírását, küldje be, vagy küldjön javításokat.

+  </li>

+</ul>

+

+<h2>Kérdésem van</h2>

+<p>

+  A kezdéshez a legjobb hely a <a href="https://addons.mozilla.org/pages/faq"><abbr title="Gyakran ismétlődő kérdések">GYIK</abbr></a>. Ha nem találja itt a választ, akkor használja a lap alján megtalálható kapcsolatinformációkat.  Egy adott kiegészítővel kapcsolatos kérdés esetén használja a kiegészítő oldalán megtalálható kapcsolatinformációkat.

+</p>

+

+<h2>Kapcsolatfelvétel</h2>

+<dl>

+  <dt> <abbr title="Internet Relay Chat">IRC</abbr>:</dt>

+  <dd><a href="irc://irc.mozilla.org/#addons">#addons</a> csatorna az irc.mozilla.org-on az általános kérdések és az értékelésekkel kapcsolatos kérdések megtárgyalására</dd>

+  <dd><a href="irc://irc.mozilla.org/#amo">#amo</a> csatorna az irc.mozilla.org-on az adminisztratív és a fejlesztési kérdések megtárgyalására</dd>

+</dl>

diff --git a/site/app/locale/hu/pages/experimental_addons.thtml b/site/app/locale/hu/pages/experimental_addons.thtml
deleted file mode 100644
index a846eea..0000000
--- a/site/app/locale/hu/pages/experimental_addons.thtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<h1>Kísérleti kiegészítők</h1>

-

-

-<h2>Mik azok a kísérleti kiegészítők?</h2>

-

-<p>A kísérleti kiegészítők a haladó szintű felhasználók számára érdekesek, akik az általános használatot megelőző értékelés előtt tesztelik ezeket. Sok kiegészítő lehet kezdetleges állapotban. A kísérleti kiegészítők alfa, béta vagy kiadás előtti állapotban lehetnek minőségüket, teljesítményüket vagy funkcionalitásukat tekintve.</p>

-

-<p>Óvatosan kell eljárni a kísérleti kiegészítőkkel, mert ezeket még nem tesztelte le egy szerkesztő, és árthatnak a számítógépnek.</p>

-

-

-<h2>Honnan tudhatom, hogy egy kiegészítő kísérleti, ha megnézek egyet a webhelyen?</h2>

-

-<p>A kísérleti kiegészítők megjelölése „kísérleti�, és telepítésükhöz be kell jelentkezni.</p>

-

-

-<h2>Miért kell bejelentkezni a kísérleti kiegészítők telepítéséhez?</h2>

-

-<p>A webhely azért követeli meg a bejelentkezést a kísérleti kiegészítők telepítése előtt, mert ezzel szeretne figyelmeztetni a kísérleti kiegészítők kockázatos használatára.</p>

-

-

-<h2>Be kell-e jelentkezni, illetve kell-e fiókkal rendelkezni nyilvános kiegészítők telepítéséhez?</h2>

-

-<p>Nem. A webhely a nyilvános kiegészítők telepítéséhez nem követeli meg a bejelentkezést vagy a felhasználói fiók meglétét.</p>

-

diff --git a/site/app/locale/hu/pages/faq.thtml b/site/app/locale/hu/pages/faq.thtml
index 026f846..dcb99bb 100644
--- a/site/app/locale/hu/pages/faq.thtml
+++ b/site/app/locale/hu/pages/faq.thtml
@@ -6,7 +6,6 @@
     <li> Hibaelhárítás: <a href="http://support.mozilla.com/kb/Unable+to+install+add-ons">kiegészítők telepítése</a>, <a href="http://support.mozilla.com/kb/Troubleshooting+plugins">bővítmények</a> és <a href="http://support.mozilla.com/kb/Troubleshooting+extensions+and+themes">általános problémák</a>.</li>

     <li> <a href="http://support.mozilla.com/kb/Uninstalling+add-ons">Kiegészítők eltávolítása</a> és <a href="http://support.mozilla.com/kb/Cannot+uninstall+an+add-on">eltávolítás hibaelhárítása</a>.</li>

     <li> <a href="http://support.mozilla.com/kb/Gray+bar+below+the+status+bar">Problémás kiegészítők kezelése / a szürke sáv problémája</a></li>

-    <li> <a href="https://addons.mozilla.org/firefox/pages/experimentalAddons">Mik azok a kísérleti kiegészítők?</a></li>

 </ul>

 

 <p></p>

diff --git a/site/app/locale/id/LC_MESSAGES/messages.po b/site/app/locale/id/LC_MESSAGES/messages.po
index cf45b68..dd226c5 100644
--- a/site/app/locale/id/LC_MESSAGES/messages.po
+++ b/site/app/locale/id/LC_MESSAGES/messages.po
@@ -10,7 +10,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-02-12 15:06:08+0200\n"
+"PO-Revision-Date: 2009-03-10 13:12:50+0100\n"
 "Last-Translator: Romi Hardiyanto <romihardiyanto@gmail.com>\n"
 "Language-Team: Bahasa Indonesia <id@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,10 @@ msgstr ""
 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 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
@@ -50,38 +54,34 @@ msgstr "Publik"
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "%s ditambahkan"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Diperbarui pada %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versi %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "total unduhan"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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
+#. %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"
@@ -98,22 +98,22 @@ msgstr "per halaman"
 msgid "addon_list_sortby"
 msgstr "Urut berdasar:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "rekomendasi kami"
 
-# %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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s tidak tersedia untuk %2$s."
 
-# %1 is the addon name
+#. %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
@@ -122,7 +122,7 @@ msgstr "%1$s tidak tersedia untuk %2$s."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Kembali ke %1$s..."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -141,6 +141,7 @@ msgstr "Tinjauan:"
 msgid "addon_review_add_submit"
 msgstr "Kirim tinjauan anda"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -174,23 +175,25 @@ msgstr "Ya"
 msgid "addon_review_delete_header"
 msgstr "Hapus Tinjauan"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Tinjauan sukses dihapus."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Sunting Tinjauan untuk %s"
 
-# %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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 ""
 "Terjadi masalah saat menandai tinjauan: Jumlah karakter untuk isian catatan "
 "untuk tinjauan yang ditandai dibatasi minimum 10 karakter, maksimum 100 "
 "karakter. Jumlah karakter yang Anda tulis: %1$S."
 
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -201,7 +204,7 @@ msgstr ""
 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.
+#. %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"
@@ -213,16 +216,16 @@ msgstr[1] ""
 "Tampilkan %1$s tinjauan sebelumnya tentang pengaya ini yang dikirim oleh %2"
 "$s."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Tinjauan untuk %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -236,13 +239,13 @@ msgstr "Balasan Pengembang:"
 msgid "addon_review_saved_successfully"
 msgstr "Tinjauan anda sukses disimpan. Terima kasih!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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
+#. %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
@@ -265,11 +268,13 @@ msgstr "Pengaya Sebelumnya"
 msgid "addon_version_permalink"
 msgstr "Taut permanen ke versi ini"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "Versi terakhir kompatibel dengan"
+#. %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 "Versi terbaru yang kompatibel dengan %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Kirim"
 
@@ -277,19 +282,20 @@ msgstr "Kirim"
 msgid "addons_author_tooltip"
 msgstr "Tampilkan profil penyusun"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "Jelajahi semua Tema :: Pengaya %1$s"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "Jelajahi Tema %1$s :: Pengaya %2$s"
 
@@ -297,7 +303,7 @@ msgstr "Jelajahi Tema %1$s :: Pengaya %2$s"
 msgid "addons_display_add_review"
 msgstr "Tambahkan tinjauan"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Detil Lebih Lanjut"
 
@@ -305,11 +311,11 @@ msgstr "Detil Lebih Lanjut"
 msgid "addons_display_categories"
 msgstr "Kategori"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "form tinjauan"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Tidak suka"
@@ -318,143 +324,150 @@ msgstr "Tidak suka"
 msgid "addons_display_edit_review"
 msgstr "Sunting tinjauan anda"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Pengaya ini memiliki kebijakan privasi."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Komentar Pengembang"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Beranda"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Tinjauan"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Layanan Dukungan"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Suka"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Deskripsi Lengkap"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Gambar Lainnya"
 
-# %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:421
+#. %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] "Pengaya lain dari %1$s"
 msgstr[1] "Pengaya lain dari penyusun ini"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
 "Dukungan untuk pengaya ini disediakan pengembang dengan mengirim email ke %s."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "Dukungan untuk pengaya ini disediakan pengembang di %s atau dengan mengirim "
 "email ke %s."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Peringkat"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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 "
 "tidak memberitahukan alamat email anda kepada para developer yang mungkin "
 "mereka butuhkan untuk menghubungi anda agar masalah anda dapat diselesaikan."
 
-# %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "Lihat <a href=\"%1$s\">bagian dukungan</a> untuk mencari tahu di mana anda "
 "menemukan bantuan untuk pengaya ini."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Simpan"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Tampilkan semua tinjauan (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Tampilkan Semua Versi"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Riwayat Versi Lengkap"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Tampilkan kode sumber"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Tampilkan statistik"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Pendapat anda?"
 
@@ -464,7 +477,7 @@ msgstr "Bekerja pada:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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"
@@ -475,10 +488,11 @@ msgstr "oleh"
 msgid "addons_home_feature_head"
 msgstr "Rekomendasi Kami"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -493,7 +507,9 @@ msgstr "Terbaru:"
 msgid "addons_home_other_applications"
 msgstr "Aplikasi Lain"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -503,19 +519,20 @@ msgstr "Aplikasi Lain"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -611,6 +628,7 @@ msgstr "untuk Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "untuk Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -631,12 +649,13 @@ msgstr ""
 "dengan ekstensi, yang mengubah atau menambah fungsi yang sudah ada "
 "sebelumnya."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugin yang Umum untuk %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Plugin"
 
@@ -647,6 +666,7 @@ msgstr "Plugin"
 msgid "addons_plugins_support_documentation"
 msgstr "Dokumentasi Dukungan: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -654,25 +674,25 @@ msgstr ""
 "%s mewajibkan anda menyetujui Perjanjian Lisensi End-User (End User License "
 "Agreement-EULA) sebelum pemasangan dapat dilanjutkan:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Pratinjau %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Pengaya yang Direkomendasikan"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Pengaya yang Direkomendasikan"
 
@@ -680,7 +700,7 @@ msgstr "Pengaya yang Direkomendasikan"
 msgid "addons_searchengines_additional_resources"
 msgstr "Informasi terkait"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
@@ -698,35 +718,35 @@ msgstr ""
 "mematikannya. Silakan mengaktifkan JavaScript sebelum mencoba memasang "
 "plugin pencarian di bawah ini."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %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 "Pelajari cara %1$s di %2$s (dalam Bahasa Inggris)."
 
-# link path to search plugins instructions, relative to devmo
+#. 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 "/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:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "membuat sendiri"
 
-# %1 is the link to mycroft.mozdev.org
+#. %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 "Jelajahi lebih banyak mesin pencari di %1$s"
 
-# link text to mycroft.mozdev.org
+#. 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:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Mesin Pencari"
 
@@ -740,7 +760,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Dimatikan"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Versi Tidak Lengkap"
 
@@ -778,11 +798,12 @@ msgstr ""
 "Versi berikut ditampilkan sebagai referensi dan untuk tujuan pengujian. "
 "Sebaiknya anda harus selalu menggunakan versi terbaru pengaya."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Riwayat Versi dengan Log Perubahan (Changelog)"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Riwayat Versi %1$s"
@@ -795,6 +816,7 @@ msgstr "Tambah Grup"
 msgid "admin_group_delete_pagetitle"
 msgstr "Hapus Grup"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -920,16 +942,20 @@ msgstr "Abaikan pengecekan versi"
 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: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: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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -942,23 +968,23 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Perbarui Firefox</a> anda untuk "
 "menggunakan pengaya ini"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Urut Nama"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Pengaya Baru"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Pengaya Terpopuler"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Urut Peringkat"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Pengaya yang Baru Dimutakhirkan"
 
@@ -990,7 +1016,7 @@ msgstr "Paling Terakhir Diperbarui"
 msgid "category_extra_mostpopular"
 msgstr "Paling Populer"
 
-# %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"
@@ -1000,11 +1026,19 @@ msgstr "Tampilkan Semua %1$s"
 msgid "collection_not_found"
 msgstr "Koleksi tidak ditemukan!"
 
+#. %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"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
@@ -1037,6 +1071,8 @@ msgstr "Sesuaikan maxVersion tanpa mengunggah lagi"
 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:130
 msgid "compatibility_developers_login_first"
 msgstr ""
@@ -1062,6 +1098,10 @@ msgstr "Hasil Pemeriksaan Status Pengaya"
 msgid "compatibility_developers_retrieving"
 msgstr "Mengambil status pengaya yang diletakkan di sini..."
 
+#. %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 %2$s pengguna (total %3$s&#37;)"
@@ -1076,6 +1116,8 @@ msgstr ""
 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:69
 msgid "compatibility_report_intro"
 msgstr ""
@@ -1087,6 +1129,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Versi Alfa"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Pengaya yang kompatibel dengan versi alfa %1$s"
@@ -1095,6 +1138,7 @@ msgstr "Pengaya yang kompatibel dengan versi alfa %1$s"
 msgid "compatibility_report_legend_beta"
 msgstr "Versi Beta"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "Pengaya yang kompatibel dengan versi beta atau kandidat rilis %1$s"
@@ -1103,6 +1147,7 @@ msgstr "Pengaya yang kompatibel dengan versi beta atau kandidat rilis %1$s"
 msgid "compatibility_report_legend_latest"
 msgstr "Versi Terbaru"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Pengaya sudah up-to-date dengan build terakhir %1$s"
@@ -1111,6 +1156,7 @@ msgstr "Pengaya sudah up-to-date dengan build terakhir %1$s"
 msgid "compatibility_report_legend_other"
 msgstr "Versi Lainnya"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Pengaya yang tidak kompatibel dengan versi %1$s apapun"
@@ -1128,12 +1174,13 @@ msgstr "Informasi untuk Pengguna Pengaya"
 msgid "compatibility_view_report"
 msgstr "Tampilkan Laporan Kompatibilitas"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Untuk informasi cara berkontribusi, silakan kunjungi %s kami."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "halaman wiki"
 
@@ -1175,26 +1222,35 @@ msgstr ""
 "href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons "
 "Attribution 2.5 License</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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)
+#. 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"
@@ -1220,14 +1276,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 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"
@@ -1275,36 +1359,36 @@ msgstr "Langkah ke-5: Sukses"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Bantuan untuk Pengajuan"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Pengaya sukses dimatikan"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Ubah Pengaya"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Pengaya sukses diaktifkan"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Deskripsi Pengaya"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Beranda Pengaya"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Nama Pengaya"
 
@@ -1313,40 +1397,298 @@ msgstr "Nama Pengaya"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Judul Pratinjau"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Kebijakan Privasi"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Ringkasan Pengaya"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Email Layanan Dukungan"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL Layanan Dukungan"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Catatan Versi"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Calonkan Pengaya"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Pengaya sukses dicalonkan!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1369,7 +1711,7 @@ msgstr ""
 "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
+#. %1 is the link to the sandbox information page
 #: views/developers/add_step5.thtml:63
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1379,7 +1721,7 @@ msgstr "Anda dapat membaca tentang Sistem Peninjauan Sandbox %s."
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "di sini"
 
-# %1 is the "nominate" link
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1402,16 +1744,16 @@ msgstr ""
 "Oleh karena pengaya ini terpercaya, versi ini secara otomatis disetujui "
 "untuk tampil pada situs publik."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Ajukan Pengaya"
 
-#: controllers/developers_controller.php:2375
+#: controllers/developers_controller.php:2460
 msgid "devcp_addon_updated_successfully"
 msgstr "Pengaya sukses diperbarui"
 
-# %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"
@@ -1421,7 +1763,7 @@ msgstr "Mungkin anda ingin untuk %s agar pengaya anda lebih menarik."
 msgid "devcp_addon_upload_preview_link"
 msgstr "mengunggah pratinjau"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1450,10 +1792,102 @@ msgstr "Lanjut"
 msgid "devcp_change_addontype"
 msgstr "Ganti jenis pengaya:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "Komentar Pengembang diperbarui."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Tambah Pratinjau"
@@ -1546,6 +1980,7 @@ msgstr "Tidak ada URL layanan dukungan yang disediakan pengembang."
 msgid "devcp_details_trusted"
 msgstr "Terpercaya"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1576,6 +2011,7 @@ msgstr ""
 "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"
@@ -1596,11 +2032,58 @@ msgstr ""
 "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"
+
+#: views/developers/discuss.thtml:57
+msgid "devcp_discuss_allreplies_header"
+msgstr "Balasan"
+
+#. 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 ""
+"Terjadi kesalahan saat menyimpan balasan. Silakan hubungi %1$s tentang "
+"masalah ini."
+
+#. %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 ""
+"Seorang Editor Mozilla Add-ons meminta keterangan lebih lanjut mengenai "
+"versi %2$s pengaya %1$s Anda."
+
+#. %1 is the add-on name
+#: views/developers/discuss.thtml:43
+msgid "devcp_discuss_pagetitle"
+msgstr "Tambahkan Informasi Lainnya untuk Keperluan Peninjauan Pengaya %1$s"
+
+#. submit button text
+#: views/developers/discuss.thtml:79
+msgid "devcp_discuss_submit_reply"
+msgstr "Kirim Balasan"
+
+#: views/developers/discuss.thtml:72
+msgid "devcp_discuss_success_message"
+msgstr ""
+"Balasan Anda sukses disimpan. Peserta diskusi lainnya akan diberitahukan "
+"melalui 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 "ditulis oleh %1$s pada %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Tambah Penyusun"
@@ -1613,10 +2096,297 @@ msgstr "Alamat Email Penyusun"
 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:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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"
@@ -1682,6 +2452,206 @@ msgstr "Target Bahasa (Locale)"
 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: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 "Perbarui"
@@ -1692,11 +2662,66 @@ 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"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Pengaya Istimewa"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1705,7 +2730,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Tinjauan yang Dimoderasi (%s)"
 msgstr[1] "Tinjauan yang Dimoderasi (%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
 #, php-format
@@ -1714,7 +2739,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Pengaya yang Dicalonkan (%s)"
 msgstr[1] "Pengaya yang Dicalonkan (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1727,8 +2752,8 @@ msgstr[1] "Pemutakhiran Tertunda (%s)"
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "Berkas yang ditandai akan dihapus."
 
-# %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"
@@ -1754,29 +2779,30 @@ msgstr "Catatan untuk Peninjau"
 msgid "devcp_editversion_submit_update"
 msgstr "Perbarui"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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 "
@@ -1785,19 +2811,33 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Silakan lihat referensi di %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 "halaman ini"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, php-format
+msgid "devcp_error_file_exists"
+msgstr ""
+"Versi pengaya sudah ada. Untuk menggantikan versi tersebut, Anda harus "
+"menghapus berkas %1$s terlebih dahulu."
+
+#. %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"
@@ -1805,7 +2845,7 @@ 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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Tidak semua GUID berkas cocok"
 
@@ -1834,6 +2874,8 @@ msgstr "Melebihi ukuran maksimum unggahan"
 msgid "devcp_error_http_nofile"
 msgstr "Tidak ada berkas yang diunggah"
 
+#. %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"
@@ -1841,13 +2883,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:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Tidak ada berkas install.rdf pada pengaya."
 
@@ -1855,21 +2898,26 @@ 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:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Mohon pilih jenis pengaya yang sah."
 
+#. %$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 "%s bukan versi yang sah untuk %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "ID pengaya ini tidak sah: %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"
@@ -1888,6 +2936,7 @@ msgid "devcp_error_invalid_version_spaces"
 msgstr ""
 "Versi pengaya ini tidak sah: versi tidak dapat mengandung karakter spasi."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1897,6 +2946,7 @@ msgstr "Kesalahan berikut terjadi saat mem-parse berkas install.rdf: %s"
 msgid "devcp_error_move_file"
 msgstr "Tidak dapat memindahkan berkas"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1919,16 +2969,16 @@ 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:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "Anda harus mengisi informasi yang diminta untuk proses pencalonan."
 
-#: controllers/developers_controller.php:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Anda hanya dapat mencalonkan pengaya yang berada pada sandbox."
 
@@ -1940,6 +2990,8 @@ msgstr "Pilih paling sedikit satu kategori."
 msgid "devcp_error_one_user"
 msgstr "Paling tidak harus ada satu orang penyusun untuk pengaya ini."
 
+#. %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"
@@ -1947,13 +2999,13 @@ 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:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Anda tidak diizinkan untuk memperbarui pengaya ini."
 
@@ -1969,7 +3021,7 @@ msgstr ""
 "Pengaya tidak diperbolehkan menggunakan tautan updateURL eksternal. Mohon "
 "hapus tautan dari install.rdf dan coba lagi."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Mohon unggah satu berkas."
@@ -2190,7 +3242,7 @@ msgstr "Pengayaku"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Isian Alih Bahasa"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2234,33 +3286,68 @@ msgstr "Ajukan Pengaya"
 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: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 "Kembali ke detil pengaya"
 
-# %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 "Calonkan %s"
 
-# %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 "Deteksi otomatis jenis pengaya: %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 ""
 "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)
+#. %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"
@@ -2275,9 +3362,14 @@ msgstr ""
 "Jika pratinjau ini disetel sebagai pratinjau default, status default pada "
 "pratinjau yang lama akan dihapus."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2306,6 +3398,60 @@ msgstr "Ubah Pratinjau"
 msgid "devcp_preview_updated_successfully"
 msgstr "Pratinjau sukses diperbarui."
 
+#: 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 ""
@@ -2317,10 +3463,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Tambah Pratinjau"
 
+#: 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 "Ubah Pratinjau"
 
+#: 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 "Berkas Pratinjau"
@@ -2329,6 +3485,34 @@ msgstr "Berkas Pratinjau"
 msgid "devcp_previews_label_makedefault"
 msgstr "Jadikan sebagai gambar pratinjau default"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Hapus Pratinjau"
@@ -2345,56 +3529,171 @@ msgstr "Ubah Pratinjau"
 msgid "devcp_previews_submit_upload"
 msgstr "Unggah Pratinjau"
 
+#: 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 "Salah?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Yakin akan menghapus berkas ini?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
 
+#: 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 "Lewati pemutakhiran informasi pengaya yang ada"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Pengguna Aktif Harian"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> Jumlah Unduhan Total"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Jumlah Unduhan Mingguan"
 
-#: controllers/developers_controller.php:1481
+#: 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 "Fitur Pengajuan Pengaya sedang dimatikan. Mohon kembali lagi nanti."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Saya Setuju"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Saya Tidak Setuju"
 
@@ -2410,11 +3709,11 @@ msgstr "Dimatikan"
 msgid "devcp_summary_header_trusted"
 msgstr "Terpercaya"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Versi Terbaru:"
 
-# %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"
@@ -2424,7 +3723,7 @@ msgstr "Anda tidak mempunyai pengaya. Klik %s untuk mengajukan."
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "di sini"
 
-# %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"
@@ -2434,30 +3733,667 @@ msgstr "Pastikan untuk %s untuk tema anda."
 msgid "devcp_theme_upload_preview_link"
 msgstr "mengunggah pratinjau"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Silakan lihat %s untuk referensi."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "halaman ini"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Ubah Versi"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Versi sukses diperbarui."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Pengaya ini dimatikan"
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "Pengaya ini belum dinominasikan."
+
+#: controllers/components/editors.php:213
+msgid "editor_review_error_file_not_pending"
+msgstr "Berkas ini tidak dalam status penundaan tinjauan."
+
+#. Actions are, for example: approving or rejecting
+#: controllers/components/editors.php:79
+#: controllers/components/editors.php:182
+msgid "editor_review_error_no_action"
+msgstr "Silakan pilih aksi."
+
+#: controllers/components/editors.php:192
+msgid "editor_review_error_no_applications"
+msgstr "Masukkan aplikasi yang diuji."
+
+#. 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 "Masukkan komentar tinjauan."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Pilih paling tidak satu berkas untuk ditinjau."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "Masukkan sistem operasi yang diujikan."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filter"
@@ -2466,7 +4402,7 @@ msgstr "Filter"
 msgid "editorcp_logs_filter_by"
 msgstr "Filter berdasar jenis/aksi"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Log Event"
 
@@ -2518,6 +4454,7 @@ msgstr "Sembunyikan Komentar"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Tampilkan Komentar"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2527,7 +4464,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Log Tinjauan"
 
@@ -2551,24 +4488,24 @@ msgstr "Aktivitas Penyunting Terbaru"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total Tinjauan"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Tinjau Pengaya"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Mohon lengkapi isian berikut:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Silakan pilih minimum satu berkas untuk ditinjau."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Tinjauan untuk pengaya milik diri sendiri tidak diizinkan."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Perangkat Lunak Eksternal"
 
@@ -2580,39 +4517,39 @@ msgstr "Tambah pengaya istimewa"
 msgid "editors_featured_add_feature_submit"
 msgstr "Tambah"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Sukses menghapus pengaya istimewa."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Pengaya Istimewa"
 
@@ -2644,39 +4581,40 @@ msgstr "Kebijakan Pengaya"
 msgid "editors_notice_filter_session"
 msgstr "Filter ini akan tetap berlaku untuk sesi ini atau hingga dibersihkan."
 
-# %1 is the queue mode
+#. %1 is the queue mode
 #: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 hari"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 jam"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 menit"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Perangkat Penyunting"
 
-#: controllers/editors_controller.php:286
+#. %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 "hanya %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Prarilis"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2690,19 +4628,23 @@ msgstr "Bersihkan"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Aksi Peninjauan"
 
+#: views/editors/review.thtml:153
+msgid "editors_review_action_info"
+msgstr "Permintaan Informasi Lebih Lanjut"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Masukkan ke Status Publik"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Permintaan Tinjauan-Super"
 
@@ -2710,34 +4652,41 @@ msgstr "Permintaan Tinjauan-Super"
 msgid "editors_review_action_sandbox"
 msgstr "Tetapkan dalam Sandbox"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Tinjau Komentar"
 
-#: views/editors/review.thtml:167
+#: 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: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:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Ini akan menetapkan pengaya dalam status sandbox."
 
-#: views/editors/review.thtml:159
+#: 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:162
+#: 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:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Jika anda mempunyai kekhawatiran yang ingin disampaikan kepada administrator "
@@ -2765,15 +4714,15 @@ msgstr "Kategori:"
 msgid "editors_review_header_compatibility"
 msgstr "Kompatibilitas:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Deskripsi"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Komentar oleh Pengembang"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2781,85 +4730,108 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Berkas:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Riwayat Item"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Pesan Pencalonan"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Pratinjau"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Kebijakan Privasi"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Tinjau %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Catatan untuk Peninjau"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Ringkasan"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Catatan Versi"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Balas"
+
+#: views/elements/developers/editors_review_history_item.thtml:78
+msgid "editors_review_history_info_request"
+msgstr "Permintaan Keterangan"
+
+#: views/elements/developers/editors_review_history_item.thtml:62
+#: views/editors/reviewlog.thtml:77
 msgid "editors_review_history_nominated_adminreview"
 msgstr "Tinjauan Admin"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Persetujuan Pencalonan/Publik"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Penolakan Pencalonan/Sandbox"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Tidak ada entri tinjauan ditemukan."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Tinjauan Admin"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Disetujui/Publik"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Ditolak/Sandbox"
 
-#: views/editors/review.thtml:198
+#. 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] "Tampilkan/Sembunyikan Balasan (%1$s)"
+msgstr[1] "Tampilkan/Sembunyikan Balasan (%1$s)"
+
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Aplikasi:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "atau pilih balasan tertentu:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Komentar:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistem Operasi:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Atas"
 
@@ -2867,7 +4839,7 @@ msgstr "Atas"
 msgid "editors_review_next_link"
 msgstr "selanjutnya &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Tidak ada pratinjau ditemukan."
 
@@ -2875,41 +4847,55 @@ msgstr "Tidak ada pratinjau ditemukan."
 msgid "editors_review_previous_link"
 msgstr "&laquo; sebelumnya"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
+#: 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
+#. %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> dari %2$s dalam antrian"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Proses Aksi"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Aksi"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Komentar"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Tanggal"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Peninjau"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versi/Berkas"
 
-#: controllers/editors_controller.php:411
+#: 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:422
 msgid "editors_reviewed_successfully"
 msgstr "Tinjauan sukses diproses."
 
@@ -2933,7 +4919,7 @@ msgstr "Aksi"
 msgid "editors_reviews_in_reply_to"
 msgstr "Balasan untuk:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Tinjauan sukses diproses!"
 
@@ -2945,23 +4931,23 @@ msgstr "Tidak ada tinjauan pada antrian moderasi."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Proses Tinjauan"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Situs Tertentu"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Baru"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Diperbarui"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Aplikasi yang Diujikan"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistem Operasi yang Diujikan"
 
@@ -3002,17 +4988,20 @@ msgstr "Platform"
 msgid "editors_th_submissiontypes"
 msgstr "Jenis Pengajuan"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s hari"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s jam"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s menit"
@@ -3021,8 +5010,8 @@ msgstr "%s menit"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Akses ditolak"
 
@@ -3030,12 +5019,13 @@ msgstr "Akses ditolak"
 msgid "error_access_denied_message"
 msgstr "Anda tidak diizinkan untuk membuka halaman ini."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3045,18 +5035,19 @@ msgstr "Anda tidak diizinkan untuk membuka halaman ini."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Pengaya tidak ditemukan!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Tidak ada pengaya pada kategori ini!"
 
@@ -3064,7 +5055,7 @@ 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:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Tidak ada pengaya pada kategori ini!"
 
@@ -3086,24 +5077,25 @@ msgstr "Alamat email ini tidak sah."
 msgid "error_field_required"
 msgstr "Isian ini tidak boleh kosong."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Berkas tidak ditemukan!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Kesalahan pada berkas: %s tidak ada."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3120,16 +5112,18 @@ msgstr ""
 "Format URL salah. Format yang benar adalah seperti http://example.com/"
 "namahalaman."
 
+#. %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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3147,7 +5141,7 @@ msgstr "Perhatian"
 msgid "error_preview_notfound"
 msgstr "Pratinjau tidak ditemukan!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Anda harus memilih salah satu peringkat."
 
@@ -3200,8 +5194,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Nama pengguna atau kata sandi salah!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versi tidak ditemukan!"
 
@@ -3213,13 +5207,14 @@ msgstr "Kata sandi salah!"
 msgid "feature_learnmore"
 msgstr "Lebih lanjut"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Lebih lanjut tentang %s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3231,6 +5226,40 @@ msgstr[1] "%1$s tinjauan"
 msgid "feature_view_more_from_category"
 msgstr "tampilkan lebih banyak dari kategori"
 
+#. 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 "Kembali ke pengaya"
+
+#. 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 "Bentangkan semua"
+
+#. 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 "Kembali ke tinjauan"
+
+#. 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 :: Penjelajah Berkas :: Pengaya %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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Hak Cipta dilindungi undang-undang."
@@ -3267,7 +5296,7 @@ msgstr "Bahasa lainnya:"
 msgid "footer_privacy_policy"
 msgstr "Kebijakan Privasi"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Simpan"
 
@@ -3275,7 +5304,7 @@ msgstr "Simpan"
 msgid "general_addontype_dict"
 msgstr "Kamus"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Kamus"
@@ -3284,7 +5313,7 @@ msgstr "Kamus"
 msgid "general_addontype_extension"
 msgstr "Ekstensi"
 
-# 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Ekstensi"
@@ -3293,7 +5322,7 @@ msgstr "Ekstensi"
 msgid "general_addontype_lpaddon"
 msgstr "Paket Bahasa (Pengaya)"
 
-# 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Paket Bahasa (Pengaya)"
@@ -3302,7 +5331,7 @@ msgstr "Paket Bahasa (Pengaya)"
 msgid "general_addontype_lpapp"
 msgstr "Paket Bahasa (Aplikasi)"
 
-# 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Paket Bahasa (Aplikasi)"
@@ -3311,7 +5340,7 @@ msgstr "Paket Bahasa (Aplikasi)"
 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugin"
@@ -3320,7 +5349,7 @@ msgstr "Plugin"
 msgid "general_addontype_search"
 msgstr "Mesin Pencari"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Mesin pencari"
@@ -3329,11 +5358,12 @@ msgstr "Mesin pencari"
 msgid "general_addontype_theme"
 msgstr "Tema"
 
-# 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Tema"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3364,12 +5394,12 @@ msgid "header_navlink_addons"
 msgstr "Pengaya"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Log-keluar"
 
@@ -3377,39 +5407,43 @@ msgstr "Log-keluar"
 msgid "header_navlink_myaccount"
 msgstr "Akun Saya"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Daftar"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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.
+#. %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 ""
 "<a href=\"%1$s\">Log-Masuk</a> untuk memasang pengaya ini. <a href=\"%2$s"
 "\">Mengapa</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 "Pasang untuk %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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3432,7 +5466,7 @@ msgid "langtools_download_langpack"
 msgstr "Unduh Paket Bahasa"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Kamus & Paket Bahasa"
 
@@ -3488,7 +5522,7 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3521,7 +5555,7 @@ msgstr "Tema"
 msgid "other_apps_tooltip"
 msgstr "Temukan pengaya untuk aplikasi lain"
 
-# In a user list: user 1, user 2, "others"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "lainnya"
@@ -3534,35 +5568,34 @@ msgstr "Versi Aplikasi"
 msgid "page_title_credits"
 msgstr "Kredit"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Pengaya Eksperimental"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
 msgstr "Tanya-Jawab"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Tanya-Jawab untuk Gaya Firefoxmu"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Kebijakan tentang Pengaya"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Kebijakan Privasi Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Petunjuk Umum Tinjauan"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Sistem Peninjauan Sandbox"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Bantuan Pengajuan"
 
@@ -3581,6 +5614,7 @@ msgstr ""
 "yang paling sedikit mengandung satu aplikasi yang ingin didukung di bawah "
 "ini. Hanya versi di bawah ini yang diizinkan untuk aplikasi tersebut."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3589,6 +5623,8 @@ msgstr ""
 "masih diharuskan untuk menyertakannya dengan properti yang diwajibkan "
 "seperti pada disebutkan dalam spesifikasi %s."
 
+#. 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 "di sini"
@@ -3597,7 +5633,6 @@ msgstr "di sini"
 msgid "pages_appversions_versions"
 msgstr "Versi"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Kembali ke halaman sebelumnya"
 
@@ -3609,7 +5644,7 @@ msgstr "Halaman Informasi Sandbox"
 msgid "pagination_next_page"
 msgstr "selanjutnya"
 
-# %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"
@@ -3633,16 +5668,16 @@ msgstr "Ketik di sini:"
 msgid "recaptcha_enter_whatyouhear"
 msgstr "Ketikkan apa yang telah Anda dengar."
 
-# %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 ""
 "Jika susah dimengerti, Anda dapat <a href=\"%1$s\">mendengarkan lainnya</a> "
 "atau <a href=\"%2$s\">kembali ke mode tulisan</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
 msgid "recaptcha_hardtoread_text"
 msgstr ""
@@ -3657,7 +5692,7 @@ msgstr "Benarkah anda manusia?"
 msgid "recaptcha_whatsthis"
 msgstr "Apa artinya?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Kesalahan terjadi saat menandai tinjauan ini!"
 
@@ -3682,7 +5717,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam atau isi yang tidak dapat ditinjau"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr ""
 "Terima kasih, tinjauan ini telah ditandai untuk mendapatkan persetujuan "
@@ -3698,7 +5733,7 @@ msgstr ""
 "Apakah tinjauan ini tidak pantas, tidak akurat atau spam? Jika ya, klik di "
 "sini untuk menandai tinjauan ini agar ditinjau oleh penyunting."
 
-# %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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3719,21 +5754,22 @@ msgstr ""
 "tentang Tinjauan</a> untuk keterangan lebih lanjut tentang tinjauan pengguna "
 "untuk pengaya ini</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 "Tinjauan untuk for %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Rekomendasi Pengaya"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Pengaya Baru"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Versi Baru Pengaya"
 
@@ -3770,6 +5806,7 @@ msgstr "Semua Mesin Pencari"
 msgid "search_landing_browse_search_engines"
 msgstr "Jelajahi Mesin Pencari"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3789,12 +5826,13 @@ msgstr "Cari Pengaya"
 msgid "search_rss_description"
 msgstr "Feed hasil pencarian"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Hasil pencarian untuk: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Perangkat Admin"
 
@@ -3802,7 +5840,7 @@ msgstr "Perangkat Admin"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Perangkat Pengembang"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Perangkat Penyunting"
 
@@ -3810,6 +5848,7 @@ msgstr "Perangkat Penyunting"
 msgid "sidebar_navlink_welcome"
 msgstr "Selamat Datang"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3847,6 +5886,7 @@ msgstr "Tema"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Versi Baru Pengaya"
 
+#. %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
@@ -3858,7 +5898,7 @@ msgstr "%1$s KB"
 msgid "stars_not_yet_rated"
 msgstr "Belum diperingkat"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3876,24 +5916,32 @@ msgstr "Perangkat Pengembang"
 msgid "statistics_addon_switch"
 msgstr "Pindah ke"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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:147 views/statistics/addon.thtml:158
+#: 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 "%1$s dibuat"
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3935,7 +5983,7 @@ msgstr "Panel Statistik"
 msgid "statistics_index_view_button"
 msgstr "Tampilkan Statistik"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Tampilkan tabel ini dalam format CSV"
 
@@ -3951,7 +5999,7 @@ msgstr "Hapus plot ini"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Dikelompokkan: Hari"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Dikelompokkan: Bulan"
 
@@ -3959,103 +6007,107 @@ msgstr "Dikelompokkan: Bulan"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Dikelompokkan: Mingguan"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Bandingkan dalam: Mingguan"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s ditemukan pada rentang"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Tambahkan plot"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Tambahkan plot lain pada grafik ini"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Sembunyikan Jumlah Total"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Tampilkan Jumlah Total"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Buat plot jumlah total pada grafik ini"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Tampilkan data (format CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Sembunyikan Event untuk %s"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Tampilkan Event untuk %s"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Sembunyikan Event untuk Firefox"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Tampilkan Event untuk Firefox"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Perkecil Grafik"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Perlebar Grafik"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Ganti ukuran grafik"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Pengguna Aktif Harian"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplikasi"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Suka-suka"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Jumlah Unduhan"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistem Operasi"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Status Pengaya"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Ringkasan"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Versi Pengaya"
 
@@ -4079,13 +6131,13 @@ msgstr "Tidak Diketahui"
 msgid "statistics_longnames_version"
 msgstr "Versi Pengaya"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "Data masih belum cukup untuk ditampilkan pada grafik. Mohon periksa lagi "
 "nanti."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "Kami masih tidak memiliki data untuk pengaya anda. Mohon periksa lagi "
@@ -4098,11 +6150,11 @@ msgstr ""
 "masih belum diperbarui pada saat skrip kami sedang memproses informasi "
 "tersebut. Mohon periksa lagi beberapa menit lagi."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "Panel Statistik sedang dimatikan. Mohon periksa lagi nanti."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "JavaScript harus diaktifkan untuk menampilkan grafik Panel Statistik."
 
@@ -4117,36 +6169,36 @@ msgstr "Pengaturan baru anda telah disimpan!"
 msgid "statistics_pagetitle"
 msgstr "Panel Statistik"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Pengguna Aktif Harian"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Jumlah Unduhan Harian"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Perbesar"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Perbesar satu bulan"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Perkecil"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Perkecil satu bulan"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Ringkasan harian statistik untuk %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Feed RSS data ringkasan"
 
@@ -4186,23 +6238,23 @@ msgstr "Publik"
 msgid "statistics_settings_access_public_description"
 msgstr "Semua orang dapat melihat statistik pengaya ini"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Ubah Pengaturan"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Mohon perlakukan informasi ini secara rahasia."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Panel dalam mode <b>pribadi</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Panel dalam mode <b>publik</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Terkunci"
 
@@ -4219,7 +6271,7 @@ msgstr "Simpan Pengaturan"
 msgid "statistics_settings_title"
 msgstr "Pengaturan Panel Statistik untuk %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Tidak Terkunci"
 
@@ -4243,7 +6295,7 @@ msgstr "Uk"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Rata-rata Jumlah Unduhan Harian"
 
@@ -4251,37 +6303,37 @@ msgstr "Rata-rata Jumlah Unduhan Harian"
 msgid "statistics_summary_downloads_heading"
 msgstr "Unduhan"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Perhitungan Harian Terakhir"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Unduhan sejak 7 hari terakhir"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Unduhan Total"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Sejak %1$s"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Belum ada data"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Rata-rata Pengguna Aktif Harian"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Perubahan sejak perhitungan sebelumnya"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s pada %2$s"
@@ -4290,17 +6342,17 @@ msgstr "%1$s pada %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Pengguna Aktif Harian"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Pengguna Aktif Harian"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Pada %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Statistik %1$s"
@@ -4325,7 +6377,7 @@ msgstr "Ubah kata sandi"
 msgid "user_confirmationcode_resent"
 msgstr "Kode konfirmasi telah dikirim ulang!"
 
-# %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:49
 msgid "user_del_account_deleted"
 msgstr ""
@@ -4344,7 +6396,7 @@ msgstr "Konfirmasi Kata Sandi"
 msgid "user_del_deletenow"
 msgstr "Hapus akun pengguna saya sekarang"
 
-# %1 is the URL of the user's info page
+#. %1 is the URL of the user's info page
 #: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4354,7 +6406,7 @@ msgstr ""
 "dapat menghapus akun anda dari daftar penyusun pengaya pada pengaya anda. "
 "Setelah itu, baru anda dapat menghapus akun anda dari halaman ini."
 
-# %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr ""
@@ -4371,7 +6423,7 @@ msgstr ""
 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
+#. %1 is a link to the amo-admins mailing list
 #: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4383,7 +6435,7 @@ msgstr ""
 msgid "user_del_header_confirm_deletion"
 msgstr "Konfirmasi penghapusan akun"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Hapus Akun Pengguna %1$s"
@@ -4410,7 +6462,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4429,7 +6481,7 @@ msgstr ""
 msgid "user_deleted_nickname"
 msgstr "Pengguna yang Dihapus"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4442,9 +6494,9 @@ msgstr ""
 msgid "user_edit_delete_user"
 msgstr "Hapus akun pengguna"
 
-# 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4464,7 +6516,7 @@ msgstr ""
 "Terima kasih telah bergabung dengan Pengaya %2$s\n"
 "-- Staf Pengaya %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4490,8 +6542,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Terima kasih telah bergabung dengan Pengaya %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
 #, php-format
 msgid "user_email_pwreset"
@@ -4518,7 +6570,7 @@ msgstr "Reset kata sandi Pengaya %s anda"
 msgid "user_emailchange_error"
 msgstr "Kesalahan!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4528,7 +6580,7 @@ msgstr "Mohon konfirmasi perubahan alamat email anda di Pengaya %1$s"
 msgid "user_emailchange_success"
 msgstr "Sukses!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4698,7 +6750,7 @@ msgstr "Kirim tautan untuk mereset kata sandi"
 msgid "user_register_amo_link"
 msgstr "Pengaya %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"
@@ -4707,7 +6759,7 @@ msgstr ""
 "anda di %1$s. Anda harus mengklik tautan tersebut sebelum bisa log-masuk ke "
 "Pengaya %2$s."
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4724,7 +6776,7 @@ msgstr "kirim ulang email konfirmasi"
 msgid "user_register_congratulations"
 msgstr "Selamat! Akun anda telah sukses dibuat."
 
-# %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"
@@ -4733,7 +6785,7 @@ msgstr ""
 "menandainya sebagai \"email sampah (junk)\" atau \"spam\". Jika masih tidak "
 "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
+#. %1 is the link to the Mozilla Add-ons front page
 #: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
@@ -4795,7 +6847,7 @@ msgstr "Nama alias (nick)"
 msgid "users_info_pagetitle"
 msgstr "Keterangan Pengguna %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Tinjauan oleh %s"
@@ -4804,8 +6856,8 @@ msgstr "Tinjauan oleh %s"
 msgid "users_login_pagetitle"
 msgstr "Log-masuk Pengguna"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4814,8 +6866,8 @@ msgstr ""
 "di situs Pengaya Mozilla, mohon log-masuk terlebih dulu atau <a href=\"%1$s"
 "\">baca lebih lanjut tentang sandbox.</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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4831,3 +6883,41 @@ msgstr "Reset Kata Sandi Pengguna"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Pendaftaran Pengguna Baru"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Versi terakhir kompatibel dengan"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "sidebar_navlink_tools"
+#~ msgstr "Perangkat"
+<<<<<<< HEAD:site/app/locale/id/LC_MESSAGES/messages.po
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+=======
+>>>>>>> merged w/ en_US and compiled.:site/app/locale/id/LC_MESSAGES/messages.po
diff --git a/site/app/locale/id/pages/experimental_addons.thtml b/site/app/locale/id/pages/experimental_addons.thtml
deleted file mode 100644
index a165453..0000000
--- a/site/app/locale/id/pages/experimental_addons.thtml
+++ /dev/null
@@ -1,38 +0,0 @@
-<h1>Pengaya Eksperimental</h1>
-
-
-<h2>Apa itu pengaya eksperimental?</h2>
-
-<p>Pengaya eksperimental sebenarnya diperuntukkan untuk pengguna berpengalaman 
-untuk keperluan uji coba pengaya sebelum pengaya tersebut tersedia dan dapat 
-ditinjau untuk keperluan umum. Banyak pengaya yang masih dalam bentuk 
-prototipe. Dalam istilah pengembangan perangkat lunak, pengaya eksperimental 
-mungkin berstatus alfa, beta, atau pra-produksi dalam hal kualitas, 
-performansi, dan fitur yang diberikan olehnya.</p>
-
-<p>Prinsip kehati-hatian harus diterapkan ketika memasang pengaya 
-eksperimental karena pengaya tersebut masih belum diuji oleh seorang penyunting 
-dan mungkin dapat membuat kerusakan pada konfigurasi komputer anda.</p>
-
-
-<h2>Bagaimana saya dapat mengetahui apakah sebuah pengaya merupakan pengaya 
-eksperimental ketika berada di situs?</h2>
-
-<p>Pengaya eksperimental ditandai dengan tulisan eksperimental dan mewajibkan 
-pengguna untuk log-masuk sebelum dapat dipasang</p>
-
-
-<h2>Mengapa saya harus melakukan proses log-masuk untuk memasang pengaya 
-eksperimental?</h2>
-
-<p>Situs pengaya mewajibkan pengguna untuk log-masuk sebelum memasang pengaya 
-eksperimental untuk mengingatkan pengguna bahwa langkah yang mereka tempuh 
-mengandung resiko tertentu.</p>
-
-
-<h2>Apakah saya harus log-masuk atau membutuhkan sebuah akun untuk memasang 
-pengaya publik?</h2>
-
-<p>Tidak. Situs pengaya tidak mewajibkan anda untuk memiliki akun atau 
-melakukan proses log-masuk untuk memasang pengaya publik.</p>
-
diff --git a/site/app/locale/it/LC_MESSAGES/messages.po b/site/app/locale/it/LC_MESSAGES/messages.po
index 8e1c9a2..7c4b519 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-02-12 09:47+0100\n"
+"PO-Revision-Date: 2009-03-18 11:05+0100\n"
 "Last-Translator: Francesco Lodolo <francesco.lodolo@mozillaitalia.org>\n"
 "Language-Team: ITALIAN <francesco.lodolo@mozillaitalia.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,67 +20,85 @@ msgstr ""
 msgid "a_cancel_installation"
 msgstr "Annulla installazione"
 
-#: 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
+#. 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 "Scarica ora %s"
 
-#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
+#: views/addons/policy.thtml:78
+#: views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Accetta e scarica"
 
-#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
+#: 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/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 "Pubblico"
+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
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Aggiunto %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Aggiornato il %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versione %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "download totali"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
+#. %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"
@@ -96,32 +114,39 @@ msgstr "per pagina"
 msgid "addon_list_sortby"
 msgstr "Ordinato per:"
 
-#: views/elements/addon_listitem.thtml:69 views/elements/feature.thtml:89
-#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71
+#: views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "consigliato"
 
-# %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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s non è disponibile per %2$s."
 
-# %1 is the addon 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
+#. %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 "Torna a %1$s…"
 
-# %1 is the addon name
-#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#. %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"
@@ -139,6 +164,7 @@ msgstr "Recensione:"
 msgid "addon_review_add_submit"
 msgstr "Invia la tua recensione"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -148,7 +174,8 @@ msgstr "Aggiungi una recensione per %s"
 msgid "addon_review_add_title_field"
 msgstr "Titolo/Sommario:"
 
-#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
+#: views/reviews/display.thtml:81
+#: views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Elimina"
 
@@ -172,54 +199,48 @@ msgstr "Sì"
 msgid "addon_review_delete_header"
 msgstr "Elimina recensione"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Recensione eliminata con successo."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Modifica la recensione per %s"
 
-# %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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: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: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.
+#. %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] ""
-"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 addon name
+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
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Recensioni per %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -233,27 +254,33 @@ msgstr "Risposta dello sviluppatore:"
 msgid "addon_review_saved_successfully"
 msgstr "La tua recensione è stata salvata con successo."
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
-#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#: 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:77 views/reviews/delete.thtml:49
+#. %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 "di %1$s del %2$s (voto %3$s)"
 
 #: views/addons/category_landing.thtml:138
-#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: 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/category_landing.thtml:129
+#: views/addons/home.thtml:103
 #: views/addons/home.thtml:104
 msgid "addon_slider_tooltip_previous"
 msgstr "Componente aggiuntivo precedente"
@@ -262,31 +289,35 @@ msgstr "Componente aggiuntivo precedente"
 msgid "addon_version_permalink"
 msgstr "Collegamento permanente a questa versione"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "La versione più recente compatibile con"
+#. %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 "La versione più recente compatibile con %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Vai"
 
-#: views/elements/fyf_promotion.thtml:51 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:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "Visualizza tutti i temi :: %1$s Add-on"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "Visualizza i temi in %1$s :: %2$s Add-on"
 
@@ -294,7 +325,7 @@ msgstr "Visualizza i temi in %1$s :: %2$s Add-on"
 msgid "addons_display_add_review"
 msgstr "Aggiungi una recensione"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Dettagli"
 
@@ -302,11 +333,12 @@ msgstr "Dettagli"
 msgid "addons_display_categories"
 msgstr "Categorie"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "Recensione completa"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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"
@@ -315,148 +347,153 @@ msgstr "Non mi piace"
 msgid "addons_display_edit_review"
 msgstr "Modifica la tua recensione"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Questo componente aggiuntivo include un'informativa sulla privacy"
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Commenti dello sviluppatore"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232
+#: views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Sito web"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Recensioni"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249
+#: views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Supporto"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393
+#: views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Mi piace"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Descrizione"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Altre immagini"
 
-# %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:421
-#, fuzzy
+#. %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] "Altri componenti aggiuntivi di %1$s"
-msgstr[1] "Other add-ons by these authors"
-
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+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:147
+#: controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-# php-format
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: 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."
 
-# php-format
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr ""
-"Il supporto per questa estensione è fornito dallo sviluppatore su %s o "
-"inviando una e-mail a %s."
+msgstr "Il supporto per questa estensione è fornito dallo sviluppatore su %s o inviando una e-mail a %s."
 
-# php-format
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Vota"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
-"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:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Invia"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Visualizza tutte le recensioni (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Cronologia completa delle versioni"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359
+#: views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Visualizza i sorgenti"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Visualizza statistiche"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Che cosa ne pensi?"
 
@@ -466,27 +503,32 @@ msgstr "È compatibile con:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
-#: views/addons/policy.thtml:62 views/addons/display.thtml:68
+#: 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/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: 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
+#: views/addons/themes_landing.thtml:49
+#: views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Consigliati da noi"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211
+#: controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383
+#: controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657
+#: controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, 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."
+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:201
 msgid "addons_home_newest_header"
@@ -496,31 +538,47 @@ msgstr "Nuovi:"
 msgid "addons_home_other_applications"
 msgstr "Altre applicazioni"
 
-#: controllers/developers_controller.php:64
+#. %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:610
+#: controllers/components/simple_acl.php:81
+#: controllers/components/amo.php:610
 #: 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/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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
-#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178
+#: controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283
+#: controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516
+#: controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803
+#: controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885
+#: controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -541,8 +599,10 @@ msgstr "Consigliati da noi:"
 msgid "addons_home_updated_header"
 msgstr "Aggiornati di recente:"
 
-#: views/addons/home.thtml:189 views/addons/home.thtml:199
-#: views/addons/home.thtml:209 views/addons/home.thtml:219
+#: 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"
 
@@ -564,11 +624,7 @@ msgstr "Visualizza tutti i componenti aggiuntivi aggiornati di recente"
 
 #: 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/install.thtml:107
 msgid "addons_install_in_sunbird_title"
@@ -576,12 +632,7 @@ msgstr "Come installare in Sunbird"
 
 #: 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/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
@@ -595,9 +646,12 @@ msgstr "Visualizza i componenti aggiuntivi sperimentali"
 msgid "addons_options_submit"
 msgstr "Vai"
 
-#: 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: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"
@@ -606,21 +660,21 @@ msgstr "Di"
 msgid "addons_plugins_for_linux"
 msgstr "per Linux"
 
-#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
+#: views/addons/plugins.thtml:113
+#: views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "per Mac OS X"
 
-#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
+#: 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: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:152
 msgid "addons_plugins_looking_for_plugin"
@@ -628,139 +682,144 @@ msgstr "Stai cercando un plugin che non risulta tra quelli disponibili?"
 
 #: 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."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugin più comuni per %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724
+#: controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Plugin"
 
-#: 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: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: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 addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Anteprime per %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50
+#: controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Componenti aggiuntivi consigliati"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "consigliati da noi"
 
-#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
+#: 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:153 views/addons/searchengines.thtml:169
+#. link text devmo
+#: 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: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:150 views/addons/searchengines.thtml:167
+#. %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 "Scopri come %1$s nel %2$s."
 
-# link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
+#. 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 "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
-# link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
+#. link text for "make your own" (opensearch engine)
+#: 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:148 views/addons/searchengines.thtml:166
+#. %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 "Scopri altri motori di ricerca su %1$s"
 
-# link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
+#. 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:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884
+#: controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Motori di ricerca"
 
-#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
+#: 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."
 
-#: 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
 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"
 
-#: controllers/components/amo.php:195 controllers/components/amo.php:226
+#: controllers/components/amo.php:195
+#: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "Nella Sandbox; in attesa di revisione"
 
-#: controllers/components/amo.php:199 controllers/components/amo.php:228
+#: controllers/components/amo.php:199
+#: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Pubblicato"
 
-#: controllers/components/amo.php:193 controllers/components/amo.php:225
+#: controllers/components/amo.php:193
+#: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "Nella Sandbox"
 
@@ -768,7 +827,8 @@ msgstr "Nella Sandbox"
 msgid "addons_status_unknown"
 msgstr "Sconosciuto"
 
-#: views/elements/fyf_promotion.thtml:50 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"
 
@@ -778,15 +838,15 @@ msgstr "Attenzione alle vecchie versioni"
 
 #: 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."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50
+#: controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Cronologia delle versioni con elenco delle modifiche (changelog)"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s cronologia delle versioni"
@@ -799,6 +859,7 @@ msgstr "Aggiungi gruppo"
 msgid "admin_group_delete_pagetitle"
 msgstr "Elimina gruppo"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -808,7 +869,8 @@ 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"
 
@@ -816,7 +878,8 @@ 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"
 
@@ -828,7 +891,8 @@ msgstr "Avanzata"
 msgid "advanced_search_form_any_time"
 msgstr "qualsiasi periodo"
 
-#: views/elements/search.thtml:95 views/elements/search.thtml:108
+#: views/elements/search.thtml:95
+#: views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "qualsiasi"
 
@@ -922,53 +986,50 @@ msgstr "Ignora i controlli di compatibilità"
 
 #: 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: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: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: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:61
 msgid "app_compat_update_firefox"
-msgstr ""
-"<a href=\"http://getfirefox.com\">Aggiorna Firefox</a> per utilizzare questo "
-"componente aggiuntivo"
+msgstr "<a href=\"http://getfirefox.com\">Aggiorna Firefox</a> per utilizzare questo componente aggiuntivo"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "componenti per nome"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "i nuovi arrivi"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "i più popolari"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "componenti per voto"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 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"
 
@@ -996,8 +1057,9 @@ msgstr "Ordina per aggiornamento"
 msgid "category_extra_mostpopular"
 msgstr "Ordina per popolarità"
 
-# %1 is the category name
-#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#. %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"
@@ -1006,16 +1068,22 @@ msgstr "Visualizza tutti %1$s"
 msgid "collection_not_found"
 msgstr "Raccolta non trovata!"
 
+#. %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"
+
 #: 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: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:107
 msgid "compatibility_dashboard_loading"
@@ -1025,7 +1093,8 @@ msgstr "Caricamento dati…"
 msgid "compatibility_dashboard_main_link"
 msgstr "Ritorna alla pagina principale"
 
-#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
+#: views/compatibility/dashboard.thtml:104
+#: views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Rapporto compatibilità componenti aggiuntivi"
 
@@ -1043,12 +1112,11 @@ msgstr "Modifica maxVersion senza upload"
 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: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:118
 msgid "compatibility_developers_mdclogo_alt"
@@ -1067,32 +1135,33 @@ msgstr "Risultati del controllo compatibilità"
 msgid "compatibility_developers_retrieving"
 msgstr "Recupero stato dei componenti aggiuntivi ospitati…"
 
+#. %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 %2$s utenti (%3$s&#37; del totale)"
 
 #: 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: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: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: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:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Componenti aggiuntivi compatibili con una versione alfa di %1$s"
@@ -1101,16 +1170,16 @@ msgstr "Componenti aggiuntivi compatibili con una versione alfa di %1$s"
 msgid "compatibility_report_legend_beta"
 msgstr "Versioni beta"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: 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: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:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Componenti aggiuntivi compatibili con le ultime versioni di %1$s"
@@ -1119,6 +1188,7 @@ msgstr "Componenti aggiuntivi compatibili con le ultime versioni di %1$s"
 msgid "compatibility_report_legend_other"
 msgstr "Altre versioni"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Componenti aggiuntivi non compatibili con alcuna versione di %1$s"
@@ -1128,7 +1198,8 @@ msgid "compatibility_report_title"
 msgstr "Rapporto compatibilità componenti aggiuntivi"
 
 #: views/compatibility/dashboard.thtml:50
-#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
+#: views/compatibility/dashboard.thtml:148
+#: views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Informazioni per gli utenti"
 
@@ -1136,20 +1207,19 @@ msgstr "Informazioni per gli utenti"
 msgid "compatibility_view_report"
 msgstr "Visualizza il rapporto compatibilità"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Per informazioni su come contribuire, consultare il nostro %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "pagina wiki"
 
 #: 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:101
 msgid "credits_section_developers"
@@ -1177,32 +1247,44 @@ msgstr "Software e immagini"
 
 #: 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: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>."
 
-# 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/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 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
+#: 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)
+#. 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, %I:%M:%p"
@@ -1228,25 +1310,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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:1288
+msgid "devcp_add_previews_extension_error"
+msgstr "Il file %1$s ha un'estensione non valida (%2$s). Estensioni consentite: %3$s"
+
+#. %s is the filename.
+#: 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: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:1318
+msgid "devcp_add_previews_success_upload"
+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."
+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"
@@ -1284,36 +1383,36 @@ msgstr "Passaggio 5: operazione conclusa"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Guida per l'inserimento"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Componente aggiuntivo disattivato con successo"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Modifica componente aggiuntivo"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Componente aggiuntivo attivato con successo"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Descrizione"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Sito web"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Nome"
 
@@ -1322,46 +1421,222 @@ msgstr "Nome"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Descrizione dell'anteprima"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Informativa sulla privacy"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Riepilogo"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "E-mail per il supporto"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL per il supporto"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Note sulla versione"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Segnala il componente aggiuntivo"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Componente aggiuntivo segnalato con successo"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: views/developers/addon_status.thtml:178
+msgid "devcp_addon_status_action_activate"
+msgstr "Attiva"
+
+#: views/developers/addon_status.thtml:179
+msgid "devcp_addon_status_action_activate_description"
+msgstr "Attiva il tuo componente aggiuntivo per farlo comparire nell'elenco pubblico e attivare il servizio di aggiornamento automatico."
+
+#: views/developers/addon_status.thtml:136
+msgid "devcp_addon_status_action_complete"
+msgstr "Imposta come completo"
+
+#: views/developers/addon_status.thtml:137
+msgid "devcp_addon_status_action_complete_description"
+msgstr "Imposta come completo il tuo componente aggiuntivo e spostalo nella Sandbox"
+
+#: views/developers/addon_status.thtml:182
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Disattiva"
+
+#: views/developers/addon_status.thtml:183
+msgid "devcp_addon_status_action_deactivate_description"
+msgstr "Disattiva il tuo componente aggiuntivo per rimuoverlo dall'elenco pubblico e disattivare il servizio di aggiornamento automatico."
+
+#: views/developers/addon_status.thtml:144
+msgid "devcp_addon_status_action_move"
+msgstr "Sposta nella Sandbox"
+
+#: views/developers/addon_status.thtml:145
+msgid "devcp_addon_status_action_move_description"
+msgstr "Sposta il tuo componente aggiuntivo nella Sandbox. L'azione può essere annullata."
+
+#: views/developers/addon_status.thtml:140
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nomina per la pubblicazione"
+
+#: views/developers/addon_status.thtml:141
+msgid "devcp_addon_status_action_nominate_description"
+msgstr "Nomina il tuo componente aggiuntivo per la pubblicazione"
+
+#: views/developers/addon_status.thtml:148
+msgid "devcp_addon_status_action_public"
+msgstr "Pubblica"
+
+#: views/developers/addon_status.thtml:149
+msgid "devcp_addon_status_action_public_description"
+msgstr "Rendi nuovamente disponibile al pubblico il tuo componente aggiuntivo."
+
+#: views/developers/addon_status.thtml:170
+msgid "devcp_addon_status_active"
+msgstr "Il tuo 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+msgid "devcp_addon_status_criteria_category"
+msgstr "Selezionare almeno una categoria"
+
+#: views/developers/addon_status.thtml:101
+msgid "devcp_addon_status_criteria_description"
+msgstr "La descrizione è obbligatoria"
+
+#: views/developers/addon_status.thtml:99
+msgid "devcp_addon_status_criteria_name"
+msgstr "Il nome è obbligatorio"
+
+#: views/developers/addon_status.thtml:121
+msgid "devcp_addon_status_criteria_prerelease"
+msgstr "Il componente aggiuntivo non è segnalato come pre-release."
+
+#: views/developers/addon_status.thtml:119
+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"
+
+#. %s is the status in a span, e.g. "<span>_('Public')</span>".
+#: views/developers/addon_status.thtml:58
+msgid "devcp_addon_status_header"
+msgstr "Stato: %s"
+
+#: views/developers/addon_status.thtml:153
+msgid "devcp_addon_status_header_actions"
+msgstr "Azioni disponibili"
+
+#: views/developers/addon_status.thtml:169
+msgid "devcp_addon_status_header_active"
+msgstr "Stato attività: <span class=\"inactive-0\">attivo</span>"
+
+#: views/developers/addon_status.thtml:97
+msgid "devcp_addon_status_header_criteria"
+msgstr "Criteri per il completamento"
+
+#: views/developers/addon_status.thtml:165
+msgid "devcp_addon_status_header_inactive"
+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:191
+msgid "devcp_addon_status_header_trusted"
+msgstr "Stato fiducia: <span class=\"status-4\">affidabile</span>"
+
+#: views/developers/addon_status.thtml:166
+msgid "devcp_addon_status_inactive"
+msgstr "Il tuo 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: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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:64
+msgid "devcp_addon_status_public"
+msgstr "Pubblico"
+
+#: views/developers/addon_status.thtml:63
+msgid "devcp_addon_status_sandbox"
+msgstr "Sandbox"
+
+#. %s is an email address.
+#: views/developers/addon_status.thtml:89
+msgid "devcp_addon_status_switch_disabled"
+msgstr "Il tuo 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>."
+
+#. %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."
+
+#. %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."
+
+#: 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 "Stato %s"
+
+#: 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."
+
+#. %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."
+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"
@@ -1373,32 +1648,23 @@ 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."
+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
+#. %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."
+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
+#. %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."
+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"
@@ -1406,38 +1672,32 @@ msgstr "segnalare"
 
 #: views/developers/add_step5.thtml:51
 msgid "devcp_addon_submission_success"
-msgstr ""
-"L'inserimento del tuo componente aggiuntivo è stato completato con successo."
+msgstr "L'inserimento del tuo componente aggiuntivo è stato completato con successo."
 
 #: views/developers/add_step5.thtml:54
 msgid "devcp_addon_submission_trusted_public"
-msgstr ""
-"Dal momento che il tuo componente aggiuntivo è considerato affidabile, "
-"questa versione è stata automaticamente approvata e inserita nella sezione "
-"pubblica."
+msgstr "Dal momento che il tuo componente aggiuntivo è considerato affidabile, questa versione è stata automaticamente approvata e inserita nella sezione pubblica."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: 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:2375
+#: 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
+#. %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"
+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
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1447,18 +1707,24 @@ msgstr "Impossibile trovare l'autore [%s]"
 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
+#: 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
+#: 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
+#: 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"
 
@@ -1466,10 +1732,82 @@ msgstr "Successivo"
 msgid "devcp_change_addontype"
 msgstr "Modifica tipologia del componente aggiuntivo:"
 
-#: controllers/developers_controller.php:1402
+#: 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"
+
+#. %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 "%1$s è attualmente %2$s e %3$s"
+
+#: views/developers/dashboard.thtml:67
+msgid "devcp_dashboard_change_status"
+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."
+
+#. %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 "Stato: %s"
+
+#: views/developers/dashboard.thtml:43
+msgid "devcp_dashboard_header_main"
+msgstr "Dashboard per sviluppatori"
+
+#: views/developers/dashboard.thtml:110
+msgid "devcp_dashboard_header_welcome"
+msgstr "Benvenuto nella dashboard per sviluppatori"
+
+#: views/developers/dashboard.thtml:68
+msgid "devcp_dashboard_inactive"
+msgstr "Disattivo"
+
+#. %s is a date in the _('date') format
+#: views/developers/dashboard.thtml:65
+msgid "devcp_dashboard_last_edited"
+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."
+
+#: views/developers/dashboard.thtml:112
+msgid "devcp_dashboard_start"
+msgstr "Per iniziare"
+
+#: views/developers/dashboard.thtml:82
+msgid "devcp_dashboard_versions"
+msgstr "Versioni e file"
+
+#: views/developers/dashboard.thtml:91
+msgid "devcp_dashboard_versions_new"
+msgstr "Carica una nuova versione"
+
+#. %s is the preview ID number.
+#: controllers/developers_controller.php:1342
+msgid "devcp_delete_previews_error"
+msgstr "L'anteprima %s non può essere rimossa dal database. Riprovare in seguito."
+
+#. %s is the preview ID number.
+#: controllers/developers_controller.php:1340
+msgid "devcp_delete_previews_success"
+msgstr "L'anteprima %s è stata eliminata correttamente."
+
+#: controllers/developers_controller.php:1032
+msgid "devcp_delete_version_priv_error"
+msgstr "Non si dispone dei permessi necessari per rimuovere versioni e file."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Aggiungi anteprima"
@@ -1562,7 +1900,9 @@ msgstr "Lo sviluppatore non ha fornito una URL per il supporto."
 msgid "devcp_details_trusted"
 msgstr "Affidabile"
 
-#: views/developers/details.thtml:84 views/developers/versions.thtml:65
+#. %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 "Versione %s"
@@ -1585,13 +1925,9 @@ 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à."
+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"
@@ -1607,18 +1943,57 @@ 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."
+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/edit.thtml:65 views/developers/edit.thtml:71
+#: views/developers/discuss.thtml:68
+msgid "devcp_discuss_addreply_header"
+msgstr "Rispondi"
+
+#: views/developers/discuss.thtml:57
+msgid "devcp_discuss_allreplies_header"
+msgstr "Risposte"
+
+#. 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 "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 tuo 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"
+
+#. submit button text
+#: views/developers/discuss.thtml:79
+msgid "devcp_discuss_submit_reply"
+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."
+
+#. 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 "scritto da %1$s il %2$s"
+
+#: views/developers/edit.thtml:65
+#: views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Aggiungi autore"
 
@@ -1630,10 +2005,243 @@ msgstr "Indirizzo e-mail dell'autore"
 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:94
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Aggiungi autore"
+
+#: views/developers/addon_edit_authors.thtml:81
+msgid "devcp_edit_authors_add_email"
+msgstr "E-mail autore:"
+
+#: views/developers/addon_edit_authors.thtml:96
+msgid "devcp_edit_authors_add_loading"
+msgstr "Controllo e-mail..."
+
+#: 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:57
+msgid "devcp_edit_authors_header_current"
+msgstr "Autori attuali"
+
+#: views/developers/addon_edit_authors.thtml:49
+msgid "devcp_edit_authors_header_manage"
+msgstr "Gestione autori"
+
+#: 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: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."
+
+#: 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."
+
+#: 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."
+
+#. 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: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:61
+msgid "devcp_edit_authors_th_author"
+msgstr "Autore"
+
+#. Column name in a table.
+#: 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:62
+msgid "devcp_edit_authors_th_role"
+msgstr "Ruolo"
+
+#: views/developers/addon_edit_authors.thtml:75
+msgid "devcp_edit_authors_update_author"
+msgstr "Aggiorna autori"
+
+#: views/developers/addon_edit_categories.thtml:99
+msgid "devcp_edit_categories_button_update"
+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."
+
+#. %s is the application name (Firefox, Thunderbird).
+#: views/developers/addon_edit_categories.thtml:61
+msgid "devcp_edit_categories_header_application"
+msgstr "Categorie %s"
+
+#: views/developers/addon_edit_categories.thtml:49
+msgid "devcp_edit_categories_header_manage"
+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."
+
+#. %s is the category number (1, 2, 3).
+#: views/developers/addon_edit_categories.thtml:67
+msgid "devcp_edit_categories_label_category_num"
+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."
+
+#: 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
+msgid "devcp_edit_categories_select_application_categories"
+msgstr "Selezionare fino a 3 categorie per %s"
+
+#: 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
+msgid "devcp_edit_description_button_update"
+msgstr "Aggiorna descrizioni"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: views/developers/edit.thtml:77
 msgid "devcp_edit_error_categories_unavailable"
-msgstr ""
-"Nessuna categoria disponibile per questo tipo di componente aggiuntivo."
+msgstr "Nessuna categoria disponibile per questo tipo di componente aggiuntivo."
+
+#: 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"
@@ -1700,21 +2308,253 @@ msgstr "Locale di riferimento"
 msgid "devcp_edit_locale_disambiguation_explanation"
 msgstr "brevi dettagli (ad es. il nome del dialetto locale)"
 
+#: 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 "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'"
+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
+#, fuzzy
+msgid "devcp_editbox_authors"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
 
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Componenti aggiuntivi consigliati"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1723,7 +2563,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Recensioni moderate (%s)"
 msgstr[1] "Recensioni moderate (%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
 #, php-format
@@ -1732,7 +2572,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Componenti aggiuntivi segnalati (%s)"
 msgstr[1] "Componenti aggiuntivi segnalati (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1745,8 +2585,8 @@ msgstr[1] "Aggiornamenti in sospeso (%s)"
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "I file selezionati verranno eliminati."
 
-# %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"
@@ -1772,58 +2612,64 @@ msgstr "Note per i revisori"
 msgid "devcp_editversion_submit_update"
 msgstr "Aggiorna"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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>"
+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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Consultare %s come riferimento."
 
+#. 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 "questa pagina"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, fuzzy, php-format
+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 ""
-"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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Non tutte le GUID del file corrispondono"
 
@@ -1833,8 +2679,7 @@ 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
@@ -1853,22 +2698,21 @@ msgstr "Eccede la dimensione massima consentita per l'upload"
 msgid "devcp_error_http_nofile"
 msgstr "Non è stato caricato nessun file"
 
+#. %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 ""
-"Questa estensione (%s) non è consentita per un'icona. Utilizzare una delle "
-"seguenti estensioni: %s"
+msgstr "Questa estensione (%s) non è consentita per un'icona. Utilizzare una delle seguenti estensioni: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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."
+msgstr "Una versione identica (%s) è già presente per questo componente aggiuntivo e questa piattaforma."
 
-#: controllers/developers_controller.php:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Non è presente il file install.rdf."
 
@@ -1876,52 +2720,50 @@ 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:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Seleziona una tipologia valida per il componente aggiuntivo."
 
+#. %$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 "%s non è una versione valida per %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "L'ID di questo componente aggiuntivo non è valido: %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 non è una versione valida per %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"
 msgstr "Non è possibile spostare il file"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1938,27 +2780,23 @@ 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:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "È necessario fornire i dettagli richiesti per la segnalazione."
 
-#: controllers/developers_controller.php:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
-msgstr ""
-"Puoi segnalare solamente i componenti aggiuntivi che si trovano nella "
-"sandbox."
+msgstr "Puoi segnalare solamente i componenti aggiuntivi che si trovano nella sandbox."
 
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
@@ -1966,39 +2804,34 @@ 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 (%s) non è consentita per un'anteprima. Utilizzare una "
-"delle seguenti estensioni: %s"
+msgstr "Questa estensione (%s) non è consentita per un'anteprima. Utilizzare una delle seguenti estensioni: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Inserire un file da caricare."
@@ -2007,7 +2840,8 @@ msgstr "Inserire un file da caricare."
 msgid "devcp_file_addanother"
 msgstr "Aggiungi un file per un'altra piattaforma"
 
-#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+#: views/developers/add_step2.thtml:93
+#: views/developers/add_step2.thtml:99
 msgid "devcp_form_author_add"
 msgstr "Aggiungi autore"
 
@@ -2017,14 +2851,11 @@ 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."
+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."
+msgstr "Non sono disponibili categorie per questo tipo di componente aggiuntivo."
 
 #: views/developers/add_step2.thtml:132
 msgid "devcp_form_error_description_notempty"
@@ -2070,7 +2901,8 @@ msgstr "Indirizzo e-mail dell'autore"
 msgid "devcp_form_label_authors"
 msgstr "Autori"
 
-#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+#: views/developers/add_step2.thtml:103
+#: views/developers/add_step3.thtml:107
 msgid "devcp_form_label_categories"
 msgstr "Categorie"
 
@@ -2106,7 +2938,8 @@ msgstr "File icona"
 msgid "devcp_form_label_name"
 msgstr "Nome"
 
-#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: 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"
@@ -2157,9 +2990,7 @@ msgstr "Note per i revisori"
 
 #: views/developers/add_step3.thtml:114
 msgid "devcp_form_trustedaddon_destination"
-msgstr ""
-"Poiché il tuo componente aggiuntivo è considerato affidabile, puoi scegliere "
-"dove inserire questa versione:"
+msgstr "Poiché il tuo componente aggiuntivo è considerato affidabile, puoi scegliere dove inserire questa versione:"
 
 #: views/developers/add_step3.thtml:119
 msgid "devcp_form_trustedaddon_destination_public"
@@ -2222,16 +3053,11 @@ msgstr "I miei componenti aggiuntivi"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Campi localizzati"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: 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:68
@@ -2267,51 +3093,79 @@ msgstr "Inserisci un nuovo componente aggiuntivo"
 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: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 "Ritorno ai dettagli del componente aggiuntivo"
 
-# %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 "Segnala %s"
 
-# %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 "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: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 ""
-"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
+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."
+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 rimosso 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."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2340,30 +3194,111 @@ msgstr "Modifica anteprima"
 msgid "devcp_preview_updated_successfully"
 msgstr "Anteprima aggiornata con successo."
 
+#: 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 ""
-"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:79
+#, fuzzy
+msgid "devcp_previews_header_caption"
+msgstr "Preview Caption"
+
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "Modifica anteprima"
 
+#: 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 "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:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Elimina anteprima"
@@ -2380,61 +3315,150 @@ msgstr "Modifica anteprima"
 msgid "devcp_previews_submit_upload"
 msgstr "Carica anteprima"
 
+#: views/developers/previews.thtml:77
+msgid "devcp_previews_thumbnail"
+msgstr "Miniatura"
+
+#. %s is the add-on name.
+#: views/developers/previews.thtml:43
+msgid "devcp_previews_title"
+msgstr "Gestione anteprime - %s"
+
 #: views/developers/add_step2.thtml:64
 msgid "devcp_question_addontype_incorrect"
 msgstr "Non corretto?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Vuoi eliminare questo file?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: views/developers/uploader.thtml:71
+#: views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
-msgstr ""
-"Prima di procedere controlla e accetta 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
+#, 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 ""
-"Non effettuare la revisione delle informazioni per questa versione del "
-"componente aggiuntivo"
+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:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> utenti attivi per giorno"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> download totali"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> download settimanali"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
-"Al momento non è possibile inserire nuovi componenti aggiuntivi. Riprovare "
-"più tardi."
+msgstr "Al momento non è possibile inserire nuovi componenti aggiuntivi. Riprovare più tardi."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76
+#: views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Accetto"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75
+#: views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Non accetto"
 
@@ -2450,23 +3474,22 @@ msgstr "Disattivato"
 msgid "devcp_summary_header_trusted"
 msgstr "Affidabile"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: views/developers/dashboard.thtml:85
+#: views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Ultima versione:"
 
-# %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 ""
-"Non hai ancora pubblicato alcun componente aggiuntivo. Fai clic %s per "
-"inserirne uno."
+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
+#. %1 is the link to the preview upload page
 #: views/developers/add_step5.thtml:68
 #, php-format
 msgid "devcp_theme_upload_preview"
@@ -2476,30 +3499,607 @@ msgstr "Assicurati di %s per il tuo tema."
 msgid "devcp_theme_upload_preview_link"
 msgstr "aver caricato un'anteprima"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Consultare %s per ulteriori riferimenti."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "questa pagina"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Modifica versione"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Versione aggiornata con successo."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Questo componente aggiuntivo è disattivato"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filtra"
@@ -2508,7 +4108,8 @@ msgstr "Filtra"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtra per tipo/azione"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42
+#: controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Registro eventi"
 
@@ -2560,6 +4161,7 @@ msgstr "Nascondi commenti"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Visualizza commenti"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2569,7 +4171,8 @@ msgstr "Visualizza elementi compresi tra %s e %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Nessuna revisione disponibile nel periodo richiesto."
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42
+#: controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Registro revisioni"
 
@@ -2593,28 +4196,29 @@ msgstr "Ultime operazioni del revisore"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Totale revisioni"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Revisione componente aggiuntivo"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Compila i campi seguenti:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Seleziona almeno un file da revisionare."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Le auto-revisioni non sono consentite."
 
-#: controllers/editors_controller.php:305
+#: 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à"
 
@@ -2622,47 +4226,54 @@ msgstr "Aggiungi funzionalità"
 msgid "editors_featured_add_feature_submit"
 msgstr "Aggiungi"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Funzionalità rimossa con successo."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: 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à"
 
@@ -2684,43 +4295,44 @@ msgstr "Policy dei componenti aggiuntivi"
 
 #: 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:108 views/admin/flagged_queue.thtml:75
+#. %1 is the queue mode
+#: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 giorno"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 ora"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minuto"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61
+#: controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Strumenti per revisori"
 
-#: controllers/editors_controller.php:286
+#. %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 "Solo %s"
 
-#: controllers/editors_controller.php:301
+#: 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:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2734,20 +4346,24 @@ msgstr "Reimposta"
 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."
+msgstr "Al momento tutte le code di revisione sono disattivate. Riprovare più tardi."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Revisione"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Rendi pubblica"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Richiedi revisione più approfondita"
 
@@ -2755,40 +4371,34 @@ msgstr "Richiedi revisione più approfondita"
 msgid "editors_review_action_sandbox"
 msgstr "Lascia nella sandbox"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Commenti del revisore"
 
-#: views/editors/review.thtml:167
+#: 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 ""
-"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:170
+#: 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:159
+#: 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:162
+#: 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:174
+#: 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:128
 msgid "editors_review_file_diff_link"
@@ -2810,15 +4420,15 @@ msgstr "Categorie:"
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilità:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Descrizione"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Commenti dello sviluppatore"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2826,85 +4436,112 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "File:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Cronologia delle versioni"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Messaggio di segnalazione"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Anteprime"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Informativa sulla privacy"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Revisioni %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Note per i revisori"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Riepilogo"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Note sulla versione"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "Revisione di un amministratore"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Approva segnalazione/Area pubblica"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Non approvare la segnalazione/Sandbox"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Non sono disponibili revisioni precedenti."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Revisione di un amministratore"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Approvata/Area pubblica"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Non approvata/Sandbox"
 
-#: views/editors/review.thtml:198
+#. 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 "Applicazioni:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "o seleziona una risposta preimpostata:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Commenti:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistemi operativi:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281
+#: views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Torna all'inizio"
 
@@ -2912,7 +4549,7 @@ msgstr "Torna all'inizio"
 msgid "editors_review_next_link"
 msgstr "successiva &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Nessuna anteprima disponibile."
 
@@ -2920,41 +4557,46 @@ msgstr "Nessuna anteprima disponibile."
 msgid "editors_review_previous_link"
 msgstr "&laquo; precedente"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %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> di %2$s in coda"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Esegui azione"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Azione"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Commenti"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Data"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Revisore"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versione/File"
 
-#: controllers/editors_controller.php:411
+#: 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 "Revisione eseguita con successo."
 
@@ -2978,7 +4620,7 @@ msgstr "Azione"
 msgid "editors_reviews_in_reply_to"
 msgstr "In risposta a:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Processo di revisione completato con successo."
 
@@ -2990,23 +4632,23 @@ msgstr "Attualmente non ci sono revisioni in moderazione."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Elabora revisioni"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Specifico per un determinato sito web"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Nuovo"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Aggiornato"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Applicazione verificata"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistemi operativi verificati"
 
@@ -3014,7 +4656,8 @@ msgstr "Sistemi operativi verificati"
 msgid "editors_th_additional_info"
 msgstr "Informazioni aggiuntive"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
+#: views/editors/featured.thtml:63
+#: views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Componente aggiuntivo"
@@ -3047,27 +4690,33 @@ msgstr "Piattaforme"
 msgid "editors_th_submissiontypes"
 msgstr "Tipi di proposta"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s giorni"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ore"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: 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:610
-#: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/components/simple_acl.php:83
+#: controllers/components/amo.php:610
+#: controllers/components/amo.php:611
+#: controllers/components/amo.php:612
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Accesso negato"
 
@@ -3075,12 +4724,13 @@ msgstr "Accesso negato"
 msgid "error_access_denied_message"
 msgstr "Non possiedi l'autorizzazione per visualizzare questa pagina."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3090,18 +4740,23 @@ msgstr "Non possiedi l'autorizzazione per visualizzare questa pagina."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
-#: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340
+#: controllers/api_controller.php:123
+#: controllers/api_controller.php:759
+#: controllers/api_controller.php:894
+#: controllers/api_controller.php:925
+#: controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Impossibile trovare il componente aggiuntivo"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83
+#: controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Questo componente aggiuntivo non può essere visualizzato."
 
@@ -3109,7 +4764,7 @@ msgstr "Questo componente aggiuntivo non può essere visualizzato."
 msgid "error_addon_selfreview"
 msgstr "Non è consentito fare la recensione di un tuo componente aggiuntivo."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Impossibile trovare componenti aggiuntivi in questa categoria"
 
@@ -3117,76 +4772,96 @@ msgstr "Impossibile trovare componenti aggiuntivi in questa categoria"
 msgid "error_collection_feed_notfound"
 msgstr ""
 
-#: views/users/register.thtml:60 views/users/edit.thtml:176
-#: views/developers/add_step2.thtml:117 controllers/api_controller.php:907
+#: views/users/register.thtml:60
+#: views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
+#: controllers/api_controller.php:907
 msgid "error_email_invalid"
 msgstr "Indirizzo e-mail non valido."
 
-#: 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/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:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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."
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Errore: %s non esiste."
 
-#: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
-#: 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:104
 msgid "error_invalid_captcha"
 msgstr "Captcha non valido, riprova"
 
-#: views/users/register.thtml:95 views/users/edit.thtml:128
-#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: 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:254
-#: controllers/users_controller.php:542 controllers/users_controller.php:642
+#: 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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475
+#: controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Argomento assente: %s"
 
-#: controllers/components/amo.php:506 controllers/components/amo.php:531
+#: 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
+#: views/developers/add_step2.thtml:58
+#: views/developers/add_step3.thtml:57
 msgid "error_notice"
 msgstr "Notifica"
 
@@ -3194,7 +4869,8 @@ msgstr "Notifica"
 msgid "error_preview_notfound"
 msgstr "Impossibile trovare l'anteprima"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397
+#: views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Bisogna assegnare un voto."
 
@@ -3202,57 +4878,62 @@ 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: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: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:70
+#: 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:60 views/users/edit.thtml:172
+#: 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:580 controllers/users_controller.php:581
+#: 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."
+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:86 views/users/edit.thtml:119
+#: 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:260 controllers/users_controller.php:592
+#: 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:68
 msgid "error_username_or_pw_wrong"
 msgstr "Nome utente o password sbagliati"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Impossibile trovare la versione"
 
-#: views/users/delete.thtml:118 views/users/edit.thtml:152
+#: views/users/delete.thtml:118
+#: views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "La password inserita non è corretta"
 
@@ -3260,14 +4941,17 @@ msgstr "La password inserita non è corretta"
 msgid "feature_learnmore"
 msgstr "Dettagli"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Ulteriori informazioni su %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
-#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
+#. %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"
@@ -3278,6 +4962,40 @@ msgstr[1] "%1$s recensioni"
 msgid "feature_view_more_from_category"
 msgstr "Visualizza altri in"
 
+#. 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 "Torna al componente aggiuntivo"
+
+#. 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 "Espandi tutto"
+
+#. 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 "Torna alla recensione"
+
+#. 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 :: Esplora file :: %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
+msgid "file_browser_toggle_expand_collapse"
+msgstr "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Tutti i diritti riservati."
@@ -3292,11 +5010,7 @@ msgstr "Crediti"
 
 #: views/elements/footer.thtml:73
 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
 msgid "footer_lang_form_lang_submit_go"
@@ -3314,7 +5028,7 @@ msgstr "Altre lingue:"
 msgid "footer_privacy_policy"
 msgstr "Informativa sulla privacy"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Salva"
 
@@ -3322,7 +5036,7 @@ msgstr "Salva"
 msgid "general_addontype_dict"
 msgstr "dizionari"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "dizionari"
@@ -3331,7 +5045,7 @@ msgstr "dizionari"
 msgid "general_addontype_extension"
 msgstr "estensioni"
 
-# 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:108
 msgid "general_addontype_extension_plural"
 msgstr "estensioni"
@@ -3340,7 +5054,7 @@ msgstr "estensioni"
 msgid "general_addontype_lpaddon"
 msgstr "language pack (componente aggiuntivo)"
 
-# 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "language pack (componente aggiuntivo)"
@@ -3349,7 +5063,7 @@ msgstr "language pack (componente aggiuntivo)"
 msgid "general_addontype_lpapp"
 msgstr "language pack (applicazione)"
 
-# 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "language pack (applicazione)"
@@ -3358,7 +5072,7 @@ msgstr "language pack (applicazione)"
 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "plugin"
@@ -3367,7 +5081,7 @@ msgstr "plugin"
 msgid "general_addontype_search"
 msgstr "motori di ricerca"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "motori di ricerca"
@@ -3376,12 +5090,14 @@ msgstr "motori di ricerca"
 msgid "general_addontype_theme"
 msgstr "temi"
 
-# 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:109
 msgid "general_addontype_theme_plural"
 msgstr "temi"
 
-#: views/elements/header.thtml:111 views/elements/header.thtml:122
+#. %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 "Ritorna alla pagina iniziale di %1$s Add-ons"
@@ -3411,12 +5127,13 @@ msgid "header_navlink_addons"
 msgstr "Componenti aggiuntivi"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Disconnetti"
 
@@ -3424,38 +5141,44 @@ msgstr "Disconnetti"
 msgid "header_navlink_myaccount"
 msgstr "Il mio profilo"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Registrati"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: views/elements/addon_listitem.thtml:80
+#: views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Anteprima immagine di %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/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>?"
+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/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Aggiungi a %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
+#. %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 "Aggiungi %1$s a %2$s"
 
+#. %1$s is the add-on name
 #: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3477,8 +5200,10 @@ msgstr "Scarica dizionario"
 msgid "langtools_download_langpack"
 msgstr "Scarica language pack"
 
-#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: views/elements/addon_categories.thtml:54
+#: views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:701
+#: controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dizionari e Language pack"
 
@@ -3502,9 +5227,12 @@ msgstr "Language pack"
 msgid "langtools_tableheader_language"
 msgstr "Lingua"
 
-#: 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
+#: 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."
 
@@ -3534,7 +5262,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3549,17 +5281,20 @@ msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
 #: views/elements/addon_categories.thtml:53
-#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:680
+#: views/elements/addon_categories.thtml:54
+#: controllers/components/amo.php:680
 #: controllers/components/amo.php:682
 msgid "nav_category_dicts_langpacks"
 msgstr "Dizionari e language pack"
 
-#: controllers/components/amo.php:715 controllers/components/amo.php:717
+#: controllers/components/amo.php:715
+#: controllers/components/amo.php:717
 msgid "nav_category_plugins"
 msgstr "Plugin"
 
 #: views/elements/addon_categories.thtml:57
-#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:686
+#: views/elements/addon_categories.thtml:58
+#: controllers/components/amo.php:686
 msgid "nav_category_themes"
 msgstr "Temi"
 
@@ -3567,7 +5302,7 @@ msgstr "Temi"
 msgid "other_apps_tooltip"
 msgstr "Scopri i componenti aggiuntivi per le altre applicazioni"
 
-# In a user list: user 1, user 2, "others"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "altri"
@@ -3580,36 +5315,34 @@ msgstr "Versioni applicazione"
 msgid "page_title_credits"
 msgstr "Credit"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Componenti aggiuntivi sperimentali"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
+msgstr "Domande più frequenti"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "FAQ - Migliora lo stile di Firefox"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Policy per i componenti aggiuntivi"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Informativa sulla privacy di Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Linee guida per la revisione"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Sistema di revisione e Sandbox"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Guida per l'inserimento"
 
@@ -3617,26 +5350,23 @@ msgstr "Guida per l'inserimento"
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:78 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: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: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:92
 msgid "pages_appversions_required_files_link"
 msgstr "qui"
@@ -3645,7 +5375,6 @@ msgstr "qui"
 msgid "pages_appversions_versions"
 msgstr "Versioni"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Torna alla pagina precedente"
 
@@ -3657,7 +5386,7 @@ msgstr "Pagina di informazioni sulla sandbox"
 msgid "pagination_next_page"
 msgstr "successivo"
 
-# %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"
@@ -3669,9 +5398,7 @@ 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"
@@ -3681,21 +5408,17 @@ msgstr "Inserisci qui la risposta:"
 msgid "recaptcha_enter_whatyouhear"
 msgstr "Digita quello che hai ascoltato."
 
-# %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 ""
-"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
+#. %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:100
 msgid "recaptcha_label"
@@ -3705,16 +5428,16 @@ msgstr "Sei umano?"
 msgid "recaptcha_whatsthis"
 msgstr "Che cos'è questo?"
 
-#: controllers/reviews_controller.php:556
+#: 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 sbagliata"
+msgstr "Segnalazione bug o richiesta di supporto inserita nella sezione sbagliata"
 
-#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
+#: views/reviews/display.thtml:107
+#: views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Segnala questa recensione (selezionare un motivo)"
 
@@ -3730,12 +5453,11 @@ msgstr "Altro (specificare)"
 msgid "review_flag_reason_spam"
 msgstr "Spam o contenuti fuori luogo"
 
-#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: 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"
@@ -3743,45 +5465,30 @@ 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
+#. %1 is the URL of the support section, %2 for the review guidelines
 #: 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>"
-
-#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+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: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:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Componenti aggiuntivi disponibili"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Nuovi componenti aggiuntivi"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Componenti aggiornati"
 
@@ -3793,7 +5500,8 @@ msgstr "La ricerca è attualmente disattivata. Riprovare più tardi."
 msgid "search_form_all_addons"
 msgstr "tutti i componenti aggiuntivi"
 
-#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: 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"
@@ -3818,6 +5526,7 @@ msgstr "Tutti i Motori di ricerca"
 msgid "search_landing_browse_search_engines"
 msgstr "Esplora i Motori di ricerca"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3837,19 +5546,23 @@ msgstr "Cerca componenti aggiuntivi"
 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:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Risultati della ricerca per: %s"
 
+#: 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/addons/home.thtml:164
+#: 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/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Strumenti per revisori"
@@ -3858,12 +5571,14 @@ msgstr "Strumenti per revisori"
 msgid "sidebar_navlink_welcome"
 msgstr "Benvenuto"
 
+#. %s is the user's name
 #: 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"
 
@@ -3887,7 +5602,8 @@ msgstr "motore di ricerca"
 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"
 
@@ -3895,8 +5611,11 @@ msgstr "tema"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Aggiornamenti"
 
-#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
-#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#. %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"
@@ -3906,7 +5625,7 @@ msgstr "%1$s KB"
 msgid "stars_not_yet_rated"
 msgstr "Nessun voto"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3924,24 +5643,36 @@ msgstr "Strumenti per sviluppatori"
 msgid "statistics_addon_switch"
 msgstr "Cambia componente aggiuntivo"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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."
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:147 views/statistics/addon.thtml:158
+#. 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 "%1$s realizzati"
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3965,9 +5696,7 @@ msgstr "oppure selezionare un componente aggiuntivo con statistiche pubbliche"
 
 #: 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:63
 msgid "statistics_index_selectaddon"
@@ -3985,7 +5714,8 @@ msgstr "Pannello statistiche"
 msgid "statistics_index_view_button"
 msgstr "Visualizza statistiche"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224
+#: controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Visualizza questa tabella in formato CSV"
 
@@ -4001,7 +5731,7 @@ msgstr "Rimuovi questo plot"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Raggruppa per: giorno"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Raggruppa per: mese"
 
@@ -4009,103 +5739,107 @@ msgstr "Raggruppa per: mese"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Raggruppa per: settimana"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Confronta per: settimana"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s trovato nei criteri"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Aggiungi plot"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Aggiungi un altro plot a questo grafico"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Nascondi il conteggio totale"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Visualizza il conteggio totale"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Aggiungi al grafico il conteggio totale"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Visualizza dati (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Nascondi %s eventi"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Visualizza %s eventi"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Nascondi eventi Firefox"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Visualizza eventi Firefox"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Contrai il grafico"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Espandi il grafico"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Ridimensiona il grafico"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Utenti attivi per giorno"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Applicazione"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personalizzato"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Download"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistema operativo"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Stato del componente aggiuntivo"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Sommario"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Versione del componente aggiuntivo"
 
@@ -4129,36 +5863,25 @@ msgstr "Sconosciuto"
 msgid "statistics_longnames_version"
 msgstr "Versione del componente aggiuntivo"
 
-#: views/statistics/addon.thtml:104
+#: 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:116
+#: 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:122
+#: 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:109
+#: 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"
@@ -4171,36 +5894,36 @@ msgstr "Le impostazioni sono state aggiornate"
 msgid "statistics_pagetitle"
 msgstr "Pannello statistiche"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Utenti attivi per giorno"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Download per giorno"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Zoom In"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Zoom in (un mese)"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Zoom Out"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out (un mese)"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Sintesi quotidiana delle statistiche per %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Feed RSS dei dati sintetici"
 
@@ -4215,11 +5938,7 @@ msgstr "Statistiche per %1$s"
 
 #: 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:45
 msgid "statistics_settings_access_heading"
@@ -4231,9 +5950,7 @@ msgstr "Privato"
 
 #: 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:49
 msgid "statistics_settings_access_public"
@@ -4241,26 +5958,25 @@ msgstr "Pubblico"
 
 #: 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:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Cambia impostazioni"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Mantenere queste informazioni come confidenziali."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Questo pannello è attualmente <b>privato</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Questo pannello è attualmente <b>pubblico</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Bloccato"
 
@@ -4277,7 +5993,7 @@ msgstr "Salva impostazioni"
 msgid "statistics_settings_title"
 msgstr "Impostazioni pannello statistiche per %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Sbloccato"
 
@@ -4301,7 +6017,8 @@ msgstr "Sc"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42
+#: views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Media download per giorno"
 
@@ -4309,37 +6026,46 @@ msgstr "Media download per giorno"
 msgid "statistics_summary_downloads_heading"
 msgstr "Download"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149 views/statistics/addon.thtml:169
+#: 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:70 views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: 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"
@@ -4348,17 +6074,20 @@ 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:143
+#: 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:147
+#: 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/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: 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"
@@ -4371,11 +6100,13 @@ msgstr "Tutti i temi"
 msgid "themes_landing_browse_themes"
 msgstr "Esplora temi"
 
-#: views/users/edit.thtml:99 views/users/edit.thtml:167
+#: views/users/edit.thtml:99
+#: views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Cambia indirizzo e-mail"
 
-#: views/users/edit.thtml:98 views/users/edit.thtml:148
+#: views/users/edit.thtml:98
+#: views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Modifica password"
 
@@ -4383,13 +6114,10 @@ msgstr "Modifica password"
 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
+#. %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 ""
-"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:95
 msgid "user_del_community_sad"
@@ -4403,44 +6131,34 @@ msgstr "Conferma password"
 msgid "user_del_deletenow"
 msgstr "Elimina ora il mio account utente"
 
-# %1 is the URL of the user's info page
+#. %1 is the URL of the user's info page
 #: 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
+#. %1 is a link to the amo-editors mailing list
 #: 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: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:78
 msgid "user_del_error_password"
 msgstr "Inserire correttamente la password per procedere."
 
-# %1 is a link to the amo-admins mailing list
+#. %1 is a link to the amo-admins mailing list
 #: 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:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Conferma eliminazione account"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Elimina account utente %1$s"
@@ -4451,28 +6169,20 @@ msgstr "Arrivederci"
 
 #: 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: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: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
+#. %1 is a link to the amo-editors mailing list
 #: 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:123
 msgid "user_del_understand_permanent"
@@ -4482,43 +6192,36 @@ msgstr "Ho compreso che questo passaggio non potrà essere annullato."
 msgid "user_deleted_nickname"
 msgstr "Utente eliminato"
 
-# %1 is the new email address
-#: views/users/edit.thtml:58 views/users/edit.thtml:59
+#. %1 is the new email address
+#: 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:183
 msgid "user_edit_delete_user"
 msgstr "Elimina account utente"
 
-# 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 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 questae-"
-"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
+#. %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
@@ -4526,13 +6229,11 @@ 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"
@@ -4542,18 +6243,15 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Grazie per aver scelto %s Add-ons"
 
-# 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
 #, php-format
 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"
@@ -4571,25 +6269,26 @@ msgstr "Reimposta la tua password per %s Add-ons"
 msgid "user_emailchange_error"
 msgstr "Errore"
 
-# %1 is the application name
-#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#. %1 is the application name
+#: 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:49 views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Operazione completata"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: 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."
+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:68
+#: views/users/pwreset.thtml:77
+#: views/users/register.thtml:68
 #: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Conferma password"
@@ -4599,27 +6298,33 @@ msgstr "Conferma password"
 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:58 views/users/edit.thtml:169
+#: 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:73 views/users/edit.thtml:106
+#: 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:89 views/users/edit.thtml:122
+#: 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:93 views/users/edit.thtml:126
+#: 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:79 views/users/edit.thtml:112
+#: views/users/register.thtml:79
+#: views/users/edit.thtml:112
 #: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Cognome"
@@ -4628,11 +6333,13 @@ msgstr "Cognome"
 msgid "user_form_login"
 msgstr "Accesso utente"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
+#: views/users/pwreset.thtml:72
+#: views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Nuova password"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/users/register.thtml:84
+#: views/users/edit.thtml:117
 #: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Nickname"
@@ -4641,11 +6348,13 @@ msgstr "Nickname"
 msgid "user_form_oldpassword"
 msgstr "Vecchia password"
 
-#: views/users/edit.thtml:100 views/users/edit.thtml:182
+#: 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:63
+#: views/users/login.thtml:85
+#: views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Password"
 
@@ -4696,22 +6405,15 @@ msgstr "Al momento non sono presenti notifiche da configurare."
 
 #: 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: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: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:523
 msgid "user_profile_saved"
@@ -4732,8 +6434,7 @@ msgstr "Password dimenticata?"
 
 #: 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:293
 msgid "user_pwreset_okay"
@@ -4752,22 +6453,17 @@ msgstr "Invia il link per reimpostare la password"
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
 
-# %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 ""
-"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
+#. %1 is the user's email address
 #: 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"
@@ -4777,30 +6473,30 @@ msgstr "reinviare l'e-mail di conferma"
 msgid "user_register_congratulations"
 msgstr "Complimenti, il tuo account utente è stato creato con successo."
 
-# %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 ""
-"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
+#. %1 is the link to the Mozilla Add-ons front page
 #: 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:76 views/users/edit.thtml:109
+#: 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:97 views/users/edit.thtml:133
+#: views/users/edit.thtml:97
+#: views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Notifiche"
 
-#: views/users/edit.thtml:96 views/users/edit.thtml:104
+#: views/users/edit.thtml:96
+#: views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Profilo utente"
 
@@ -4846,39 +6542,63 @@ msgstr "Nickname"
 msgid "users_info_pagetitle"
 msgstr "Informazioni utente per %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Recensioni di %s"
 
-#: controllers/users_controller.php:319 controllers/users_controller.php:321
+#: controllers/users_controller.php:319
+#: controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Accesso utente"
 
-# %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
 #, 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
+#. %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"
+
+#~ msgid "addon_recommended"
+#~ msgstr "Questo componente aggiuntivo è consigliato da Mozilla"
+
+#~ msgid "devcp_actionbar_link_disable"
+#~ msgstr "Disabilita componente aggiuntivo"
+
+#~ msgid "devcp_actionbar_link_enable"
+#~ msgstr "Abilita componente aggiuntivo"
+
+#~ msgid "devcp_actionbar_link_nominate"
+#~ msgstr "Segnala componente aggiuntivo"
+
+#~ msgid "devcp_actionbar_link_viewpublic"
+#~ msgstr "Visualizza pagina pubblica"
+
+#~ msgid "devcp_statsbar_rating"
+#~ msgstr "Voto <em>%1$.2f</em> / %2$d"
+
+#~ msgid "editors_reviews_action_approve"
+#~ msgstr "Approva"
+
+#~ msgid "editors_reviews_action_delete"
+#~ msgstr "Elimina"
+
+#~ msgid "recaptcha_enter_numbers"
+#~ msgstr "Inserisci di seguito i <strong>numeri</strong> che hai ascoltato."
diff --git a/site/app/locale/ja/LC_MESSAGES/messages.po b/site/app/locale/ja/LC_MESSAGES/messages.po
index a3624b5..3671771 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-02-14 19:35+0900\n"
+"PO-Revision-Date: 2009-03-17 17:35+0900\n"
 "Last-Translator: Wil Clouser <clouserw@mozilla.com>\n"
 "Language-Team: Kohei Yoshino <yoshino@mozilla-japan.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,10 @@ msgstr ""
 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 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
@@ -49,38 +53,34 @@ msgstr "公開ページ"
 msgid "a_header_sandbox"
 msgstr "サンドボックス"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "追加日: %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "%s æ›´æ–°"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "�ージョン %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "ダウンロード (累計)"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
@@ -97,22 +97,22 @@ msgstr "件���表示"
 msgid "addon_list_sortby"
 msgstr "並�替�:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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: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: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
@@ -121,7 +121,7 @@ msgstr "%1$s � %2$s ��利用����ん"
 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -140,6 +140,7 @@ msgstr "レビュー:"
 msgid "addon_review_add_submit"
 msgstr "レビューを�信"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -173,22 +174,24 @@ msgstr "��"
 msgid "addon_review_delete_header"
 msgstr "レビュー�削除"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "レビュー�削除�れ���。"
 
+#. %s is the name of the add-on
 #: 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:534
+#. %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 ��。"
+"レビュー��フラグ付���題�発生����。フラグ付�レビュー��注釈��角 "
+"10 文字以上 100 文字以下���れ��り��ん。入力�れ�文字数� %1$s ��。"
 
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -199,7 +202,7 @@ msgstr ""
 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:135
 #, php-format
 msgid "addon_review_others_by_user"
@@ -207,16 +210,16 @@ msgid_plural "addon_review_others_by_user"
 msgstr[0] "%2$s �以�投稿����アドオン�レビュー (%1$s) を見る"
 msgstr[1] "%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
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -230,13 +233,13 @@ msgstr "開発者�返信:"
 msgid "addon_review_saved_successfully"
 msgstr "レビュー��信�れ���。"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, php-format
@@ -259,11 +262,13 @@ msgstr "��アドオン"
 msgid "addon_version_permalink"
 msgstr "���ージョン��固定リンク"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "次��ージョン�互�性��る最新版:"
+#. %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 "%1$s %2$s �互�性��る最新版"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "�信"
 
@@ -271,19 +276,20 @@ msgstr "�信"
 msgid "addons_author_tooltip"
 msgstr "作者�プロフィールを見る"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "����テーマをブラウズ :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "「%1$s�カテゴリ�テーマをブラウズ :: %2$s Add-ons"
 
@@ -291,7 +297,7 @@ msgstr "「%1$s�カテゴリ�テーマをブラウズ :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "レビューを投稿"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "詳細"
 
@@ -299,11 +305,11 @@ msgstr "詳細"
 msgid "addons_display_categories"
 msgstr "カテゴリ"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "詳細"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "嫌�"
@@ -312,142 +318,149 @@ msgstr "嫌�"
 msgid "addons_display_edit_review"
 msgstr "レビューを編集"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "��アドオン��プライ�シー�リシー��供�れ����。"
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "作者�コメント"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "ホームページ"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "レビュー"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "サ�ート"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "好�"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "詳��説明"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 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:421
+#. %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] "%1$s �よ��作��れ��る他�アドオン"
 msgstr[1] "�れら�作者�よ��作��れ��る他�アドオン"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "��アドオン�サ�ート�開発者 (%s) �ら��られ��。"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "��アドオン�サ�ート�開発者�サイト (%s) ���られ��。メール�よる連絡"
 "先 (%s) も公開�れ����。"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "��アドオン�サ�ート�開発者�サイト (%s) ���られ��。"
 
-#: views/addons/display.thtml:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "評価�る"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "��アドオン����何�サ�ートを必���れ��る場���<a href=\"%1$s\">サ"
 "�ート</a> �項目を�照������。"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "�信"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "����レビュー (%1$s) を表示"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "�����ージョンを表示"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "�����ージョン履歴"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "ソースを表示"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "統計を表示"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "�����見を��������"
 
@@ -457,7 +470,7 @@ msgstr "対応�ージョン"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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 "作者:"
@@ -468,17 +481,18 @@ msgstr "作者:"
 msgid "addons_home_feature_head"
 msgstr "スタッフ�����"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
-"アドオンを使���%1$s �機能を拡張��自分��カスタマイズ����。���気"
-"�入り�アドオンを見������ょ�。注�: ��サイト�登録�れ��るアドオ"
-"ン������ん��日本語化�れ����ん。日本語化�れ��るアドオン�一覧"
-"� Mozilla Japan �サイト (https://addons.mozilla.jp/) ��覧������。"
+"アドオンを使���%1$s �機能を拡張��自分好��カスタマイズ����。���"
+"気�入り�アドオンを見������ょ�。注�: ��サイト�登録�れ��るアド"
+"オン������ん��日本語化�れ����ん。日本語化�れ��るアドオン�一"
+"覧� Mozilla Japan �サイト (https://addons.mozilla.jp/) ��覧������。"
 
 #: views/addons/home.thtml:201
 msgid "addons_home_newest_header"
@@ -488,7 +502,9 @@ msgstr "最近公開�れ�アドオン:"
 msgid "addons_home_other_applications"
 msgstr "他�アプリケーション"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -498,19 +514,20 @@ msgstr "他�アプリケーション"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -605,6 +622,7 @@ msgstr "Mac OS X 版"
 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"
@@ -624,12 +642,13 @@ msgstr ""
 "場����ブラウザ�特定�機能を実行��るよ���る役割を果����。ブラウ"
 "ザ�機能を追加��り変更を加�る拡張機能��若干性質�異�り��。"
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "%1$s 用�一般的�プラグイン"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "プラグイン"
 
@@ -640,6 +659,7 @@ msgstr "プラグイン"
 msgid "addons_plugins_support_documentation"
 msgstr "サ�ート情報: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -647,25 +667,25 @@ msgstr ""
 "%s をインストール�る���以下�エンドユーザライセンス契約����る必���"
 "り��。"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s �プレビュー画�"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 msgid "addons_recommended_introduction"
 msgstr ""
 "アドオン�����ん�種類��り������気�入り�も�����見��る�"
 "���。����スタッフ�����アドオンを�紹介���。���試����"
 "�。"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "�����アドオン"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "�����アドオン"
 
@@ -673,7 +693,7 @@ msgstr "�����アドオン"
 msgid "addons_searchengines_additional_resources"
 msgstr "関連情報"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
@@ -691,35 +711,35 @@ msgstr ""
 "���設定�無効�������。インストールを行��� 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: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: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)
+#. link text for "make your own" (opensearch engine)
 #: 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: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:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "検索エンジン"
 
@@ -733,7 +753,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "無効"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "�完全��ージョン"
 
@@ -771,11 +791,12 @@ msgstr ""
 "�れら��ージョン���考������テスト目的�利用��るよ��公開�れ�"
 "���。特別��由����り�常�最新��ージョンを�利用����。"
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "�ージョン履歴・変更点"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s ��ージョン履歴"
@@ -788,6 +809,7 @@ msgstr "グループを追加"
 msgid "admin_group_delete_pagetitle"
 msgstr "グループを削除"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -913,16 +935,20 @@ msgstr "�ージョン�ェックを無視"
 msgid "app_compat_older_firefox_only"
 msgstr "��アドオン����ージョン� Firefox ����"
 
+#. %1$s and %2$s are URLs
 #: 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: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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -935,23 +961,23 @@ msgstr ""
 "��アドオンを利用�る�� <a href=\"http://getfirefox.com\">Firefox をアップ"
 "グレード</a> ������"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "タイトル順"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "最近公開�れ�アドオン"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "人気�アドオン"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "評価順"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "最近更新�れ�アドオン"
 
@@ -983,7 +1009,7 @@ msgstr "最終更新順"
 msgid "category_extra_mostpopular"
 msgstr "人気順"
 
-# %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"
@@ -993,11 +1019,19 @@ msgstr "「%1$s�カテゴリ�アドオンを���見る"
 msgid "collection_not_found"
 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"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
@@ -1030,6 +1064,8 @@ msgstr "アップロードを行��� maxVersion を変更"
 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:130
 msgid "compatibility_developers_login_first"
 msgstr ""
@@ -1053,6 +1089,10 @@ msgstr "アドオン�ステータス確���果"
 msgid "compatibility_developers_retrieving"
 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:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s ユーザ (全体� %3$s&#37;)"
@@ -1067,6 +1107,8 @@ msgstr ""
 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:69
 msgid "compatibility_report_intro"
 msgstr ""
@@ -1078,6 +1120,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "アルファ版"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "%1$s �アルファ版�互�性��るアドオン"
@@ -1086,6 +1129,7 @@ msgstr "%1$s �アルファ版�互�性��るアドオン"
 msgid "compatibility_report_legend_beta"
 msgstr "ベータ版"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "%1$s �ベータ版も���リリース候補版�互�性��るアドオン"
@@ -1094,6 +1138,7 @@ msgstr "%1$s ã�®ãƒ™ãƒ¼ã‚¿ç‰ˆã‚‚ã�—ã��ã�¯ãƒªãƒªãƒ¼ã‚¹å€™è£œç‰ˆã�¨äº’æ�›æ€§ã�®ã�‚ã
 msgid "compatibility_report_legend_latest"
 msgstr "最新版"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "%1$s �最新ビルド�対応���るアドオン"
@@ -1102,6 +1147,7 @@ msgstr "%1$s �最新ビルド�対応���るアドオン"
 msgid "compatibility_report_legend_other"
 msgstr "��他��ージョン"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "%1$s ���れ��ージョン�も互�性���アドオン"
@@ -1119,12 +1165,13 @@ msgstr "アドオンユーザ���情報"
 msgid "compatibility_view_report"
 msgstr "互�性レ�ートを表示"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "�力方法�関�る情報� %s を�覧����。"
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "MozillaWiki �ページ"
 
@@ -1166,26 +1213,34 @@ msgstr ""
 "開�れ��る <a href=\"http://www.famfamfam.com/lab/icons/silk/\">famfamfam "
 "Silk Icon Set</a> ���れ��るも���。"
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: views/pages/credits.thtml:135
+msgid "credits_software_timeplot"
+msgstr ""
+"一部�ページ���<a href=\"http://simile.mit.edu/license.html\">BSD ライセン"
+"ス</a> �下�公開�れ��る <a href=\"http://www.simile-widgets.org/timeplot/"
+"\">Timeplot</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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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æ—¥"
 
-# date and time format string (strftime)
+#. 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 "%Yå¹´ %b %eæ—¥ %H:%M"
@@ -1211,14 +1266,40 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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:1288
+msgid "devcp_add_previews_extension_error"
+msgstr "ファイル %1$s �拡張� (%2$s) �無効��。有効�拡張�� %3$s ��。"
+
+#. %s is the filename.
+#: 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:1316
+msgid "devcp_add_previews_success_replace"
+msgstr "プレビュー %1$s �ファイル %2$s �置���られ���。"
+
+#. %s is the filename.
+#: controllers/developers_controller.php:1318
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1226,8 +1307,9 @@ msgstr ""
 "����アドオン����ージョン� Firefox %1$s ��互�性�明記�れ����"
 "ん。Mozilla ��次��ージョン� Firefox を�も��リリース�る予定�����"
 "��新���ージョン�アドオンをテスト���互�性情報を更新������。詳"
-"��� <a href=\"%2$s\">��ら�記事</a> を�覧����。�れ���る通知��"
-"������ージョンを���� addons.mozilla.org �登録�れ�も構���ん。"
+"��� <a href=\"%2$s\">��ら�記事</a> を�覧����。�れ���る通知��"
+"���ん������ージョンを���� addons.mozilla.org �登録�れ�も構�"
+"��ん。"
 
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
@@ -1265,36 +1347,36 @@ msgstr "ステップ 5: 完了"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "申請�関�るヘルプ"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "アドオン�公開�中止�れ���"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "アドオン�編集"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "アドオン�有効��り���"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "アドオン�説明"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "アドオン�ホームページ"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "アドオン�タイトル"
 
@@ -1303,40 +1385,255 @@ msgstr "アドオン�タイトル"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "プレビュー画��キャプション"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "プライ�シー�リシー"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "アドオン�概�"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "サ�ート用メールアドレス"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "サ�ート用 URL"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "�ージョン�説明"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "アドオン�申請"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "アドオン�申請�完了����。"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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 ""
+"アドオンを有効化�る��公開ページ��掲載�開始�れる��も��更新確�サー"
+"ビス�有効��り��。"
+
+#: views/developers/addon_status.thtml:136
+msgid "devcp_addon_status_action_complete"
+msgstr "アドオンを完���る"
+
+#: views/developers/addon_status.thtml:137
+msgid "devcp_addon_status_action_complete_description"
+msgstr "��アドオンを完����サンドボックス�移動���。"
+
+#: views/developers/addon_status.thtml:182
+msgid "devcp_addon_status_action_deactivate"
+msgstr "無効化"
+
+#: views/developers/addon_status.thtml:183
+msgid "devcp_addon_status_action_deactivate_description"
+msgstr ""
+"アドオンを無効化�る��公開ページ�掲載�れ���り�更新確�サービスも無効"
+"��り��。"
+
+#: views/developers/addon_status.thtml:144
+msgid "devcp_addon_status_action_move"
+msgstr "サンドボックス�移動"
+
+#: views/developers/addon_status.thtml:145
+msgid "devcp_addon_status_action_move_description"
+msgstr ""
+"��アドオンをサンドボックス�戻���。後���公開�る��も����。"
+
+#: views/developers/addon_status.thtml:140
+msgid "devcp_addon_status_action_nominate"
+msgstr "公開を申請"
+
+#: views/developers/addon_status.thtml:141
+msgid "devcp_addon_status_action_nominate_description"
+msgstr "��アドオン�一般公開を申請���。"
+
+#: views/developers/addon_status.thtml:148
+msgid "devcp_addon_status_action_public"
+msgstr "公開"
+
+#: views/developers/addon_status.thtml:149
+msgid "devcp_addon_status_action_public_description"
+msgstr "��アドオンを�度公開���。"
+
+#: views/developers/addon_status.thtml:170
+msgid "devcp_addon_status_active"
+msgstr ""
+"��アドオン� <span class=\"inactive-0\">有効</span> ��。上記�ステータス"
+"�応������公開ページ�掲載�れ��。"
+
+#: views/developers/addon_status.thtml:111
+msgid "devcp_addon_status_completion_disabled"
+msgstr ""
+"��アドオンを完���� <span class=\"status-1\">サンドボックス</span> �移"
+"動�る���上記��件を満�������。"
+
+#: views/developers/addon_status.thtml:108
+msgid "devcp_addon_status_completion_enabled"
+msgstr ""
+"下�ボタンをクリック�る����アドオンを完���� <span class=\"status-1\""
+">サンドボックス</span> �移動��る�������。"
+
+#: views/developers/addon_status.thtml:102
+msgid "devcp_addon_status_criteria_category"
+msgstr "少���も����カテゴリを�択������。"
+
+#: views/developers/addon_status.thtml:101
+msgid "devcp_addon_status_criteria_description"
+msgstr "アドオン�説明を入力������。"
+
+#: views/developers/addon_status.thtml:99
+msgid "devcp_addon_status_criteria_name"
+msgstr "アドオン�タイトルを入力������。"
+
+#: 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 "拡張機能�テーマ���少���も����プレビュー画��必���。"
+
+#: 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 "アドオン��約を入力������。"
+
+#. %s is the status in a span, e.g. "<span>_('Public')</span>".
+#: views/developers/addon_status.thtml:58
+msgid "devcp_addon_status_header"
+msgstr "アドオン�ステータス: %s"
+
+#: views/developers/addon_status.thtml:153
+msgid "devcp_addon_status_header_actions"
+msgstr "�能�アクション"
+
+#: views/developers/addon_status.thtml:169
+msgid "devcp_addon_status_header_active"
+msgstr "有効ステータス: <span class=\"inactive-0\">有効</span>"
+
+#: views/developers/addon_status.thtml:97
+msgid "devcp_addon_status_header_criteria"
+msgstr "アドオン完��件"
+
+#: views/developers/addon_status.thtml:165
+msgid "devcp_addon_status_header_inactive"
+msgstr "有効ステータス: <span class=\"inactive-1\">無効</span>"
+
+#: views/developers/addon_status.thtml:117
+msgid "devcp_addon_status_header_nomination"
+msgstr "公開申請�件"
+
+#: views/developers/addon_status.thtml:191
+msgid "devcp_addon_status_header_trusted"
+msgstr "信頼ステータス: <span class=\"status-4\">信頼�れ����</span>"
+
+#: views/developers/addon_status.thtml:166
+msgid "devcp_addon_status_inactive"
+msgstr ""
+"��アドオン� <span class=\"inactive-1\">無効</span> ��。上記��件���"
+"�ら����公開ページ�も掲載�れ��ん。更新確�サービスを通��アドオン�"
+"更新も<b>�供�れ��ん</b>。"
+
+#: views/developers/addon_status.thtml:129
+msgid "devcp_addon_status_nominate_disabled"
+msgstr ""
+"��アドオン� <span class=\"status-4\">公開</span> を申請�る���上記��"
+"件を満�������。"
+
+#: views/developers/addon_status.thtml:126
+msgid "devcp_addon_status_nominate_enabled"
+msgstr ""
+"下�ボタンをクリック�る����アドオン� <span class=\"status-1\">公開"
+"</span> を申請����。"
+
+#: views/developers/addon_status.thtml:64
+msgid "devcp_addon_status_public"
+msgstr "公開"
+
+#: views/developers/addon_status.thtml:63
+msgid "devcp_addon_status_sandbox"
+msgstr "サンドボックス"
+
+#. %s is an email address.
+#: views/developers/addon_status.thtml:89
+msgid "devcp_addon_status_switch_disabled"
+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\">サンドボックス</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 個�アドオン�レビューを"
+"待�����。"
+
+#. %s is an email address.
+#: views/developers/addon_status.thtml:81
+msgid "devcp_addon_status_switch_pending"
+msgstr ""
+"��アドオン��留�れ����。�れ�予期��状態��。アドオン� ID を記載"
+"��メールを %s ��り���エラー����知ら������。"
+
+#: views/developers/addon_status.thtml:85
+msgid "devcp_addon_status_switch_public"
+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\">サンドボックス</span> �置�れ���"
+"�。公開ページや検索�果�掲載�れ������ダウンロード�際�ユーザ�ログ"
+"インを必�����。更新確�サービスを通��アドオン�更新�<b>�供�れ���"
+"�ん</b>。"
+
+#. %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 "%s �ステータス"
+
+#: 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"
@@ -1359,7 +1656,7 @@ msgstr ""
 "を��る���サンドボックス�置�れ��。最新�ステータス�メール��知ら�"
 "���。"
 
-# %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"
@@ -1369,7 +1666,7 @@ msgstr "サンドボックスã�®ãƒ¬ãƒ“ューシステムã�«ã�¤ã�„ã�¦ã�¯ %s ã‚’ã�
 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"
@@ -1389,19 +1686,19 @@ msgstr "アドオン�登録�完了����。"
 #: views/developers/add_step5.thtml:54
 msgid "devcp_addon_submission_trusted_public"
 msgstr ""
-"����アドオン�信頼�れ��る������ージョン�自動的�承��れ�公開"
-"ページ�掲載�れ���。"
+"��アドオン�信頼�れ��る������ージョン�自動的�承��れ�公開ペー"
+"ジ�掲載�れ���。"
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "アドオン�登録"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1411,7 +1708,7 @@ msgstr "アドオン��関心を高�る����%s �れる��を�
 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"
@@ -1440,10 +1737,88 @@ msgstr "次�"
 msgid "devcp_change_addontype"
 msgstr "アドオン�種類を変更:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "作者�コメント�更新�れ���。"
 
+#: views/developers/dashboard.thtml:68
+msgid "devcp_dashboard_active"
+msgstr "有効"
+
+#. %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 "アドオン�種類� %1$s�ステータス� %2$s�%3$s ��"
+
+#: views/developers/dashboard.thtml:67
+msgid "devcp_dashboard_change_status"
+msgstr "ステータスを変更"
+
+#. %s is the addons email address.
+#: views/developers/dashboard.thtml:99
+msgid "devcp_dashboard_disabled_questions"
+msgstr ""
+"��アドオン�管�者�よ��無効化�れ�使用���������。何�質���"
+"る場�� %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 "アドオン�ステータス: %s"
+
+#: views/developers/dashboard.thtml:43
+msgid "devcp_dashboard_header_main"
+msgstr "開発者ダッシュボード"
+
+#: views/developers/dashboard.thtml:110
+msgid "devcp_dashboard_header_welcome"
+msgstr "開発者ダッシュボード�よ���"
+
+#: views/developers/dashboard.thtml:68
+msgid "devcp_dashboard_inactive"
+msgstr "無効"
+
+#. %s is a date in the _('date') format
+#: views/developers/dashboard.thtml:65
+msgid "devcp_dashboard_last_edited"
+msgstr "最終更新日: %s"
+
+#: views/developers/dashboard.thtml:111
+msgid "devcp_dashboard_learn"
+msgstr ""
+"������ Mozilla Add-ons �何もアドオンを登録�����ん。公開����れ"
+"����知り�最��アドオンを登録�る���下�「スタート�をクリック���"
+"���。"
+
+#: views/developers/dashboard.thtml:112
+msgid "devcp_dashboard_start"
+msgstr "スタート"
+
+#: views/developers/dashboard.thtml:82
+msgid "devcp_dashboard_versions"
+msgstr "�ージョン�ファイル"
+
+#: views/developers/dashboard.thtml:91
+msgid "devcp_dashboard_versions_new"
+msgstr "新���ージョンをアップロード"
+
+#. %s is the preview ID number.
+#: controllers/developers_controller.php:1342
+msgid "devcp_delete_previews_error"
+msgstr ""
+"プレビュー %s をデータベース�ら削除����ん���。�度�試�����。"
+
+#. %s is the preview ID number.
+#: controllers/developers_controller.php:1340
+msgid "devcp_delete_previews_success"
+msgstr "プレビュー %s �削除�完了����。"
+
+#: controllers/developers_controller.php:1032
+msgid "devcp_delete_version_priv_error"
+msgstr "��������ージョンも���ファイルを削除�る権���り��ん。"
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "プレビュー画�を追加"
@@ -1536,6 +1911,7 @@ msgstr "開発者�サ�ート用 URL �公開�れ����ん。"
 msgid "devcp_details_trusted"
 msgstr "信頼�れ����"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1565,6 +1941,7 @@ msgstr ""
 "確��も更新情報を返����り��。��り�事実上削除�れ�����状態��"
 "り�������戻れ�����も必��応���度有効��る�������。"
 
+#. %s is the name of an add-on
 #: views/developers/disable.thtml:55
 #, php-format
 msgid "devcp_disable_disable_title"
@@ -1585,11 +1962,57 @@ 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 "返信を追加"
+
+#: views/developers/discuss.thtml:57
+msgid "devcp_discuss_allreplies_header"
+msgstr "返信"
+
+#. 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 ""
+"返信を�存�る際�エラー�発生����。%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 Add-ons �エディタ������アドオン %1$s ��ージョン %2$s �関�"
+"��より詳��情報を�供�るよ�求����。"
+
+#. %1 is the add-on name
+#: views/developers/discuss.thtml:43
+msgid "devcp_discuss_pagetitle"
+msgstr "%1$s �アドオンレビュー����より詳��情報を�供�る"
+
+#. submit button text
+#: views/developers/discuss.thtml:79
+msgid "devcp_discuss_submit_reply"
+msgstr "返信を往信"
+
+#: views/developers/discuss.thtml:72
+msgid "devcp_discuss_success_message"
+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
+msgid "devcp_discuss_writtenby"
+msgstr "投稿者: %1$s - 投稿日時: %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "作者を追加"
@@ -1602,10 +2025,245 @@ msgstr "作者�メールアドレス"
 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:94
+msgid "devcp_edit_authors_add_author_button"
+msgstr "作者を追加"
+
+#: views/developers/addon_edit_authors.thtml:81
+msgid "devcp_edit_authors_add_email"
+msgstr "作者アカウント�メールアドレス:"
+
+#: views/developers/addon_edit_authors.thtml:96
+msgid "devcp_edit_authors_add_loading"
+msgstr "アカウント�メールアドレスを確������..."
+
+#: views/developers/addon_edit_authors.thtml:69
+msgid "devcp_edit_authors_click_save"
+msgstr "�存�る���下�「作者情報を更新�ボタンをクリック������。"
+
+#: views/developers/addon_edit_authors.thtml:57
+msgid "devcp_edit_authors_header_current"
+msgstr "�在�作者"
+
+#: views/developers/addon_edit_authors.thtml:49
+msgid "devcp_edit_authors_header_manage"
+msgstr "アドオン�作者を管�"
+
+#: views/developers/addon_edit_authors.thtml:91
+msgid "devcp_edit_authors_label_add_listed"
+msgstr "公開ページ�作者���表示�る"
+
+#: views/developers/addon_edit_authors.thtml:87
+msgid "devcp_edit_authors_label_developer"
+msgstr ""
+"<strong>開発者</strong> - アドオン�公開�関�る����情報を管�����。"
+"����他�作者を追加��り削除�る�������ん。"
+
+#: views/developers/addon_edit_authors.thtml:86
+msgid "devcp_edit_authors_label_owner"
+msgstr ""
+"<strong>オーナー</strong> - アドオン�公開�関�る����情報を管�����"
+"。他�作者を追加��り削除�る��も����。"
+
+#: views/developers/addon_edit_authors.thtml:88
+msgid "devcp_edit_authors_label_viewer"
+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:84
+msgid "devcp_edit_authors_select_role"
+msgstr "作者�役割を�択������:"
+
+#. Column name in a table.
+#: 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:63
+msgid "devcp_edit_authors_th_listed"
+msgstr "表示"
+
+#. Column name in a table.
+#: views/developers/addon_edit_authors.thtml:62
+msgid "devcp_edit_authors_th_role"
+msgstr "役割"
+
+#: views/developers/addon_edit_authors.thtml:75
+msgid "devcp_edit_authors_update_author"
+msgstr "作者情報を更新"
+
+#: views/developers/addon_edit_categories.thtml:99
+msgid "devcp_edit_categories_button_update"
+msgstr "カテゴリを更新"
+
+#: views/developers/addon_edit_categories.thtml:88
+msgid "devcp_edit_categories_does_not_fit"
+msgstr "自分�アドオン�既存���カテゴリ�も当���り��ん。"
+
+#. %s is the application name (Firefox, Thunderbird).
+#: views/developers/addon_edit_categories.thtml:61
+msgid "devcp_edit_categories_header_application"
+msgstr "%s �カテゴリ"
+
+#: views/developers/addon_edit_categories.thtml:49
+msgid "devcp_edit_categories_header_manage"
+msgstr "アドオン�カテゴリを管�"
+
+#: views/developers/addon_edit_categories.thtml:91
+msgid "devcp_edit_categories_hover"
+msgstr "�カテゴリ�マウスカーソルを乗�る�説明を見る�������。"
+
+#. %s is the category number (1, 2, 3).
+#: views/developers/addon_edit_categories.thtml:67
+msgid "devcp_edit_categories_label_category_num"
+msgstr "カテゴリ %s"
+
+#: views/developers/addon_edit_categories.thtml:94
+#: views/developers/addon_edit_categories.thtml:103
+msgid "devcp_edit_categories_none_available"
+msgstr "��アドオン�種類�アプリケーション�指定��るカテゴリ��り��ん。"
+
+#: views/developers/addon_edit_categories.thtml:86
+msgid "devcp_edit_categories_other"
+msgstr ""
+"既存�他�カテゴリ�当���ら��場������カテゴリを指定������。"
+
+#. %s is the application name (Firefox, Thunderbird).
+#: views/developers/addon_edit_categories.thtml:63
+msgid "devcp_edit_categories_select_application_categories"
+msgstr "��アドオン�カテゴリを最大 3 ����択������。"
+
+#: views/developers/addon_edit.thtml:47
+msgid "devcp_edit_dd_manage_authors"
+msgstr "��アドオンを管���るユーザを追加�削除���。"
+
+#: views/developers/addon_edit.thtml:49
+msgid "devcp_edit_dd_manage_categories"
+msgstr ""
+"��アドオン�対応���る�アプリケーション�����関連�るカテゴリを�択"
+"������。"
+
+#: views/developers/addon_edit.thtml:51
+msgid "devcp_edit_dd_manage_description"
+msgstr ""
+"��アドオン��約�説明�エンドユーザライセンス契約�プライ�シー�リシー�"
+"翻訳を追加�編集���。"
+
+#: views/developers/addon_edit.thtml:53
+msgid "devcp_edit_dd_manage_properties"
+msgstr ""
+"��アドオン�タイトル�ホームページ�アイコン���他�フラグを変更���。"
+
+#: views/developers/addon_edit_descriptions.thtml:115
+msgid "devcp_edit_description_button_update"
+msgstr "説明を更新"
+
+#: views/developers/addon_edit_descriptions.thtml:114
+msgid "devcp_edit_description_correct_error"
+msgstr "赤色�示�れ��る上記�エラーを訂正������。"
+
+#: views/developers/addon_edit_descriptions.thtml:50
+msgid "devcp_edit_descriptions_header"
+msgstr "アドオン�説明を編集"
+
+#: views/developers/addon_edit_descriptions.thtml:93
+msgid "devcp_edit_descriptions_transbox_comments_description"
+msgstr ""
+"アドオン��約や説明��該当����エンドユーザ�知り�����れる�らゆる"
+"情報を記述���。例���主�既知��グ��グ報告�手順�新�ージョン�リリ"
+"ース予定日��を記載�る��使用����。"
+
+#: views/developers/addon_edit_descriptions.thtml:92
+msgid "devcp_edit_descriptions_transbox_comments_name"
+msgstr "開発者�コメント"
+
+#: views/developers/addon_edit_descriptions.thtml:85
+msgid "devcp_edit_descriptions_transbox_description_description"
+msgstr ""
+"説明�����アドオン�機能や特長���他関連情報をより詳��記述���。�"
+"�情報�アドオン公開ページ��約�下�表示�れ��。"
+
+#: views/developers/addon_edit_descriptions.thtml:84
+msgid "devcp_edit_descriptions_transbox_description_name"
+msgstr "アドオン�説明"
+
+#: views/developers/addon_edit_descriptions.thtml:102
+msgid "devcp_edit_descriptions_transbox_eula_description"
+msgstr ""
+"��アドオン�エンドユーザライセンス契約 (EULA) �付��る場�����内容を"
+"以下�欄�入力������。��� EULA を設定�る��ユーザ�アドオンをイン"
+"ストール�る����を求�られ��。EULA ��GPL や MPL ��ソースコード�ラ"
+"イセンス����������注�������。"
+
+#: views/developers/addon_edit_descriptions.thtml:101
+msgid "devcp_edit_descriptions_transbox_eula_name"
+msgstr "エンドユーザライセンス契約"
+
+#: views/developers/addon_edit_descriptions.thtml:111
+msgid "devcp_edit_descriptions_transbox_privacy_description"
+msgstr ""
+"��アドオン�プライ�シー�リシー�付��る場�����内容を以下�欄�入力"
+"������。アドオン�公開ページ��リシー��リンク�表示�れ��。"
+
+#: views/developers/addon_edit_descriptions.thtml:110
+msgid "devcp_edit_descriptions_transbox_privacy_name"
+msgstr "プライ�シー�リシー"
+
+#: views/developers/addon_edit_descriptions.thtml:77
+msgid "devcp_edit_descriptions_transbox_summary_description"
+msgstr ""
+"�約���検索�果やアドオン公開ページ�最上部�表示�れる�アドオン�基本機"
+"能�簡��説明を記述���。<strong>�角 250 文字��</strong>入力����。"
+
+#: views/developers/addon_edit_descriptions.thtml:76
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "アドオン��約"
+
+#: views/developers/addon_edit.thtml:46
+msgid "devcp_edit_dt_manage_authors"
+msgstr "アドオン�作者情報を管�"
+
+#: views/developers/addon_edit.thtml:48
+msgid "devcp_edit_dt_manage_categories"
+msgstr "アドオン�カテゴリを管�"
+
+#: views/developers/addon_edit.thtml:50
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "アドオン�説明を管�"
+
+#: views/developers/addon_edit.thtml:52
+msgid "devcp_edit_dt_manage_properties"
+msgstr "アドオン�プロパティを管�"
+
 #: 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 "作者"
@@ -1628,7 +2286,7 @@ msgstr "カテゴリ"
 
 #: views/developers/edit.thtml:81
 msgid "devcp_edit_label_defaultlocale"
-msgstr "デフォルト�ロケール"
+msgstr "既定�ロケール"
 
 #: views/developers/addon_edit_properties.thtml:169
 #: views/developers/edit.thtml:143
@@ -1671,6 +2329,171 @@ msgstr "対象ロケール"
 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:197
+msgid "devcp_edit_properties_change_guid"
+msgstr "変更���果を完全��解���る場����変更を行������。"
+
+#: views/developers/addon_edit_properties.thtml:108
+msgid "devcp_edit_properties_current_icon"
+msgstr "�在�アイコン"
+
+#: views/developers/addon_edit_properties.thtml:84
+msgid "devcp_edit_properties_default_locale"
+msgstr ""
+"既定�ロケール���必�翻訳を用����れ��ら��主�ロケール��。アドオ"
+"ン�説明�ユーザ��択��言語�翻訳�れ����場�も���既定�ロケール�"
+"表示�れ��。"
+
+#: views/developers/addon_edit_properties.thtml:166
+msgid "devcp_edit_properties_flags"
+msgstr "�れら�フラグ��アドオン�検索や分類�使用�れ��。"
+
+#: 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:52
+msgid "devcp_edit_properties_header"
+msgstr "アドオン�プロパティを編集"
+
+#: views/developers/addon_edit_properties.thtml:185
+msgid "devcp_edit_properties_header_addon_type"
+msgstr "アドオン�種類"
+
+#: views/developers/addon_edit_properties.thtml:180
+msgid "devcp_edit_properties_header_admin_settings"
+msgstr "管�者設定"
+
+#: views/developers/addon_edit_properties.thtml:83
+msgid "devcp_edit_properties_header_default_locale"
+msgstr "既定�ロケール"
+
+#: views/developers/addon_edit_properties.thtml:165
+msgid "devcp_edit_properties_header_flags"
+msgstr "アドオン�フラグ"
+
+#: 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:103
+msgid "devcp_edit_properties_header_icon"
+msgstr "アドオン�アイコン"
+
+#: 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:181
+msgid "devcp_edit_properties_header_trusted"
+msgstr "信頼�れ��るアドオン"
+
+#: 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:105
+msgid "devcp_edit_properties_icon"
+msgstr ""
+"アイコン��検索�果�公開ページ�インストールダイアログ上����アドオン�"
+"タイトル��も�表示�れる����画���。画�� 32 x 32 ピクセル�自動的�"
+"サイズ調整�れ��。画��種類� %s ���れ�を使用������。"
+
+#: views/developers/addon_edit_properties.thtml:170
+msgid "devcp_edit_properties_label_binary"
+msgstr "��アドオン���イナリコン�ー�ント���れ����"
+
+#: views/developers/addon_edit_properties.thtml:184
+msgid "devcp_edit_properties_label_not_trusted"
+msgstr "信頼�れ����ん"
+
+#: views/developers/addon_edit_properties.thtml:183
+msgid "devcp_edit_properties_label_trusted"
+msgstr "信頼�れ����"
+
+#: views/developers/addon_edit_properties.thtml:109
+msgid "devcp_edit_properties_new_icon"
+msgstr "新��アイコン"
+
+#: views/developers/addon_edit_properties.thtml:117
+msgid "devcp_edit_properties_remove_icon"
+msgstr "アイコンを削除"
+
+#: views/developers/addon_edit_properties.thtml:135
+msgid "devcp_edit_properties_transbox_homepage_description"
+msgstr ""
+"��アドオン�ホームページを別�����る場���URL を入力������。�"
+"�サイト�他�言語�ローカライズ�れ�������れ��他�翻訳を追加�る必"
+"���り��ん。"
+
+#: views/developers/addon_edit_properties.thtml:134
+msgid "devcp_edit_properties_transbox_homepage_name"
+msgstr "アドオン�ホームページ"
+
+#: views/developers/addon_edit_properties.thtml:78
+msgid "devcp_edit_properties_transbox_name_description"
+msgstr "アドオン�掲載�れる�らゆる場所�表示�れる�アドオン�����。"
+
+#: views/developers/addon_edit_properties.thtml:77
+msgid "devcp_edit_properties_transbox_name_name"
+msgstr "アドオン�タイトル"
+
+#: views/developers/addon_edit_properties.thtml:144
+msgid "devcp_edit_properties_transbox_supportemail_description"
+msgstr ""
+"サ�ート�関�る�����を��付�るメールアドレスを����る場�����"
+"アドレスを入力������。他�言語�対応�るアドレスを���������れ"
+"��他�翻訳を追加�る必���り��ん。"
+
+#: views/developers/addon_edit_properties.thtml:143
+msgid "devcp_edit_properties_transbox_supportemail_name"
+msgstr "サ�ート用メールアドレス"
+
+#: views/developers/addon_edit_properties.thtml:153
+msgid "devcp_edit_properties_transbox_supporturl_description"
+msgstr ""
+"サ�ートを�供�る Web サイトやフォーラムを����る場����� URL を入力"
+"������。��サイト�他�言語�ローカライズ�れ�������れ��他�"
+"翻訳を追加�る必���り��ん。"
+
+#: views/developers/addon_edit_properties.thtml:152
+msgid "devcp_edit_properties_transbox_supporturl_name"
+msgstr "サ�ート用 Web サイト"
+
+#: 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:118
+msgid "devcp_edit_properties_undelete"
+msgstr "アイコン��存時�削除�れ��。<a %s>キャンセル</a>"
+
+#: views/developers/addon_edit_properties.thtml:160
+msgid "devcp_edit_properties_view_source"
+msgstr ""
+"����許��れ��アドオン���れ��るファイル�ソースコードを�ログイン"
+"���る����ユーザ�表示����。"
+
+#: views/developers/addon_edit_properties.thtml:161
+msgid "devcp_edit_properties_view_source_allow"
+msgstr "オンライン��ソース�表示を許��る"
+
+#: 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 "æ›´æ–°"
@@ -1681,11 +2504,55 @@ 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 "作者"
+
+#: views/elements/developers/editbox.thtml:47
+msgid "devcp_editbox_categories"
+msgstr "カテゴリ"
+
+#: views/elements/developers/editbox.thtml:52
+msgid "devcp_editbox_change_status"
+msgstr "ステータスを変更"
+
+#: views/elements/developers/editbox.thtml:48
+msgid "devcp_editbox_descriptions"
+msgstr "説明"
+
+#: views/elements/developers/editbox.thtml:43
+msgid "devcp_editbox_edit_addon"
+msgstr "アドオンを編集"
+
+#: views/elements/developers/editbox.thtml:57
+msgid "devcp_editbox_new_version"
+msgstr "新���ージョン"
+
+#: views/elements/developers/editbox.thtml:49
+msgid "devcp_editbox_properties"
+msgstr "プロパティ"
+
+#: views/elements/developers/editbox.thtml:60
+msgid "devcp_editbox_screenshots"
+msgstr "プレビュー用スクリーンショット"
+
+#: views/elements/developers/editbox.thtml:53
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "統計ダッシュボード"
+
+#: views/elements/developers/editbox.thtml:54
+msgid "devcp_editbox_versions"
+msgstr "�ージョン�ファイル"
+
+#: views/elements/developers/editbox.thtml:42
+msgid "devcp_editbox_view_listing"
+msgstr "公開ページを表示"
+
 #: 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
 #, php-format
@@ -1694,7 +2561,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "処��れ�レビュー (%s)"
 msgstr[1] "処��れ�レビュー (%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
 #, php-format
@@ -1703,7 +2570,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "公開申請�れ��るアドオン (%s)"
 msgstr[1] "公開申請�れ��るアドオン (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1716,8 +2583,8 @@ msgstr[1] "�留�れ��る更新 (%s)"
 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"
@@ -1743,50 +2610,65 @@ msgstr "レビュー担当者��連絡事項"
 msgid "devcp_editversion_submit_update"
 msgstr "æ›´æ–°"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
 msgid "devcp_error_addon_field_summary_toolong"
 msgstr ""
-"概�� 250 文字����入力����ん。\n"
+"概���角 250 文字����入力����ん。\n"
 "(%s 文字入力�れ����)"
 
-#: controllers/developers_controller.php:1907
+#: controllers/developers_controller.php:1992
 msgid "devcp_error_addonname_not_unique"
 msgstr ""
-"��アドオン�タイトル����データベース上�存在���。以下���を�確�"
-"����。<br /><li>GUID �一致: ��エラー�最もよ��る原因� GUID ��一致"
-"��。</li><li>データベース��複��エントリーを登録�る�������ん。�"
-"��登録�れ��る場���該当�るエントリーを更新�る�削除���ら��度登"
-"録を行������。</li>"
-
+"��アドオン�タイトル�既�データベース上�存在���。以下���を�確��"
+"���。<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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "%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 "��ら�ページ"
 
-#: controllers/developers_controller.php:2013
+#: controllers/developers_controller.php:2098
 msgid "devcp_error_describe_changes"
 msgstr "今回�更新�変更点を入力������。"
 
+#. %1$s is the name of the file
+#: controllers/components/developers.php:658
+#, php-format
+msgid "devcp_error_file_exists"
+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"
@@ -1794,7 +2676,7 @@ msgstr ""
 "��ファイル拡張� (%s) ��択�れ�種類�アドオン��使用����ん。以下�"
 "��れ�を使用������: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "����ファイル� GUID �一致���ん"
 
@@ -1804,7 +2686,7 @@ msgstr "�択��るカテゴリ� 5 �����。"
 
 #: controllers/components/developers.php:526
 msgid "devcp_error_guid_application"
-msgstr "��アドオン� ID ����アプリケーション�よ��使用�れ����。"
+msgstr "��アドオン� ID �既�アプリケーション�よ��使用�れ����。"
 
 #: controllers/components/developers.php:337
 #: controllers/components/developers.php:389
@@ -1823,6 +2705,8 @@ msgstr "最大アップロードサイズを超�����"
 msgid "devcp_error_http_nofile"
 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:401
 #, php-format
 msgid "devcp_error_icon_extension"
@@ -1830,14 +2714,15 @@ msgstr ""
 "��ファイル拡張� (%s) �アイコン��使用����ん。以下���れ�を使用�"
 "�����: %s"
 
-#: controllers/developers_controller.php:1723
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
 #, php-format
 msgid "devcp_error_identical_version_exists"
 msgstr ""
-"��アドオン�プラットフォーム��������ージョン (%s) �存在���。"
+"��アドオン�プラットフォーム��既����ージョン (%s) �存在���。"
 
-#: controllers/developers_controller.php:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "install.rdf ファイル���れ����ん。"
 
@@ -1845,21 +2730,26 @@ msgstr "install.rdf ファイル���れ����ん。"
 msgid "devcp_error_install_manifest"
 msgstr "install.rdf ファイル�以下�エラー��り��:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "正��アドオン�種類を�択������。"
 
+#. %$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 "%s � %s ��ージョン��使用����ん"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "��アドオン� ID ��正�形���: %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"
@@ -1879,6 +2769,7 @@ msgstr ""
 "��アドオン��ージョン��正�形���: �ージョン�スペースを��る���"
 "����ん。"
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1888,6 +2779,7 @@ msgstr "install.rdf �パース中�以下�エラー�発生����: %
 msgid "devcp_error_move_file"
 msgstr "ファイルを移動����ん"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1912,16 +2804,16 @@ msgstr "ã�“ã�®ã‚¢ãƒ‰ã‚ªãƒ³ã�® ID ã�Œ install.rdf ファイルã�§æŒ‡å®šã�•ã‚Œã�¦ã
 msgid "devcp_error_no_platform"
 msgstr "プラットフォーム��択�れ����ん"
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr ""
 "公開申請を行����説明を求�られ�部分����詳述�る必���り��。"
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "リリース��アドオンを公開申請�る�������ん。"
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "公開申請��るアドオン�サンドボックス��るも�����。"
 
@@ -1933,6 +2825,8 @@ msgstr "少���も����カテゴリを�択������。"
 msgid "devcp_error_one_user"
 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"
@@ -1940,13 +2834,13 @@ msgstr ""
 "��ファイル拡張� (%s) �プレビュー画���使用����ん。以下���れ�を"
 "使用������: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
 msgid "devcp_error_saving"
 msgstr "データを�存�る際�エラー�発生����。"
 
-#: controllers/developers_controller.php:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "��アドオンを更新�る権���り��ん。"
 
@@ -1962,7 +2856,7 @@ msgstr ""
 "addons.mozilla.org 以外� updateURL を指定�る�������ん。install.rdf"
 "ファイル�ら updateURL を削除��上���度アップロード������。"
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "ファイルをアップロード������。"
@@ -2037,7 +2931,7 @@ msgstr "カテゴリ"
 
 #: views/developers/add_step1.thtml:108
 msgid "devcp_form_label_defaultlocale"
-msgstr "デフォルト�ロケール"
+msgstr "既定�ロケール"
 
 #: views/developers/add_step2.thtml:130
 msgid "devcp_form_label_description"
@@ -2119,8 +3013,8 @@ 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"
@@ -2183,15 +3077,15 @@ msgstr "自分�アドオン"
 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:68
@@ -2227,50 +3121,86 @@ msgstr "アドオンを登録"
 msgid "devcp_myaddons_title"
 msgstr "開発者用ツール"
 
+#. %1$s is an add-on ID, perhaps 167.
+#. %2$s is a URL.
+#: controllers/developers_controller.php:232
+msgid "devcp_new_addon_error"
+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 �公開を申請"
 
-# %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:49
+msgid "devcp_notice_changes_error"
+msgstr ""
+"<span>����る��複数�変更を�存����ん���。</span><br />以下�エラ"
+"ーを�照������。��他�変更�正���存�れ���。"
+
+#: 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
+msgid "devcp_notice_changes_saved"
+msgstr ""
+"<span>変更��存�完了����。</span><br />一部�変更��Mozilla Add-ons �"
+"����ページ��映�れる��数時間��る��も�り��。"
+
 #: 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 ��る必���り��。"
+"��アドオン�既定�ロケール %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:69
+msgid "devcp_notice_unsaved_changes"
+msgstr "�存�れ����変更��り��。"
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2299,6 +3229,52 @@ msgstr "プレビュー画��編集"
 msgid "devcp_preview_updated_successfully"
 msgstr "プレビュー画��更新�れ���。"
 
+#: views/developers/previews.thtml:121
+msgid "devcp_previews_a_another"
+msgstr "他�プレビュー画�を追加"
+
+#: views/developers/previews.thtml:97
+msgid "devcp_previews_a_delete"
+msgstr "プレビュー画�を削除"
+
+#: views/developers/previews.thtml:96
+msgid "devcp_previews_a_replace"
+msgstr "プレビュー画�を置���"
+
+#: views/developers/previews.thtml:127
+msgid "devcp_previews_a_update"
+msgstr "プレビュー画�を更新"
+
+#: 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:117
+msgid "devcp_previews_add_select"
+msgstr ""
+"アップロード�る画�を�択������。幅 700 ピクセル�高� 525 ピクセル以"
+"上�画��自動的�縮��れ��。使用�能�形�� %s ��。"
+
+#: 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:103
+msgid "devcp_previews_click_update"
+msgstr ""
+"��画�を�存�る���下�「プレビュー画�を更新�をクリック������。"
+"(<a %s>キャンセル</a>)"
+
+#. %s is href=... and should stay in the <a> tag.
+#: views/developers/previews.thtml:108
+msgid "devcp_previews_error_message"
+msgstr ""
+"��プレビュー画���下�「プレビュー画�を更新�をクリック�る�削除�れ�"
+"�。(<a %s>キャンセル</a>)"
+
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
 msgstr ""
@@ -2310,17 +3286,48 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "プレビュー画�を追加"
 
+#: views/developers/previews.thtml:79
+msgid "devcp_previews_header_caption"
+msgstr "プレビュー画��キャプション"
+
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "プレビュー画�を編集"
 
+#: views/developers/previews.thtml:94
+msgid "devcp_previews_label_default"
+msgstr "既定�プレビュー画�"
+
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
 msgstr "プレビュー画��ファイル"
 
 #: views/previews/add.thtml:59 views/previews/edit.thtml:50
 msgid "devcp_previews_label_makedefault"
-msgstr "��画�をデフォルト�プレビュー画���る"
+msgstr "��画�を既定�プレビュー画���る"
+
+#: views/developers/previews.thtml:101
+msgid "devcp_previews_label_new"
+msgstr "新��画�:"
+
+#: views/developers/previews.thtml:119
+msgid "devcp_previews_label_upload"
+msgstr "プレビュー画�をアップロード: "
+
+#: views/developers/previews.thtml:49
+msgid "devcp_previews_notice_error"
+msgstr "�����������プレビュー画�を�存����ん���。"
+
+#: views/developers/previews.thtml:46
+msgid "devcp_previews_notice_success"
+msgstr "プレビュー画��アップロード�完了����。"
+
+#: views/developers/previews.thtml:58
+msgid "devcp_previews_p_screenshots"
+msgstr ""
+"��アドオン�プレビュー用スクリーンショット�下�表示�れ����。���キ"
+"ャプションや画�を変更�る�������。既定�プレビュー画���検索�果�"
+"��タイトル��も�表示�れる画���。"
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -2338,55 +3345,151 @@ msgstr "プレビュー画�を編集"
 msgid "devcp_previews_submit_upload"
 msgstr "プレビュー画�をアップロード"
 
+#: views/developers/previews.thtml:77
+msgid "devcp_previews_thumbnail"
+msgstr "サム�イル"
+
+#. %s is the add-on name.
+#: views/developers/previews.thtml:43
+msgid "devcp_previews_title"
+msgstr "%s �プレビュー画�マ�ージャ"
+
 #: views/developers/add_step2.thtml:64
 msgid "devcp_question_addontype_incorrect"
 msgstr "正����よ���。"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "��ファイルを削除��もよ������？"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr "次�進む���以下�利用�約をよ�読ん����る必���り��。"
 
+#: views/elements/developers/rolecheck.thtml:42
+msgid "devcp_rolecheck_no_privs"
+msgstr ""
+"<span>�������ページを変更��る権���り��ん。</span><br />変更を行"
+"���場��アドオン�オーナー�連絡を�������。"
+
+#: controllers/developers_controller.php:1243
+msgid "devcp_several_hours"
+msgstr ""
+"一部�変更��Mozilla Add-ons �����ページ��映�れる��数時間��る�"
+"�も�り��。"
+
+#: 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:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "1 日�アクティブユーザ: <em>%s</em>"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "累計ダウンロード数: <em>%s</em>"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "週間ダウンロード数: <em>%s</em>"
 
-#: controllers/developers_controller.php:1481
+#: views/developers/addon_status_confirm.thtml:59
+msgid "devcp_status_confirm_active"
+msgstr ""
+"アドオンを有効��る��ステータス�応���検索�果���公開ページ�掲載�"
+"れ��。�様��ステータス�応���Web サイト�らダウンロード��能��り�"
+"更新確�サービスを通��更新��供�れ��。��ページ�戻���れ�����"
+"��も無効��る�������。"
+
+#: views/developers/addon_status_confirm.thtml:59
+msgid "devcp_status_confirm_active_sure"
+msgstr "��アドオンを有効���もよ������？"
+
+#: views/developers/addon_status_confirm.thtml:50
+msgid "devcp_status_confirm_header_sure"
+msgstr "よ������？"
+
+#: views/developers/addon_status_confirm.thtml:55
+msgid "devcp_status_confirm_inactive"
+msgstr ""
+"アドオンを無効��る��検索�果���公開ページ��一切表示�れ���り��"
+"。���Web サイト�らダウンロード�����り�更新確�サービスを通��更新"
+"も�供�れ���り��。��ページ�戻���れ�������も有効��る��"
+"�����。"
+
+#: views/developers/addon_status_confirm.thtml:55
+msgid "devcp_status_confirm_inactive_sure"
+msgstr "��アドオンを無効���もよ������？"
+
+#: views/developers/addon_status_confirm.thtml:74
+msgid "devcp_status_confirm_no"
+msgstr "����キャンセル���"
+
+#: views/developers/addon_status_confirm.thtml:67
+msgid "devcp_status_confirm_public"
+msgstr ""
+"アドオンを公開�る��誰�もダウンロード�能��り�既存�ユーザ����更新"
+"��供�開始�れ��。"
+
+#: views/developers/addon_status_confirm.thtml:67
+msgid "devcp_status_confirm_public_sure"
+msgstr "��アドオンを公開��もよ������？"
+
+#: views/developers/addon_status_confirm.thtml:63
+msgid "devcp_status_confirm_sandbox"
+msgstr ""
+"アドオンをサンドボックス�戻���ダウンロード�際�ユーザ�ログインを必��"
+"�るよ���り�既存�ユーザ�対��も更新��供�れ���り��。����ア"
+"ドオン��在既�公開�れ���������ページ�戻���れ�������も"
+"公開�る�������。"
+
+#: views/developers/addon_status_confirm.thtml:63
+msgid "devcp_status_confirm_sandbox_sure"
+msgstr "��アドオンをサンドボックス�移動��もよ������？"
+
+#: views/developers/addon_status_confirm.thtml:73
+msgid "devcp_status_confirm_yes"
+msgstr "��������。"
+
+#: views/developers/addon_status_nominate.thtml:46
+msgid "devcp_status_nominate_error_notice"
+msgstr ""
+"<span>公開申請����メッセージ�必���。</span><br />必��情報をテキスト"
+"ボックス�入力���ら��度申請������。"
+
+#: views/developers/addon_status_nominate.thtml:55
+msgid "devcp_status_nominate_header"
+msgstr "アドオン�公開申請"
+
+#: controllers/developers_controller.php:1566
 msgid "devcp_submissions_disabled"
 msgstr "�在アドオン�登録�中止�れ����。後日���ェック������。"
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "���る"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "�����"
 
@@ -2402,11 +3505,11 @@ msgstr "公開�中止�れ����"
 msgid "devcp_summary_header_trusted"
 msgstr "信頼�れ����"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2418,7 +3521,7 @@ msgstr ""
 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"
@@ -2428,30 +3531,567 @@ msgstr "テーマを登録�れる場���必� %s ������。"
 msgid "devcp_theme_upload_preview_link"
 msgstr "プレビュー画�をアップロード"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+msgid "devcp_title_edit_addon"
+msgstr "%s を編集"
+
+#. title attribute for a javascript link that pops up a help dialog.
+#: views/elements/developers/translationbox.thtml:64
+msgid "devcp_transbox_a_title_help"
+msgstr "ヘルプ (��ページ�ら移動���ん)"
+
+#: views/elements/developers/translationbox.thtml:64
+msgid "devcp_transbox_alt_help"
+msgstr "ヘルプ"
+
+#. %1$s is <span>17</span>, %2$s is 42.
+#: views/elements/developers/translationbox.thtml:97
+msgid "devcp_transbox_chars_used"
+msgstr "入力済�文字数: %1$s / %2$s"
+
+#: views/elements/developers/translationbox.thtml:132
+msgid "devcp_transbox_delete_sure"
+msgstr "��翻訳を削除��もよ������？"
+
+#. %s is a locale, like en-US.
+#: views/elements/developers/translationbox.thtml:143
+msgid "devcp_transbox_help_header_tabs"
+msgstr "�れら� %s タブ�何���？"
+
+#: views/elements/developers/translationbox.thtml:145
+msgid "devcp_transbox_help_header_what"
+msgstr "翻訳を用������場�����り���？"
+
+#: views/elements/developers/translationbox.thtml:147
+msgid "devcp_transbox_help_hide"
+msgstr "ヘルプを隠�"
+
+#: views/elements/developers/translationbox.thtml:146
+msgid "devcp_transbox_help_if"
+msgstr ""
+"ユーザ�サイトを閲覧������国語�翻訳��供�れ����場���アドオン"
+"�プロパティ編集画��指定�れ�既定�ロケール�使用�れ��。����翻訳を"
+"����用������場���入力�能�言語���り���自身��国語を既定"
+"�ロケール�指定������。"
+
+#: views/elements/developers/translationbox.thtml:144
+msgid "devcp_transbox_help_transbox"
+msgstr ""
+"�れ� <b>翻訳ボックス</b> ��。特定�入力欄を�翻訳を用����る他�言語�"
+"ローカライズ����。ロケール�タブを使用�る����翻訳を追加�編集�削除"
+"����。"
+
+#: views/elements/developers/translationbox.thtml:81
+msgid "devcp_transbox_img_add_trans"
+msgstr "翻訳を追加"
+
+#: views/elements/developers/translationbox.thtml:82
+msgid "devcp_transbox_img_remove_trans"
+msgstr "翻訳を削除"
+
+#: views/elements/developers/translationbox.thtml:123
+msgid "devcp_transbox_input_add_all"
+msgstr "����欄�ロケールを追加"
+
+#: views/elements/developers/translationbox.thtml:122
+msgid "devcp_transbox_input_add_locale"
+msgstr "ロケールを追加"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+msgid "devcp_transbox_input_cancel"
+msgstr "キャンセル"
+
+#: views/elements/developers/translationbox.thtml:134
+msgid "devcp_transbox_input_delete"
+msgstr "削除"
+
+#: views/elements/developers/translationbox.thtml:113
+msgid "devcp_transbox_select_locale"
+msgstr "追加�る翻訳�ロケールを�択������:"
+
+#. %1$s and %2$s are GUIDs.
+#: controllers/developers_controller.php:311
+msgid "devcp_update_addon_guid_error"
+msgstr ""
+"��ファイル�使用�れ��るアドオン� GUID (%1$s) ����アドオン�既存�"
+"GUID (%2$s) �一致���ん。"
+
+#: 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: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: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:356
+msgid "devcp_update_addon_version_match_error"
+msgstr ""
+"アップロード�れ��ージョン番� (%1$s) ��既存��ージョン番� (%2$s) �一"
+"致���ん。"
+
+#: views/developers/uploader.thtml:68
+msgid "devcp_uploader_a_start"
+msgstr "スタート"
+
+#: views/developers/uploader.thtml:103
+msgid "devcp_uploader_ajax_loading"
+msgstr "ファイルをアップロード�����..."
+
+#: views/developers/uploader.thtml:123
+msgid "devcp_uploader_button_edit"
+msgstr "自分�アドオンを編集"
+
+#: views/developers/uploader.thtml:124
+msgid "devcp_uploader_button_later"
+msgstr "アドオン�後�完�����。"
+
+#: 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:122
+msgid "devcp_uploader_created_results"
+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:141
+msgid "devcp_uploader_file_created"
+msgstr ""
+"新��ファイル��ージョン %1$s �追加�れ��在 %2$s ��れ����。"
+
+#: views/developers/uploader.thtml:120
+msgid "devcp_uploader_header_created"
+msgstr "アドオン�作��れ���。"
+
+#: views/developers/uploader.thtml:107
+msgid "devcp_uploader_header_error"
+msgstr "��ファイル���題��るよ���。"
+
+#: views/developers/uploader.thtml:139
+msgid "devcp_uploader_header_file_added"
+msgstr "ファイル�追加�れ���。"
+
+#: views/developers/uploader.thtml:66
+msgid "devcp_uploader_header_how"
+msgstr "�れ���よ��使�����？"
+
+#. %s is the version number, e.g. 3.2.
+#: views/developers/uploader.thtml:129
+msgid "devcp_uploader_header_update_created"
+msgstr "�ージョン %s �作��れ���"
+
+#: views/developers/uploader.thtml:83
+msgid "devcp_uploader_header_upload"
+msgstr "ファイルをアップロード"
+
+#: views/developers/uploader.thtml:67
+msgid "devcp_uploader_how"
+msgstr ""
+"<p>Mozilla Add-ons ��アドオン�登録�興味を���������り������"
+"��。Mozilla Add-ons ��アドオン�ホスティング��アドオン��布を管��る"
+"最も簡��方法��。��サイト��以下�よ��機能を利用����。</p><ul>"
+"<li>�アドオン��������供��情報を�む公開ページ��供�れ��。��"
+"���アドオン�機能�簡���約�より詳��説明�プレビュー用スクリーンショ"
+"ット��を掲載����。</li><li>����アドオン��サイト全体�検索�果��"
+"�加���Firefox 3 �アドオンマ�ージャ�も表示�れ��。</li><li>ダウンロー"
+"ド��������ホスティング��供�れ�����新���ージョンをアップロ"
+"ード�������既存�ユーザ���自動更新�行�れ��。</li><li>ユーザ�利"
+"用状��関�る詳��情報を閲覧��る統計ダッシュボード��供�れ��。</li>"
+"</ul><p>Mozilla Add-ons �サイト�登録�れ�アドオン���れら����機能を"
+"利用��るよ���る���エディタ�よるレビューを��る必���り��。��"
+"プロセスを始�る準備�������既�アップロード�るアドオンパッケージを�"
+"���ら�下�「スタート�をクリック�������</p>"
+
+#: views/developers/uploader.thtml:91
+msgid "devcp_uploader_label_platformtype"
+msgstr "対応プラットフォーム:"
+
+#: views/developers/uploader.thtml:90
+msgid "devcp_uploader_label_upload_field"
+msgstr "アドオン�ファイル: "
+
+#. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
+#: views/developers/uploader.thtml:142
+msgid "devcp_uploader_p_pending_file"
+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:132
+msgid "devcp_uploader_p_pending_version"
+msgstr ""
+"新���ージョン��エディタ�よるレビュー�完了次第�一般�公開�れ��。�"
+"在他� %1$s 個�アドオン�レビューを待�����。も��早�レビューを���"
+"����？ �れ�ら <a %2$s>エディタ��る</a> ��を�検討����。"
+
+#. %s is a status, e.g Public or Incomplete.
+#: 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:143
+msgid "devcp_uploader_p_update_file"
+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:133
+msgid "devcp_uploader_p_update_version"
+msgstr ""
+"新���ージョン� <a %1$s>�ージョン�ファイル</a> �ページ�表示����。"
+"アドオン� <a %2$s>�在�ステータス</a> を確���り�下�ボタンをクリック�"
+"�<b>リリースノートを追加</b>�る��も���� (強�推奨���)。"
+
+#: views/developers/uploader.thtml:84
+msgid "devcp_uploader_p_upload"
+msgstr ""
+"アドオン�ファイルをアップロード�る��下�フォームを使用���。複数�プラ"
+"ットフォーム���ファイルをアップロード�る������������ファイル"
+"を�択���れ�ら他�ファイルを「�ージョン�ファイル�管�画��アップロー"
+"ド������。"
+
+#: views/developers/uploader.thtml:91
+msgid "devcp_uploader_platformtype_all"
+msgstr "���"
+
+#: views/developers/uploader.thtml:92
+msgid "devcp_uploader_platformtype_specific"
+msgstr "特定:"
+
+#. %1$s is the add-on name, %2$s is the version number.
+#: views/developers/uploader.thtml:57
+msgid "devcp_uploader_title_file"
+msgstr "%1$s %2$s �ファイルを追加"
+
+#: views/developers/uploader.thtml:50
+msgid "devcp_uploader_title_submit"
+msgstr "新��アドオンを登録"
+
+#. %s is the add-on name.
+#: views/developers/uploader.thtml:54
+msgid "devcp_uploader_title_update"
+msgstr "%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 "�考��� %s を�覧����。"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "��ら�ページ"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: controllers/developers_controller.php:527
+msgid "devcp_verify_author_error"
+msgstr "��メールアドレスを��アカウント�見��り��ん���。"
+
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
 msgid "devcp_version_edit_pagetitle"
 msgstr "�ージョン�編集"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "�ージョン�更新�れ���。"
 
+#: views/developers/versions.thtml:75
+msgid "devcp_versions_a_cancel"
+msgstr "キャンセル"
+
+#: views/developers/versions.thtml:79
+msgid "devcp_versions_a_delete"
+msgstr "�ージョンを削除"
+
+#: views/developers/versions.thtml:74
+msgid "devcp_versions_a_empty"
+msgstr "空��ージョンを削除"
+
+#: views/developers/versions.thtml:71
+msgid "devcp_versions_a_remove"
+msgstr "削除����？"
+
+#: views/developers/versions.thtml:91
+msgid "devcp_versions_add"
+msgstr "新���ージョンを追加"
+
+#: views/developers/versions_delete.thtml:58
+msgid "devcp_versions_delete_a_cancel"
+msgstr "キャンセル"
+
+#: views/developers/versions_delete.thtml:56
+msgid "devcp_versions_delete_a_delete"
+msgstr "�ージョンを削除"
+
+#. Followed by a list of reviews and files that will be removed.
+#: views/developers/versions_delete.thtml:50
+msgid "devcp_versions_delete_also"
+msgstr "�れ�より以下�項目も削除�れ��:"
+
+#: views/developers/versions_delete.thtml:53
+msgid "devcp_versions_delete_files"
+msgid_plural "devcp_versions_delete_files"
+msgstr[0] "%s ファイル"
+msgstr[1] "%s ファイル"
+
+#. %s is the version number.
+#: views/developers/versions_delete.thtml:48
+msgid "devcp_versions_delete_header"
+msgstr "�ージョン %s を削除����？"
+
+#: views/developers/versions_delete.thtml:52
+msgid "devcp_versions_delete_reviews"
+msgid_plural "devcp_versions_delete_reviews"
+msgstr[0] "%s レビュー"
+msgstr[1] "%s レビュー"
+
+#. %s is the version number.
+#: views/developers/versions_delete.thtml:49
+msgid "devcp_versions_delete_sure"
+msgstr "�ージョン %s を完全�削除��もよ������？"
+
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
+msgid "devcp_versions_edit_a_cancel"
+msgstr "キャンセル"
+
+#: views/developers/versions_edit.thtml:100
+msgid "devcp_versions_edit_a_delete"
+msgstr "ファイルを削除"
+
+#: views/developers/versions_edit.thtml:164
+msgid "devcp_versions_edit_a_new_app"
+msgstr "新��アプリケーションを追加"
+
+#: views/developers/versions_edit.thtml:153
+msgid "devcp_versions_edit_a_remove_app"
+msgstr "アプリケーションを削除"
+
+#: 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:120
+msgid "devcp_versions_edit_adjust"
+msgstr ""
+"���アプリケーション情報を編集�る��アドオン�パッケージ���れ��る "
+"install.rdf ��互�性����判断�れる場�����も�ユーザ�インストール"
+"��るよ���り��。<a %s>対応アプリケーション�一覧</a>"
+
+#: views/developers/versions_edit.thtml:152
+msgid "devcp_versions_edit_compat_sure"
+msgstr ""
+"��アプリケーション��互�性を削除��もよ������？"
+
+#: views/developers/versions_edit.thtml:99
+msgid "devcp_versions_edit_delete_sure"
+msgstr "��ファイルを完全�削除��もよ������？"
+
+#: views/developers/versions_edit.thtml:186
+msgid "devcp_versions_edit_header_approval"
+msgstr "承��関�る情報"
+
+#: views/developers/versions_edit.thtml:119
+msgid "devcp_versions_edit_header_compat"
+msgstr "互�性��るアプリケーション"
+
+#: views/developers/versions_edit.thtml:73
+msgid "devcp_versions_edit_header_file"
+msgstr "ファイル情報"
+
+#. %s is the version number.
+#: views/developers/versions_edit.thtml:52
+msgid "devcp_versions_edit_header_manage"
+msgstr "�ージョン %s を管�"
+
+#: views/developers/versions_edit.thtml:194
+msgid "devcp_versions_edit_header_notes"
+msgstr "承��関�る注�"
+
+#: views/developers/versions_edit.thtml:97
+msgid "devcp_versions_edit_img_delete"
+msgstr "ファイルを削除"
+
+#. %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
+msgid "devcp_versions_edit_li_file"
+msgstr ""
+"ファイル %1$s (%2$s) � %3$s �作��れ�%5$s � %4$s �変更�れ���"
+
+#: views/developers/versions_edit.thtml:110
+msgid "devcp_versions_edit_no_files"
+msgstr "ファイル�見��り��ん���。"
+
+#: views/developers/versions_edit.thtml:195
+msgid "devcp_versions_edit_optional"
+msgstr "���ージョンをレビュー�るエディタ�����任��情報��。"
+
+#: views/developers/versions_edit.thtml:150
+msgid "devcp_versions_edit_remove_compat"
+msgstr "アプリケーション互�性を削除"
+
+#: views/developers/versions_edit.thtml:166
+msgid "devcp_versions_edit_select_app"
+msgstr "アプリケーションを�択������"
+
+#: views/developers/versions_edit.thtml:77
+msgid "devcp_versions_edit_th_file"
+msgstr "ファイル"
+
+#: views/developers/versions_edit.thtml:78
+msgid "devcp_versions_edit_th_platform"
+msgstr "プラットフォーム"
+
+#: views/developers/versions_edit.thtml:79
+msgid "devcp_versions_edit_th_size"
+msgstr "サイズ"
+
+#: views/developers/versions_edit.thtml:80
+msgid "devcp_versions_edit_th_status"
+msgstr "ステータス"
+
+#: views/developers/versions_edit.thtml:182
+msgid "devcp_versions_edit_transbox_releasenotes_description"
+msgstr ""
+"���ージョン��変更点�新機能�既知��グ���他���ージョン�����"
+"考��る情報を入力���。�れら�情報��ユーザ� Firefox 3 �アドオンマ�ー"
+"ジャ画��らアドオンを更新�る際�も表示��る�������。"
+
+#: views/developers/versions_edit.thtml:181
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "リリースノート"
+
+#: views/developers/versions_edit.thtml:163
+msgid "devcp_versions_edit_unsaved_compat"
+msgstr ""
+"<strong>�存�れ����変更��り��。</strong> 互�性情報��下�「�ージ"
+"ョン情報を更新�をクリック�る��削除�れ��ん。"
+
+#: views/developers/versions_edit.thtml:112
+msgid "devcp_versions_edit_unsaved_files"
+msgstr ""
+"<strong>�存�れ����変更��り��。</strong> ファイル��下�「�ージョ"
+"ン情報を更新�をクリック�る��削除�れ��ん。"
+
+#: views/developers/versions_edit.thtml:200
+msgid "devcp_versions_edit_update"
+msgstr "�ージョン情報を更新"
+
+#: views/developers/versions.thtml:49
+msgid "devcp_versions_header_manage"
+msgstr "�ージョン�ファイル�管�"
+
+#: views/developers/versions.thtml:87
+msgid "devcp_versions_no_versions"
+msgstr "�ージョン�見��り��ん���。"
+
+#. %s is a version number, base 10.
+#: views/developers/versions.thtml:46
+msgid "devcp_versions_notice_success"
+msgstr "�ージョン %s �削除�れ���。"
+
+#: views/developers/versions.thtml:73
+msgid "devcp_versions_p_remove"
+msgstr ""
+"���ージョン���関連付�られ�削除�能�ファイル��り��ん。���ージ"
+"ョンを削除����？"
+
+#: views/developers/versions.thtml:58
+msgid "devcp_versions_th_created"
+msgstr "作�日"
+
+#: views/developers/versions.thtml:57
+msgid "devcp_versions_th_status"
+msgstr "ステータス"
+
+#: views/developers/versions.thtml:56
+msgid "devcp_versions_th_version"
+msgstr "�ージョン"
+
 #: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "��アドオン�公開�中止�れ����"
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "��アドオン���公開申請�れ����ん。"
+
+#: controllers/components/editors.php:213
+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
+msgid "editor_review_error_no_action"
+msgstr "レビューアクションを�択������。"
+
+#: controllers/components/editors.php:192
+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
+msgid "editor_review_error_no_comments"
+msgstr "レビューコメントを入力������。"
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "レビューを行�ファイルを少���も�����択������。"
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "テストを行�� OS を入力������。"
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "フィルタ"
@@ -2460,7 +4100,7 @@ msgstr "フィルタ"
 msgid "editorcp_logs_filter_by"
 msgstr "種類・アクション�よるフィルタ"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "イベントログ"
 
@@ -2512,6 +4152,7 @@ msgstr "コメントを隠�"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "コメントを表示"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2521,7 +4162,7 @@ msgstr "%s �ら %s ���エントリーを表示"
 msgid "editorcp_reviewlog_none_found"
 msgstr "��期間�レビュー�行�れ�アドオン��り��ん。"
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "レビュー履歴"
 
@@ -2545,24 +4186,24 @@ msgstr "最近�エディタ�活動"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "レビュー��計"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "アドオン�レビュー"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "以下�項目を入力������:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "少���も����レビューを行�ファイルを�択������。"
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "作者自身�よるレビュー�許��れ����ん。"
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "外部アプリケーション"
 
@@ -2574,39 +4215,39 @@ msgstr "注目�アドオンを追加"
 msgid "editors_featured_add_feature_submit"
 msgstr "追加"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "注目�アドオン�追加�完了����。"
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "注目�アドオンを削除����ん���。"
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "注目�アドオン�削除�完了����。"
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "注目�アドオン"
 
@@ -2640,39 +4281,40 @@ msgstr ""
 "�れら�フィルタ���在�セッション中���クリアを�択�る���用�れ�"
 "�。"
 
-# %1 is the queue mode
+#. %1 is the queue mode
 #: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "�在レビュー待�� %s アドオン��り��ん。"
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 æ—¥"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 時間"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 分"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "エディタ用コントロールパ�ル"
 
-#: controllers/editors_controller.php:286
+#. %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 "%s 専用"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "正�リリース��アドオン"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2686,19 +4328,23 @@ msgstr "クリア"
 msgid "editors_queue_submit_filter"
 msgstr "フィルタ"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "�在レビュー待��中止�れ����。後日���ェック������。"
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "レビューアクション"
 
+#: views/editors/review.thtml:153
+msgid "editors_review_action_info"
+msgstr "より詳��情報を求�る"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "公開ページ�掲載"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "スーパーレビューを申請"
 
@@ -2706,30 +4352,37 @@ msgstr "スーパーレビューを申請"
 msgid "editors_review_action_sandbox"
 msgstr "サンドボックス��留"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "レビュー担当者�コメント"
 
-#: views/editors/review.thtml:167
+#: views/editors/review.thtml:176
+msgid "editors_review_details_info_request"
+msgstr ""
+"作者�より詳��情報を求�る����フォームを使用������。作者��メー"
+"ル��られ����回答を行�るよ���り��。返信������������も"
+"メール�よる通知��られ��。"
+
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "アドオン����最新�ージョン�最新ファイル�公開を承����。今後��ー"
 "ジョン��エディタ�よるレビューを��る���サンドボックス�置�れ��。"
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "アドオンをサンドボックス��留���。"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "公開済�アドオン�サンドボックス��る�ージョンを公開ページ�掲載���。"
 
-#: views/editors/review.thtml:162
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "公開済�アドオン�サンドボックス��る�ージョンを�����留���。"
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "アドオン�セキュリティや著作権�������管�者�よる調査を必���るよ�"
@@ -2756,15 +4409,15 @@ msgstr "カテゴリ:"
 msgid "editors_review_header_compatibility"
 msgstr "互�性:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "説明"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "作者�コメント"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2772,85 +4425,108 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "ファイル:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "履歴"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "公開申請メッセージ"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "プレビュー画�"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "%s をレビュー"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "レビュー担当者��注�"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "概�"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "�ージョン�説明"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "返信"
+
+#: views/elements/developers/editors_review_history_item.thtml:78
+msgid "editors_review_history_info_request"
+msgstr "情報�リクエスト"
+
+#: views/elements/developers/editors_review_history_item.thtml:62
+#: views/editors/reviewlog.thtml:77
 msgid "editors_review_history_nominated_adminreview"
 msgstr "管�者レビュー"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "申請を承� (一般�公開)"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "申請を�下 (サンドボックス��留)"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "�れ���レビューを����ージョン��り��ん。"
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "管�者レビュー"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "申請を承� (一般�公開)"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "申請を�下 (サンドボックス��留)"
 
-#: views/editors/review.thtml:198
+#. 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] "返信を表示・隠� (%1$s)"
+msgstr[1] "返信を表示・隠� (%1$s)"
+
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "アプリケーション:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "���定型文を�択������:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "コメント:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "OS:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "トップ"
 
@@ -2858,7 +4534,7 @@ msgstr "トップ"
 msgid "editors_review_next_link"
 msgstr "次� &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "プレビュー画���り��ん。"
 
@@ -2866,41 +4542,47 @@ msgstr "プレビュー画���り��ん。"
 msgid "editors_review_previous_link"
 msgstr "&laquo; ��"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 msgid "editors_review_rank_in_queue"
 msgstr "レビュー待�アドオン: %2$s 件中 <strong>%1$s</strong> 件目"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
-msgstr "プロセスアクション"
+msgstr "アクションを実行"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "アクション"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "コメント"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "日付"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "レビュー担当者"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "�ージョン・ファイル"
 
-#: controllers/editors_controller.php:411
+#: views/editors/review.thtml:213
+msgid "editors_review_update_notify_once"
+msgstr ""
+"次回��アドオン�更新�れ����メール�よる通知を���る (��後�更新時"
+"��メール��られ��ん)"
+
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "レビュー�完了����。"
 
@@ -2924,7 +4606,7 @@ msgstr "アクション"
 msgid "editors_reviews_in_reply_to"
 msgstr "��メッセージ��返信:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "レビュー�完了����。"
 
@@ -2934,25 +4616,25 @@ msgstr "担当���るレビュー��り��ん。"
 
 #: views/editors/reviews_queue.thtml:111
 msgid "editors_reviews_submit_process_reviews"
-msgstr "プロセスレビュー"
+msgstr "レビュー処�を実行"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "特定�サイト用"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "新�"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "æ›´æ–°"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "テストを行��アプリケーション"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "テストを行�� OS"
 
@@ -2993,17 +4675,20 @@ msgstr "プラットフォーム"
 msgid "editors_th_submissiontypes"
 msgstr "申請�種類"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s æ—¥"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s 時間"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s 分"
@@ -3012,8 +4697,8 @@ msgstr "%s 分"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "アクセス�拒��れ���"
 
@@ -3021,12 +4706,13 @@ msgstr "アクセス�拒��れ���"
 msgid "error_access_denied_message"
 msgstr "��ページを表示�る権���り��ん。"
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3036,18 +4722,19 @@ msgstr "��ページを表示�る権���り��ん。"
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "該当�るアドオン��り��ん。"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "��アドオン��在表示����ん。"
 
@@ -3055,7 +4742,7 @@ msgstr "��アドオン��在表示����ん。"
 msgid "error_addon_selfreview"
 msgstr "自分�アドオンをレビュー�る�������ん。"
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "��カテゴリ����アドオン�登録�れ����ん。"
 
@@ -3077,24 +4764,25 @@ msgstr "メールアドレス�形��正���り��ん。"
 msgid "error_field_required"
 msgstr "��項目�必須��。"
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "ファイル��り��ん。"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "ファイルエラー: %s �存在���ん。"
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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 "入力内容�エラー��り��。確��上��度�信������。"
@@ -3111,16 +4799,18 @@ 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3138,7 +4828,7 @@ msgstr "注�"
 msgid "error_preview_notfound"
 msgstr "プレビュー画���り��ん。"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "評価を�択������。"
 
@@ -3161,7 +4851,7 @@ msgstr "パスワード�一致���ん。"
 #: 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:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
@@ -3173,7 +4863,7 @@ msgstr ""
 #: views/users/register.thtml:86 views/users/edit.thtml:119
 #: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
-msgstr "��ニック�ーム����他�ユーザ�使�れ����。"
+msgstr "��ニック�ーム�既�他�ユーザ�使�れ����。"
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
 #: controllers/users_controller.php:260 controllers/users_controller.php:592
@@ -3189,8 +4879,8 @@ msgstr "����メール������コード�アカウント��
 msgid "error_username_or_pw_wrong"
 msgstr "ユーザ����パスワード�正���り��ん。"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "�ージョン��り��ん。"
 
@@ -3202,13 +4892,14 @@ msgstr "入力�れ�パスワード�正���り��ん。"
 msgid "feature_learnmore"
 msgstr "詳細"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "%1$s �詳細"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3220,6 +4911,40 @@ msgstr[1] "レビュー (%1$s)"
 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
+msgid "file_browser_link_addon"
+msgstr "アドオン�詳細�戻る"
+
+#. 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 "���展開"
+
+#. 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 "レビュー�戻る"
+
+#. 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 :: ファイルブラウザ :: %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
+msgid "file_browser_toggle_expand_collapse"
+msgstr "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "All rights reserved."
@@ -3256,7 +4981,7 @@ msgstr "他�言語:"
 msgid "footer_privacy_policy"
 msgstr "プライ�シー�リシー"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "�存"
 
@@ -3264,7 +4989,7 @@ msgstr "�存"
 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:110
 msgid "general_addontype_dict_plural"
 msgstr "スペル�ェック辞書"
@@ -3273,7 +4998,7 @@ msgstr "スペル�ェック辞書"
 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:108
 msgid "general_addontype_extension_plural"
 msgstr "拡張機能"
@@ -3282,7 +5007,7 @@ msgstr "拡張機能"
 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "言語パック (アドオン)"
@@ -3291,7 +5016,7 @@ msgstr "言語パック (アドオン)"
 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "言語パック (アプリケーション)"
@@ -3300,7 +5025,7 @@ msgstr "言語パック (アプリケーション)"
 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "プラグイン"
@@ -3309,7 +5034,7 @@ msgstr "プラグイン"
 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:111
 msgid "general_addontype_search_plural"
 msgstr "検索エンジン"
@@ -3318,11 +5043,12 @@ msgstr "検索エンジン"
 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:109
 msgid "general_addontype_theme_plural"
 msgstr "テーマ"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3353,12 +5079,12 @@ msgid "header_navlink_addons"
 msgstr "アドオン"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "ログアウト"
 
@@ -3366,38 +5092,43 @@ msgstr "ログアウト"
 msgid "header_navlink_myaccount"
 msgstr "アカウント"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "ユーザ登録"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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
+#. %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 ""
 "��実験的�アドオンをインストール�る�� <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/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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3420,7 +5151,7 @@ msgid "langtools_download_langpack"
 msgstr "言語パックをダウンロード"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "スペル�ェック辞書�言語パック"
 
@@ -3476,7 +5207,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3509,7 +5244,7 @@ msgstr "テーマ"
 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:214
 msgid "other_users"
 msgstr "��他"
@@ -3522,35 +5257,34 @@ msgstr "アプリケーション��ージョン"
 msgid "page_title_credits"
 msgstr "クレジット"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "実験的�アドオン"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
 msgstr "よ��る質�"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion Your Firefox �関�る FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "アドオン�リシー"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Mozilla プライ�シー�リシー"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "レビューガイドライン"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "サンドボックスレビューシステム"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "申請�関�るヘルプ"
 
@@ -3569,6 +5303,7 @@ msgstr ""
 "も��れ��対応��� install.rdf ファイルを�梱�る必���り��。�アプリ"
 "ケーション�も�以下�表記�れ��ージョン��指定�能��。"
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3577,6 +5312,8 @@ msgstr ""
 "��も�%s �書�れ��る必須プロパティを指定�� install.rdf �必��梱�る"
 "必���り��。"
 
+#. 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 "��ら�ページ"
@@ -3585,7 +5322,6 @@ msgstr "��ら�ページ"
 msgid "pages_appversions_versions"
 msgstr "�ージョン"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "��ページ�戻る"
 
@@ -3597,7 +5333,7 @@ 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"
@@ -3621,16 +5357,16 @@ 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> ��も����。"
 
-# %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
 msgid "recaptcha_hardtoread_text"
 msgstr ""
@@ -3645,7 +5381,7 @@ msgstr "����人間���？"
 msgid "recaptcha_whatsthis"
 msgstr "�れ�何��ょ�？"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "��レビューを通知�る際�エラー�発生�����"
 
@@ -3670,7 +5406,7 @@ msgid "review_flag_reason_spam"
 msgstr "スパム�る����他レビュー�無関係�内容"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "�り��������。��レビュー�エディタ�通知�れ���。"
 
@@ -3684,7 +5420,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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3694,28 +5430,29 @@ msgstr ""
 "書������。「����「悪������一般的�語�����よ�����由"
 "を併記����り�������。</li><li>�グ報告をレビュー���投稿����"
 "����。����メールアドレス�アドオン作者�公開�れ��ん���作者��"
-"題解決����������力を�願��������も�連絡を�る������"
-"�ん。��アドオン����何�サ�ートを必���れ��る場���<a href=\"%1"
-"$s\">サ�ート</a> �項目を�照������。</li><li>��切�言葉������"
-"��。������る個人情報も投稿����り��ん。</li></ul><p>ユーザ�よる"
-"アドオンレビュー�詳細� <a href=\"%2$s\">レビューガイドライン</a> を�照��"
-"����。"
+"題解決��������力を�願��������も�連絡を�る�������ん"
+"。��アドオン����何�サ�ートを必���れ��る場���<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:54 views/reviews/display.thtml:54
 #: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "%s �レビュー"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "注目�アドオン"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "最近公開�れ�アドオン"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "最近更新�れ�アドオン"
 
@@ -3752,6 +5489,7 @@ msgstr "����検索エンジン"
 msgid "search_landing_browse_search_engines"
 msgstr "検索エンジンをブラウズ"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3771,12 +5509,13 @@ msgstr "アドオン�検索"
 msgid "search_rss_description"
 msgstr "検索�果�フィード"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "%s �検索�果"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "管�者用ツール"
 
@@ -3784,7 +5523,7 @@ msgstr "管�者用ツール"
 msgid "sidebar_navlink_developer_tools"
 msgstr "開発者用ツール"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "エディタ用ツール"
 
@@ -3792,6 +5531,7 @@ msgstr "エディタ用ツール"
 msgid "sidebar_navlink_welcome"
 msgstr "よ���"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3829,6 +5569,7 @@ msgstr "テーマ"
 msgid "sidebar_pitch_updated_addons"
 msgstr "最近更新�れ�アドオン"
 
+#. %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
@@ -3840,7 +5581,7 @@ msgstr "%1$s KB"
 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3858,24 +5599,32 @@ msgstr "開発者用ツール"
 msgid "statistics_addon_switch"
 msgstr "アドオンを切り替�"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "%b %e æ—¥"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "%Yå¹´ %b %eæ—¥"
 
+#. 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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3917,7 +5666,7 @@ msgstr "統計ダッシュボード"
 msgid "statistics_index_view_button"
 msgstr "統計を表示"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "��表を CSV 形��表示"
 
@@ -3933,7 +5682,7 @@ msgstr "��座標を削除"
 msgid "statistics_js_groupby_selector_date"
 msgstr "グループ化: 1 日"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "グループ化: 1 �月"
 
@@ -3941,103 +5690,107 @@ msgstr "グループ化: 1 �月"
 msgid "statistics_js_groupby_selector_week"
 msgstr "グループ化: 1 週間"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "一定期間�比較: 週��"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "範囲内� %s 件見��り���"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "座標を追加"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "��グラフ�別�座標を追加"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "�計数を隠�"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "�計数を表示"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "��グラフ上��計数を表示�る"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "データを表示 (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "��データ�カンマ区切りファイルをダウンロード"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "%s �イベントを隠�"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "%s �イベントを表示"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "座標上�アドオン�リリース日を表示"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Firefox �イベントを隠�"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Firefox �イベントを表示"
 
-#: controllers/statistics_controller.php:241
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "座標上� Firefox �リリース日を表示"
 
-#: controllers/statistics_controller.php:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "グラフを縮�"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "グラフを拡大"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "グラフ�サイズを変更"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "1 日�アクティブユーザ数"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "アプリケーション"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "カスタム"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "ダウンロード"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "OS"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "アドオン�状態"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "概�"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "アドオン��ージョン"
 
@@ -4061,17 +5814,16 @@ msgstr "�明"
 msgid "statistics_longnames_version"
 msgstr "アドオン��ージョン"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "��グラフ上�表示��るデータ����分�集������ん。��後�確���"
 "����。"
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
-"����アドオン�データ���集������ん。数日後���確������"
-"�。"
+"��アドオン�データ���集������ん。数日後���確�������。"
 
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
@@ -4079,11 +5831,11 @@ msgstr ""
 "�在�アドオン�統計�更新中��。プログラム�よ��情報�更新�完了�る�"
 "��最近�データ��完全��。数分後���確�������。"
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "統計ダッシュボード��在�利用��れ��ん。��後�確�������。"
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr ""
 "統計ダッシュボード�グラフを表示�る�� JavaScript を有効�������。"
@@ -4099,36 +5851,36 @@ msgstr "設定�更新�れ���。"
 msgid "statistics_pagetitle"
 msgstr "統計ダッシュボード"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "1 日�アクティブユーザ数"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "1 日�ダウンロード数"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "拡大"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "1 �月分拡大"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "縮�"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "1 �月分縮�"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "%1$s �統計: 1 日�概�"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "概�データ�フィード"
 
@@ -4144,9 +5896,9 @@ msgstr "%1$s �統計"
 #: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
-"デフォルト���ダッシュボード�表示�れ��る情報�アクセス��る�����"
-"�� Mozilla ����。������情報を一般�公開�る��も����。���"
-"れ��誰�も����アドオン�統計情報を見る�������。"
+"�期設定���ダッシュボード�表示�れ��る情報�アクセス��る������"
+"� Mozilla ����。������情報を一般�公開�る��も����。���れ"
+"��誰�も��アドオン�統計情報を見る�������。"
 
 #: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
@@ -4168,23 +5920,23 @@ msgstr "公開"
 msgid "statistics_settings_access_public_description"
 msgstr "誰�も��アドオン�統計を表示����"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "設定を変更"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "��情報�機密扱��������。"
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "��ダッシュボード��在 <b>�公開��</b>。"
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "��ダッシュボード��在 <b>公開�れ����</b>。"
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "ロック�れ����"
 
@@ -4201,7 +5953,7 @@ msgstr "設定を�存"
 msgid "statistics_settings_title"
 msgstr "%1$s �統計ダッシュボード設定"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "ロック解除�れ����"
 
@@ -4225,7 +5977,7 @@ msgstr "�明"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "1 日�平�ダウンロード数"
 
@@ -4233,37 +5985,37 @@ msgstr "1 日�平�ダウンロード数"
 msgid "statistics_summary_downloads_heading"
 msgstr "ダウンロード"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "��データ��り��ん"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "1 日�平�アクティブユーザ"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: 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:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s (%2$s �在)"
@@ -4272,17 +6024,17 @@ msgstr "%1$s (%2$s �在)"
 msgid "statistics_summary_updatepings_heading"
 msgstr "1 日�平�アクティブユーザ"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "1 日�平�アクティブユーザ"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: 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:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s �統計"
@@ -4307,7 +6059,7 @@ msgstr "パスワード�変更"
 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:49
 msgid "user_del_account_deleted"
 msgstr ""
@@ -4327,7 +6079,7 @@ msgstr "パスワードを�度入力"
 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:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4336,7 +6088,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:69
 msgid "user_del_error_addons_more_questions"
 msgstr "他�質���る場���%1$s ������������。"
@@ -4349,7 +6101,7 @@ msgstr "アカウントを削除�る���「了解�������ェ
 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:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4361,7 +6113,7 @@ msgstr ""
 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:93
 msgid "user_del_header_delete_account"
 msgstr "ユーザアカウント %1$s を削除"
@@ -4386,7 +6138,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:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4402,7 +6154,7 @@ msgstr "��ステップ��り消�����を了解����。"
 msgid "user_deleted_nickname"
 msgstr "ユーザを削除"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4414,9 +6166,9 @@ msgstr ""
 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4436,7 +6188,7 @@ msgstr ""
 "%2$s Add-ons ��登録�����り��������。\n"
 "-- %2$s Add-ons スタッフ一�"
 
-# %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4461,8 +6213,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "%s Add-ons ��登録�����り��������"
 
-# 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
 #, php-format
 msgid "user_email_pwreset"
@@ -4489,7 +6241,7 @@ msgstr "%s Add-ons �パスワード変更"
 msgid "user_emailchange_error"
 msgstr "エラー�"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4499,7 +6251,7 @@ msgstr "%1$s Add-ons 登録メールアドレス変更�確�"
 msgid "user_emailchange_success"
 msgstr "�功�"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4667,7 +6419,7 @@ msgstr "パスワード変更����リンクをメール��信"
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
 
-# %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"
@@ -4676,7 +6428,7 @@ msgstr ""
 "��信����。%2$s Add-ons �ログイン�る�����メール�書�れ�リンクを"
 "クリック������。"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4693,7 +6445,7 @@ msgstr "確�メールを��信"
 msgid "user_register_congratulations"
 msgstr "�り��������。ユーザアカウント�登録�完了����。"
 
-# %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"
@@ -4702,7 +6454,7 @@ 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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4735,7 +6487,7 @@ msgstr "ユーザアカウント�編集"
 #: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
-msgstr "%1$s �アドオン"
+msgstr "%1$s �作���アドオン"
 
 #: views/users/info.thtml:50
 msgid "users_info_author_name"
@@ -4762,17 +6514,17 @@ msgstr "ニック�ーム"
 msgid "users_info_pagetitle"
 msgstr "%1$s �プロフィール"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
-msgstr "レビュー担当者: %s"
+msgstr "%s �レビュー��アドオン"
 
 #: 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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4781,8 +6533,8 @@ 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
+#. %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"
@@ -4799,885 +6551,27 @@ msgstr "パスワード�変更"
 msgid "users_register_pagetitle"
 msgstr "ユーザ登録"
 
-# %1 is the app name, %2 is the platform in parentheses
-#~ msgid "a_addto_app"
-#~ msgstr "%s %s �追加"
-
-#~ msgid "a_install"
-#~ msgstr "インストール %s"
-
-#~ msgid "a_show_eula"
-#~ msgstr "使用許諾契約を表示"
-
-#~ msgid "addon_invalid_url"
-#~ msgstr "�正� URL 形�"
-
-#~ msgid "addon_recommended"
-#~ msgstr "��アドオン� Mozilla �������"
-
-# %1 is the user, %2 is the (localized) date, %3 is the rating
-#~ msgid "addon_reviewed_by_u_on_d_rated_x"
-#~ msgstr "投稿者: %1$s - 投稿日時: %2$s - 評価: %3$s"
-
-#~ msgid "addons_breadcrumb_EULA"
-#~ msgstr "EULA"
-
-#~ msgid "addons_breadcrumb_privacy_policy"
-#~ msgstr "プライ�シー�リシー"
-
-#~ msgid "addons_browse_all_addons"
-#~ msgstr "���� %1$s"
-
-#~ msgid "addons_browse_all_addons_title"
-#~ msgstr "���� %1$s をブラウズ"
-
-#~ msgid "addons_browse_categories_header"
-#~ msgstr "%s をカテゴリ別�ブラウズ"
-
-#~ msgid "addons_browse_categories_more"
-#~ msgstr "続�を見る"
-
-#~ msgid "addons_browse_categories_new"
-#~ msgstr "新�追加・更新"
-
-#~ msgid "addons_browse_categories_popular"
-#~ msgstr "人気� %s"
-
-#~ msgid "addons_browse_other_categories"
-#~ msgstr "他�カテゴリ"
-
-#~ msgid "addons_browse_rss_subscribe"
-#~ msgstr "��カテゴリ�フィードを購読"
-
-#~ msgid "addons_browsetypes_pagetitle"
-#~ msgstr "アドオンをブラウズ"
-
-#~ msgid "addons_browsetypes_title"
-#~ msgstr "アドオンをブラウズ"
-
-#~ msgid "addons_dictionaries_extname"
-#~ msgstr "スペル�ェック辞書: %1"
-
-#~ msgid "addons_dictionaries_install_link"
-#~ msgstr "インストール"
-
-#~ msgid "addons_dictionaries_install_text"
-#~ msgstr "辞書をインストール"
-
-#~ msgid "addons_dictionaries_pagetitle"
-#~ msgstr "スペル�ェック辞書"
-
-#~ msgid "addons_dictionaries_size_kb"
-#~ msgstr "(%1 KB)"
-
-# %1 is app name
-#~ msgid "addons_dicts_intro"
-#~ msgstr "�れら�辞書� %1$s �スペル�ェック機能�対応�����。"
-
-#~ msgid "addons_dicts_title_alldicts"
-#~ msgstr "����スペル�ェック辞書"
-
-#~ msgid "addons_display_a_discuss"
-#~ msgstr "%s ����ディスカッション�る"
-
-#~ msgid "addons_display_a_report"
-#~ msgstr "��アドオン��題を報告"
-
-#~ msgid "addons_display_choose_rating"
-#~ msgstr "�択"
-
-#~ msgid "addons_display_collapse"
-#~ msgstr "��む"
-
-#~ msgid "addons_display_developer_home_page"
-#~ msgstr "開発者�ホームページ"
-
-#~ msgid "addons_display_expand"
-#~ msgstr "広�る"
-
-#~ msgid "addons_display_header_discussions"
-#~ msgstr "ディスカッション"
-
-#~ msgid "addons_display_header_find_similar"
-#~ msgstr "��カテゴリ�アドオンを検索"
-
-#~ msgid "addons_display_header_other_connect"
-#~ msgstr "��他�オプション"
-
-#~ msgid "addons_display_last_comment_by_x"
-#~ msgstr "%s �よる最新�コメント"
-
-#~ msgid "addons_display_sandbox_pref_warning"
-#~ msgstr ""
-#~ "�探��アドオン��在サンドボックス�置�れ����。ユーザ設定�より表示"
-#~ "�れ����ん。"
-
-#~ msgid "addons_display_see_all_discussions"
-#~ msgstr "����ディスカッションを表示"
-
-#~ msgid "addons_display_show_all_previews"
-#~ msgstr "����プレビュー画�を表示"
-
-#~ msgid "addons_display_x_comments_total"
-#~ msgid_plural "addons_display_x_comments_total"
-#~ msgstr[0] "1 件�コメント"
-#~ msgstr[1] "%s 件�コメント"
-
-#~ msgid "addons_home_developer_tools"
-#~ msgstr "開発者用ツール:"
-
-#~ msgid "addons_home_favorite_addons_link"
-#~ msgstr "�����アドオン"
-
-#~ msgid "addons_home_get_you_started"
-#~ msgstr ""
-#~ "下��紹介���るも�を����スタッフ�よる %s 一覧を�用�������"
-#~ "������方�試��使����������ょ��。"
-
-# %1 is app name
-# %2 to %6 are urls for extensions, themes, dicts, search plugins
-# and plugins, respectively
-# %7 is the general browse link.
-#~ msgid "addons_home_intro"
-#~ msgstr ""
-#~ "アドオン��%1$s �新��機能を追加��り��ょ����変更を加�る���"
-#~ "���プログラム��。<a href=\"%5$s\">検索エンジン</a> や�国語� <a "
-#~ "href=\"%4$s\">スペル�ェック辞書</a>�%1$s �デザインを変�られる <a href="
-#~ "\"%3$s\">テーマ</a>����様々� <a href=\"%2$s\">拡張機能</a> を�利用�"
-#~ "�����。�アドオン�説明� <a href=\"%7$s\">��ら�ページ</a> を�覧"
-#~ "����。"
-
-#~ msgid "addons_home_sandbox_intro"
-#~ msgstr ""
-#~ "サンドボックス���サイト上��一般公開�申請�れ��る�テストを����"
-#~ "��アドオン�置�れ����。"
-
-#~ msgid "addons_home_sandbox_warning"
-#~ msgstr ""
-#~ "�れら�アドオン�����コンピュータ�悪影響を�����れ��り��。進"
-#~ "ん�テスト�る�もり���れ��%s。"
-
-#~ msgid "addons_home_sandbox_warning_link"
-#~ msgstr "��らをクリック��公開ページ�戻������"
-
-#~ msgid "addons_home_search"
-#~ msgstr "他�アドオンを探�"
-
-#~ msgid "addons_home_whatareaddons"
-#~ msgstr "アドオン��"
-
-#~ msgid "addons_home_whatissandbox"
-#~ msgstr "サンドボックス��"
-
-#~ msgid "addons_plugins_details"
-#~ msgstr "詳細"
-
-#~ msgid "addons_plugins_download"
-#~ msgstr "ダウンロード"
-
-#~ msgid "addons_plugins_latest_version"
-#~ msgstr "最新��ージョン"
-
-#~ msgid "addons_plugins_unavailable"
-#~ msgstr "利用����ん"
-
-# %1 is app name
-#~ msgid "addons_searchengines_introduction"
-#~ msgstr ""
-#~ "%1$s �ウィンドウ�上��る検索�ー����ら���人気�検索エンジン��"
-#~ "���登録�れ��������他�も様々�検索エンジンを追加�る�����"
-#~ "��。追加���検索エンジンを�������。"
-
-#~ msgid "addons_searchengines_title"
-#~ msgstr "検索エンジン"
-
-#~ msgid "admin_pagetitle"
-#~ msgstr "管�者用コントロールパ�ル"
-
-#~ msgid "blog_breadcrumb"
-#~ msgstr "ブログ"
-
-#~ msgid "blog_description"
-#~ msgstr ""
-#~ "アドオン� addons.mozilla.org �サイト�関�る最新情報を������。"
-
-#~ msgid "blog_link_title"
-#~ msgstr "リンク"
-
-#~ msgid "blog_no_posts_found"
-#~ msgstr "記事��り��ん。"
-
-#~ msgid "blog_posted_by"
-#~ msgstr "投稿者: %s - 投稿日時: %s"
-
-#~ msgid "blog_previous_entries"
-#~ msgstr "�去�記事"
-
-#~ msgid "blog_sidebar_other_blogs"
-#~ msgstr "Mozilla �他�ブログ"
-
-#~ msgid "blog_subpage_title"
-#~ msgstr "ブログ"
-
-#~ msgid "blog_subscribe_heading"
-#~ msgstr "購読"
-
-#~ msgid "blog_title"
-#~ msgstr "Mozilla Add-ons ブログ"
-
-#~ msgid "breadcrumb_addon_previews"
-#~ msgstr "プレビュー画�"
-
-#~ msgid "breadcrumb_addon_versions"
-#~ msgstr "�ージョン履歴"
-
-#~ msgid "devcp_actionbar_link_disable"
-#~ msgstr "アドオンを無効��る"
-
-#~ msgid "devcp_actionbar_link_enable"
-#~ msgstr "アドオンを有効��る"
-
-#~ msgid "devcp_actionbar_link_nominate"
-#~ msgstr "アドオン�一般公開を申請"
-
-#~ msgid "devcp_actionbar_link_viewpublic"
-#~ msgstr "公開ページを表示"
-
-#~ msgid "devcp_addon_tshirtrequest_pagetitle"
-#~ msgstr "T シャツ�リクエスト"
-
-#~ msgid "devcp_details_nominate_link"
-#~ msgstr "サイト上��一般公開を申請"
-
-#~ msgid "devcp_edit_submit_addon_disable"
-#~ msgstr "アドオンを�公開��る"
-
-#~ msgid "devcp_edit_submit_addon_disable_confirm"
-#~ msgstr ""
-#~ "��アドオンを�公開���もよ������？ 公開ページ�情報�削除�れ�"
-#~ "����度公開�る��も����。"
-
-#~ msgid "devcp_edit_submit_addon_enable"
-#~ msgstr "アドオンを公開�る"
-
-#~ msgid "devcp_edit_submit_addon_enable_confirm"
-#~ msgstr "��アドオンを�度公開��もよ������？"
+#~ msgid "addons_share_button_text"
+#~ msgstr "��アドオンを共有"
 
-#~ msgid "devcp_editorsqueue_header_reviewqueue"
-#~ msgstr "レビュー待�"
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Delicious �追加"
 
-#~ msgid "devcp_myaddons_tshirtrequest_link"
-#~ msgstr "T シャツ�リクエスト"
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg �投稿"
 
-#~ msgid "devcp_statsbar_rating"
-#~ msgstr "評価: <em>%1$.2f</em> / %2$d"
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Facebook �投稿"
 
-#~ msgid "devcp_summarybox_downloadcount_total"
-#~ msgstr "累計"
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "FriendFeed �共有"
 
-#~ msgid "devcp_summarybox_downloadcount_week"
-#~ msgstr "週"
-
-#~ msgid "devcp_summarybox_edit_addon_link"
-#~ msgstr "アドオンを編集"
-
-#~ msgid "devcp_summarybox_imgalt_downloadcount"
-#~ msgstr "ダウンロード回数"
-
-#~ msgid "devcp_summarybox_imgalt_edit_addon"
-#~ msgstr "アドオンを編集"
-
-#~ msgid "devcp_summarybox_imgalt_newversion"
-#~ msgstr "新���ージョン"
-
-#~ msgid "devcp_summarybox_imgalt_rating"
-#~ msgstr "評価"
-
-#~ msgid "devcp_summarybox_label_downloads"
-#~ msgstr "ダウンロード:"
-
-#~ msgid "devcp_summarybox_label_rating"
-#~ msgstr "評価:"
-
-#~ msgid "devcp_summarybox_newversion_link"
-#~ msgstr "新���ージョン"
-
-#~ msgid "devcp_tshirtrequest_additionalinfo"
-#~ msgstr ""
-#~ "�ら������アドオン� Firefox 3 リリース当日� Firefox 3 ユーザ�最も"
-#~ "利用�れ�アドオン�上� 50 ��入��場��Mozilla ����������"
-#~ "パーティを開�るよ���ス�ンサー��る��を申�出���考�����。�"
-#~ "�り�����アドオン��功を����パーティー�開催費をカンパ���� "
-#~ "上�アドオン作者�皆�ん���Firefox 3 �リリース後����連絡を差�上�"
-#~ "��。アドオン�対応�ージョンを最新�����������"
-
-#~ msgid "devcp_tshirtrequest_andbecause"
-#~ msgstr " / "
-
-#~ msgid "devcp_tshirtrequest_button_submit"
-#~ msgstr "T シャツ�リクエスト"
-
-#~ msgid "devcp_tshirtrequest_eligibility"
-#~ msgstr ""
-#~ "����������� ���� T シャツを無料����る資格��り��。�"
-#~ "���次�資格�件を満������: "
-
-#~ msgid "devcp_tshirtrequest_form_label_address1"
-#~ msgstr "�所 (訳注: 町域�番地)"
-
-#~ msgid "devcp_tshirtrequest_form_label_address2"
-#~ msgstr "�所 (訳注: ビル��部屋番���):"
-
-#~ msgid "devcp_tshirtrequest_form_label_city"
-#~ msgstr "市 (訳注: 日本��市区町�):"
-
-#~ msgid "devcp_tshirtrequest_form_label_comment"
-#~ msgstr "コメント:"
-
-#~ msgid "devcp_tshirtrequest_form_label_country"
-#~ msgstr "�����国:"
-
-#~ msgid "devcp_tshirtrequest_form_label_email"
-#~ msgstr "メールアドレス:"
-
-#~ msgid "devcp_tshirtrequest_form_label_fullname"
-#~ msgstr "フル�ーム:"
-
-#~ msgid "devcp_tshirtrequest_form_label_regionprovince"
-#~ msgstr "地方 (訳注: 日本��都�府県):"
-
-#~ msgid "devcp_tshirtrequest_form_label_state"
-#~ msgstr "州 (訳注: 日本��空欄):"
-
-#~ msgid "devcp_tshirtrequest_form_label_telephone"
-#~ msgstr "電話番�:"
-
-#~ msgid "devcp_tshirtrequest_form_label_tshirtsize"
-#~ msgstr "T シャツ�サイズ (訳注: アメリカンサイズ���少�大����):"
-
-#~ msgid "devcp_tshirtrequest_form_label_zippostalcode"
-#~ msgstr "郵便番�"
-
-#~ msgid "devcp_tshirtrequest_form_select_menextraextralarge"
-#~ msgstr "男性用 XXL"
-
-#~ msgid "devcp_tshirtrequest_form_select_menextralarge"
-#~ msgstr "男性用 XL"
-
-#~ msgid "devcp_tshirtrequest_form_select_menlarge"
-#~ msgstr "男性用 L"
-
-#~ msgid "devcp_tshirtrequest_form_select_menmedium"
-#~ msgstr "男性用 M"
-
-#~ msgid "devcp_tshirtrequest_form_select_mensmall"
-#~ msgstr "男性用 S"
-
-#~ msgid "devcp_tshirtrequest_form_select_size"
-#~ msgstr "サイズ"
-
-#~ msgid "devcp_tshirtrequest_form_select_womenextralarge"
-#~ msgstr "女性用 XL"
-
-#~ msgid "devcp_tshirtrequest_form_select_womenlarge"
-#~ msgstr "女性用 L"
-
-#~ msgid "devcp_tshirtrequest_form_select_womenmedium"
-#~ msgstr "女性用 M"
-
-#~ msgid "devcp_tshirtrequest_form_select_womensmall"
-#~ msgstr "女性用 S"
-
-#~ msgid "devcp_tshirtrequest_header"
-#~ msgstr "Firefox Add-ons T シャツを手�入れよ�"
-
-#~ msgid "devcp_tshirtrequest_is30b3compatible"
-#~ msgstr "� Firefox 3.0b3 対応�アドオン��"
-
-#~ msgid "devcp_tshirtrequest_iseditor"
-#~ msgstr "���� AMO �エディタ��"
-
-#~ msgid "devcp_tshirtrequest_link_returncontrolpanel"
-#~ msgstr "開発者用コントロールパ�ル�戻る"
-
-#~ msgid "devcp_tshirtrequest_not_eligible_yet"
-#~ msgstr ""
-#~ "����アドオン�開発者���エディタ���？ も����ら�T シャツを無"
-#~ "料����る権利��り��。エディタ�皆�ん��もれ��差�上���。開発"
-#~ "者�皆�ん���自分�アドオンをFirefox 3.0b3 以上�対応����3 月 18 日"
-#~ "��� addons.mozilla.org �登録�る����。�れら��件を満������"
-#~ "ページ上���付先�情報を入力�るフォーム��れ��。"
-
-#~ msgid "devcp_tshirtrequest_privacy_statement"
-#~ msgstr "上�入力�れ�個人情報� %s �従���り扱�れ��。"
-
-#~ msgid "devcp_tshirtrequest_privacy_statement_link"
-#~ msgstr "Mozilla �プライ�シー�リシー"
-
-#~ msgid "devcp_tshirtrequest_recorded"
-#~ msgstr ""
-#~ "T シャツ�リクエスト���付�られ���。情報を変更�る����度フォーム"
-#~ "�入力������。"
-
-#~ msgid "devcp_tshirtrequest_togetyourshirt"
-#~ msgstr ""
-#~ "T シャツを���る���3 月 18 日���以下�情報を�信������必��"
-#~ "�り��。(訳注: 情報����英語�入力������)"
-
-#~ msgid "editorcp_menu_hidemenu"
-#~ msgstr "メニューを隠�"
-
-#~ msgid "editorcp_menu_showmenu"
-#~ msgstr "メニューを表示"
-
-#~ msgid "editors_reviews_action_approve"
-#~ msgstr "承�"
-
-#~ msgid "editors_reviews_action_delete"
-#~ msgstr "削除"
-
-#~ msgid "error_invalid_email"
-#~ msgstr "��メールアドレス��正�形���。"
-
-#~ msgid "error_review_rating_mustbe_int"
-#~ msgstr "評価��角数字�入力������。"
-
-#~ msgid "error_saving_tshirtrequest"
-#~ msgstr "T シャツリクエスト�フォーム内容を�存中�エラー�発生����。"
-
-#~ msgid "error_tshirtrequest_form_input_email"
-#~ msgstr "正��メールアドレスを入力������。"
-
-#~ msgid "error_tshirtrequest_form_input_fullname"
-#~ msgstr "本�� T シャツ�発����利用�れ�公開�れ��ん。"
-
-#~ msgid "error_tshirtrequest_form_input_telephone"
-#~ msgstr "宅�サービス�必���り�� (国��地域コードを入力������)"
-
-#~ msgid "error_tshirtrequest_form_select_country"
-#~ msgstr "�付先�所"
-
-#~ msgid "error_tshirtrequest_form_select_tshirt_size"
-#~ msgstr "欲�� T シャツ�サイズを�択������。"
-
-#~ msgid "forum_about_settings"
-#~ msgstr "設定����"
-
-#~ msgid "forum_about_settings_notes"
-#~ msgstr "設定�関�る注�"
-
-#~ msgid "forum_add_your_comments"
-#~ msgstr "コメントを書�"
-
-#~ msgid "forum_administrative_options"
-#~ msgstr "管�者オプション"
-
-#~ msgid "forum_administrative_settings"
-#~ msgstr "管�者設定"
-
-#~ msgid "forum_all"
-#~ msgstr "����ェック"
-
-#~ msgid "forum_back_to_discussions"
-#~ msgstr "ディスカッション�戻る"
-
-#~ msgid "forum_cancel"
-#~ msgstr "キャンセル"
-
-#~ msgid "forum_categories"
-#~ msgstr "フォーラム�カテゴリ"
-
-#~ msgid "forum_category_description"
-#~ msgstr "説明"
-
-#~ msgid "forum_category_description_notes"
-#~ msgstr "説明�関�る注�"
-
-#~ msgid "forum_category_management"
-#~ msgstr "カテゴリ�管�"
-
-#~ msgid "forum_category_name"
-#~ msgstr "タイトル"
-
-#~ msgid "forum_category_name_notes"
-#~ msgstr "タイトル�関�る注�"
-
-#~ msgid "forum_category_removed"
-#~ msgstr "カテゴリ�削除�れ���。"
-
-#~ msgid "forum_category_reorder_notes"
-#~ msgstr "カテゴリ�並�替�"
-
-#~ msgid "forum_category_saved"
-#~ msgstr "カテゴリ��存�れ���。"
-
-#~ msgid "forum_check"
-#~ msgstr "�ェック"
-
-# %1 is the username, %2 is date and time
-#~ msgid "forum_comment_by_name_on_date"
-#~ msgstr "投稿者: %1$s - 投稿日時: %2$s"
-
-#~ msgid "forum_confirm_hide_comment"
-#~ msgstr "��コメントを隠��もよ������？"
-
-#~ msgid "forum_confirm_show_comment"
-#~ msgstr "��コメントを表示��もよ������？"
-
-#~ msgid "forum_create_a_new_role"
-#~ msgstr "新��担当�作�"
-
-#~ msgid "forum_create_new_category"
-#~ msgstr "新��カテゴリを作�"
-
-#~ msgid "forum_current_category"
-#~ msgstr "�在�カテゴリ"
-
-#~ msgid "forum_define_new_category"
-#~ msgstr "新��カテゴリを作�"
-
-#~ msgid "forum_define_new_role"
-#~ msgstr "新��担当を追加"
-
-#~ msgid "forum_edit"
-#~ msgstr "編集"
-
-#~ msgid "forum_edit_comment"
-#~ msgstr "コメントを編集"
-
-#~ msgid "forum_edit_your_comments"
-#~ msgstr "自分�コメントを編集"
-
-#~ msgid "forum_edit_your_discussion_topic"
-#~ msgstr "トピックを編集"
-
-#~ msgid "forum_enter_your_comments"
-#~ msgstr "コメントを入力"
-
-#~ msgid "forum_enter_your_discussion_topic"
-#~ msgstr "ディスカッション�トピック"
-
-#~ msgid "forum_error_title"
-#~ msgstr "エラー"
-
-#~ msgid "forum_get_category_to_edit"
-#~ msgstr "編集�るカテゴリを�択"
-
-#~ msgid "forum_hide_comment"
-#~ msgstr "コメントを隠�"
-
-#~ msgid "forum_improper_format"
-#~ msgstr "��切�形���"
-
-# %1 is the username, %2 is date and time
-#~ msgid "forum_last_comment_by_name_on_date"
-#~ msgstr "最新�コメント: %1$s - 投稿日時: %2$s"
-
-#~ msgid "forum_make_new_thread"
-#~ msgstr "新��ディスカッションを始�る"
-
-#~ msgid "forum_modify_category_definition"
-#~ msgstr "カテゴリ定義�編集"
-
-#~ msgid "forum_modify_role_definition"
-#~ msgstr "担当を編集"
-
-#~ msgid "forum_new_category_saved"
-#~ msgstr "新��カテゴリ�作��れ���。"
-
-#~ msgid "forum_new_role_saved"
-#~ msgstr "新��担当�作��れ���。"
-
-#~ msgid "forum_no_discussions_found"
-#~ msgstr "該当�るディスカッション��り��ん。"
-
-#~ msgid "forum_none"
-#~ msgstr "�����ェックを外�"
-
-#~ msgid "forum_not_signed_in"
-#~ msgstr "ログイン�����ん"
-
-#~ msgid "forum_one_day_ago"
-#~ msgstr "1 日�"
-
-#~ msgid "forum_one_hour_ago"
-#~ msgstr "1 時間�"
-
-#~ msgid "forum_one_minute_ago"
-#~ msgstr "1 分�"
-
-#~ msgid "forum_one_second_ago"
-#~ msgstr "1 秒�"
-
-#~ msgid "forum_options"
-#~ msgstr "オプション"
-
-# Page list's current position (no total) (ie. "1 to 15").
-# %1 is first record no., %2 is last record no.
-#~ msgid "forum_page_details"
-#~ msgstr "%1$s 件�ら %2$s 件��"
-
-# Page list's current position (ie. "1 to 15 of 56").
-# %1 is first record no., %2 is last record no., %3 is total no. of records
-#~ msgid "forum_page_details_full"
-#~ msgstr "%3$s 件中� %1$s 件�ら %2$s ��を表示"
-
-#~ msgid "forum_permission_error"
-#~ msgstr "権���り��ん"
-
-#~ msgid "forum_remove"
-#~ msgstr "フォーラムを削除"
-
-#~ msgid "forum_replacement_category"
-#~ msgstr "代�り�カテゴリ"
-
-#~ msgid "forum_replacement_category_notes"
-#~ msgstr "代�り�カテゴリ�関�る注�"
-
-#~ msgid "forum_replacement_role"
-#~ msgstr "代�り�担当"
-
-#~ msgid "forum_replacement_role_notes"
-#~ msgstr "代�り�担当�関�る注�"
-
-#~ msgid "forum_replies"
-#~ msgid_plural "forum_replies"
-#~ msgstr[0] "返信 (1)"
-#~ msgstr[1] "返信 (%1$s)"
-
-#~ msgid "forum_required"
-#~ msgstr "必須項目"
-
-# %1 is input name
-#~ msgid "forum_required_input"
-#~ msgstr "%1$s �入力�必須��"
-
-#~ msgid "forum_role_abilities"
-#~ msgstr "権�"
-
-#~ msgid "forum_role_abilities_notes"
-#~ msgstr "権��関�る注�"
-
-#~ msgid "forum_role_category_notes"
-#~ msgstr "カテゴリ�関�る注�"
-
-#~ msgid "forum_role_icon"
-#~ msgstr "アイコン"
-
-#~ msgid "forum_role_icon_notes"
-#~ msgstr "アイコン�関�る注�"
-
-#~ msgid "forum_role_management"
-#~ msgstr "担当�管�"
-
-#~ msgid "forum_role_name"
-#~ msgstr "��"
-
-#~ msgid "forum_role_name_notes"
-#~ msgstr "���関�る注�"
-
-#~ msgid "forum_role_removed"
-#~ msgstr "担当�削除�れ���。"
-
-#~ msgid "forum_role_reorder_notes"
-#~ msgstr "担当�並�替��関�る注�"
-
-#~ msgid "forum_role_saved"
-#~ msgstr "担当��存�れ���。"
-
-#~ msgid "forum_role_tagline"
-#~ msgstr "タグライン"
-
-#~ msgid "forum_role_tagline_notes"
-#~ msgstr "タグライン�関�る注�"
-
-#~ msgid "forum_roles"
-#~ msgstr "担当"
-
-#~ msgid "forum_roles_in_category"
-#~ msgstr "カテゴリ���る担当"
-
-#~ msgid "forum_save_your_changes"
-#~ msgstr "変更を�存"
-
-#~ msgid "forum_search"
-#~ msgstr "ディスカッションを検索"
-
-#~ msgid "forum_select_category_to_remove"
-#~ msgstr "削除�るカテゴリを�択"
-
-#~ msgid "forum_select_replacement_category"
-#~ msgstr "代�り�カテゴリを�択"
-
-#~ msgid "forum_select_replacement_role"
-#~ msgstr "代�り�担当を�択"
-
-#~ msgid "forum_select_role_to_edit"
-#~ msgstr "編集�る担当を�択"
-
-#~ msgid "forum_select_role_to_remove"
-#~ msgstr "削除�る担当を�択"
-
-#~ msgid "forum_show_comment"
-#~ msgstr "コメントを表示"
-
-#~ msgid "forum_start_a_new_discussion"
-#~ msgstr "新��ディスカッションを開始"
-
-#~ msgid "forum_start_your_discussion"
-#~ msgstr "ディスカッションを開始"
-
-# %1 is username
-#~ msgid "forum_started_by"
-#~ msgstr "作�者: %1$s"
-
-# %1 is input name, %2 is character length
-#~ msgid "forum_too_many_characters"
-#~ msgstr "%1$s � %2$s 文字超������"
-
-#~ msgid "forum_top_of_page"
-#~ msgstr "ページ�トップ"
-
-#~ msgid "forum_wait"
-#~ msgstr "�留"
-
-# %1 is day count
-#~ msgid "forum_x_days_ago"
-#~ msgstr "%1$s 日�"
-
-# %1 is hour count
-#~ msgid "forum_x_hours_ago"
-#~ msgstr "%1$s 時間�"
-
-# %1 is minute count
-#~ msgid "forum_x_minutes_ago"
-#~ msgstr "%1$s 分�"
-
-# %1 is second count
-#~ msgid "forum_x_seconds_ago"
-#~ msgstr "%1$s 秒�"
-
-#~ msgid "header_biglink_about"
-#~ msgstr "組織概�"
-
-#~ msgid "header_biglink_addons"
-#~ msgstr "アドオン"
-
-#~ msgid "header_biglink_developers"
-#~ msgstr "開発者情報"
-
-#~ msgid "header_biglink_products"
-#~ msgstr "製�情報"
-
-#~ msgid "header_biglink_support"
-#~ msgstr "サ�ート"
-
-#~ msgid "header_navlink_browse"
-#~ msgstr "ブラウズ"
-
-#~ msgid "header_navlink_home"
-#~ msgstr "ホーム"
-
-#~ msgid "helpers_countrylist_unselected"
-#~ msgstr "国�を�択������"
-
-# %1 is the add-on name
-#~ msgid "langtools_dicts_install_text"
-#~ msgstr "辞書: %1$s"
-
-#~ msgid "langtools_link_jumpto_dicts"
-#~ msgstr "辞書�言語パック"
-
-#~ msgid "list_sortby_name_explanation"
-#~ msgstr "アドオン�タイトル�並�替� (アルファベット順)"
-
-#~ msgid "list_sortby_newest"
-#~ msgstr "新�追加"
-
-#~ msgid "list_sortby_newest_explanation"
-#~ msgstr "最近追加�れ�アドオン (新�順)"
-
-#~ msgid "list_sortby_popular"
-#~ msgstr "人気度"
-
-#~ msgid "list_sortby_popular_explanation"
-#~ msgstr "週間ダウンロード数 (多�順)"
-
-#~ msgid "list_sortby_rated"
-#~ msgstr "評価"
-
-#~ msgid "list_sortby_rated_explanation"
-#~ msgstr "ユーザ�評価 (高�順)"
-
-#~ msgid "list_sortby_updated"
-#~ msgstr "最終更新"
-
-#~ msgid "list_sortby_updated_explanation"
-#~ msgstr "最後�更新�れ�日付 (新��順)"
-
-#~ msgid "pagination_results"
-#~ msgstr "件数: "
-
-#~ msgid "pagination_results_inbetween"
-#~ msgstr "-"
-
-#~ msgid "pagination_results_of"
-#~ msgstr " ページ / �計 "
-
-#~ msgid "pagination_results_perpage"
-#~ msgstr "表示件数: "
-
-#~ msgid "rss_bookmark_search"
-#~ msgstr "��検索�果を購読"
-
-#~ msgid "rss_newestaddons_description"
-#~ msgstr "最新� %s アドオン"
-
-#~ msgid "search_aggregate_head"
-#~ msgstr "フィード"
-
-#~ msgid "search_form_submit"
-#~ msgstr "検索"
-
-#~ msgid "search_searched_for"
-#~ msgstr "検索: "
-
-#~ msgid "search_title"
-#~ msgstr "アドオン�検索"
-
-#~ msgid "sidebar_build_tutorial"
-#~ msgstr "Firefox 用拡張機能�作り方を順を追���説明���。"
-
-#~ msgid "sidebar_navlink_browse"
-#~ msgstr "ブラウズ"
-
-#~ msgid "sidebar_navlink_build_your_own"
-#~ msgstr "開発者情報 (MDC)"
-
-# "build your own add-on" instructions, relative to http://developer.mozilla.org
-#~ msgid "sidebar_navlink_build_your_own_href"
-#~ msgstr "/ja/Extensions"
-
-#~ msgid "sidebar_navlink_dictionaries"
-#~ msgstr "スペル�ェック辞書"
-
-#~ msgid "sidebar_navlink_extensions"
-#~ msgstr "拡張機能"
-
-#~ msgid "sidebar_navlink_home"
-#~ msgstr "ホーム"
-
-#~ msgid "sidebar_navlink_plugins"
-#~ msgstr "プラグイン"
-
-#~ msgid "sidebar_navlink_recommended"
-#~ msgstr "�����アドオン"
-
-#~ msgid "sidebar_navlink_search_engines"
-#~ msgstr "検索エンジン"
-
-#~ msgid "sidebar_navlink_themes"
-#~ msgstr "テーマ"
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "MySpace �投稿"
 
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "ツール"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
diff --git a/site/app/locale/ja/pages/experimental_addons.thtml b/site/app/locale/ja/pages/experimental_addons.thtml
deleted file mode 100644
index 35c5996..0000000
--- a/site/app/locale/ja/pages/experimental_addons.thtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<h1>実験的�アドオン</h1>
-
-<h2>実験的�アドオン��何���？</h2>
-<p>実験的�アドオン��上級者���アドオン��レビューを���一般�公開�れる��テスト�れる�を待�����。��多��試作��言�る��ょ�。実験的�アドオン���質�パフォーマンス�機能�������アルファ版�ベータ版�も���一般公開��状態��。</p>
-<p>実験的�アドオン�エディタ�よるテストを����ら��コンピュータ�設定�影響を����能性��る���インストール�る際��注��必���。</p>
-
-<h2>サイト上�実験的�アドオンを見分�る方法��り���？</h2>
-<p>実験的�アドオン��「実験的����ラベル�付���り�インストール��ログイン�必���。</p>
-
-<h2>実験的�アドオンをインストール�る��ログイン���れ��ら���������？</h2>
-<p>Mozilla Add-ons �サイト����険を伴�行為��る�����を利用者��解��もら����実験的�アドオンをインストール�る際��ログインを求�����。</p>
-
-<h2>一般公開�れ��るアドオンをインストール�る���ログインやアカウント�必����？</h2>
-<p>���。公開�アドオンをインストール�る場���ユーザアカウントを�得��り�ログインを行�必���り��ん。</p>
diff --git a/site/app/locale/ja/pages/faq.thtml b/site/app/locale/ja/pages/faq.thtml
index 2216f13..8fe6cb1 100644
--- a/site/app/locale/ja/pages/faq.thtml
+++ b/site/app/locale/ja/pages/faq.thtml
@@ -6,7 +6,6 @@
   <li><a href="http://support.mozilla.com/ja/kb/Unable+to+install+add-ons">アドオン�インストール</a>�<a href="http://support.mozilla.com/ja/kb/Troubleshooting+plugins">プラグイン</a>�<a href="http://support.mozilla.com/ja/kb/Troubleshooting+extensions+and+themes">一般的��題</a> �トラブルシューティング</li>
   <li><a href="http://support.mozilla.com/ja/kb/Uninstalling+add-ons">アドオン�削除</a> � <a href="http://support.mozilla.com/ja/kb/Cannot+uninstall+an+add-on">削除�関�るトラブルシューティング</a></li>
   <li><a href="http://support.mozilla.com/ja/kb/Gray+bar+below+the+status+bar">�題��るアドオン��対応 (ステータス�ー�下�グレー�領域��れる)</a></li>
-  <li><a href="/ja/firefox/pages/experimentalAddons">実験的�アドオン��</a></li>
 </ul>
 
 <p></p>
diff --git a/site/app/locale/ko/LC_MESSAGES/messages.po b/site/app/locale/ko/LC_MESSAGES/messages.po
index d6dcf39..1fdddb2 100644
--- a/site/app/locale/ko/LC_MESSAGES/messages.po
+++ b/site/app/locale/ko/LC_MESSAGES/messages.po
@@ -20,6 +20,10 @@ msgstr ""
 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 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
@@ -48,38 +52,35 @@ msgstr "공개"
 msgid "a_header_sandbox"
 msgstr "샌드박스"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, fuzzy, php-format
-msgid "added"
-msgstr "Added %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "최근 변경� %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "버전 %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "� 다운로드 수"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
@@ -96,21 +97,23 @@ msgstr "페�지 당"
 msgid "addon_list_sortby"
 msgstr "분류 방�"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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: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: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
@@ -120,6 +123,7 @@ 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -138,6 +142,7 @@ msgstr "�가:"
 msgid "addon_review_add_submit"
 msgstr "�가 완료"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -171,23 +176,26 @@ msgstr "예"
 msgid "addon_review_delete_header"
 msgstr "�가 삭제"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "�가 항목� 삭제하였습니다."
 
+#. %s is the name of the add-on
 #: 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:534
+#. %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
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -199,6 +207,7 @@ 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:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
@@ -207,15 +216,17 @@ 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 addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -229,13 +240,14 @@ msgstr "개발� 답변:"
 msgid "addon_review_saved_successfully"
 msgstr "�가 결과가 성공�으로 저장�었습니다. �사합니다!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, php-format
@@ -260,11 +272,16 @@ msgstr "Previous Add-on"
 msgid "addon_version_permalink"
 msgstr "�세 URL"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-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:118
+#, fuzzy
+msgid "addon_versions_getlatestversion"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "확�"
 
@@ -273,19 +290,23 @@ msgid "addons_author_tooltip"
 msgstr "개발� 프로필 보기"
 
 # %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
@@ -294,7 +315,7 @@ msgstr "Browse %1$s Themes :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "�가 추가"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "고급 사항"
 
@@ -302,11 +323,11 @@ msgstr "고급 사항"
 msgid "addons_display_categories"
 msgstr "분류"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "세부 리뷰"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "나�"
@@ -315,66 +336,73 @@ msgstr "나�"
 msgid "addons_display_edit_review"
 msgstr "�가 편집"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "� 부가 기능� 개� 정보 정책� 가지고 있습니다."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "다른 연결 방법"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "홈페�지"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "�가"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "기술 지�"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "보통"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "�세 설명"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 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:421
+#. %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
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "%1$s로 보기"
 msgstr[1] "Other add-ons by these authors"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -384,7 +412,9 @@ msgstr ""
 "개발��게 전달 �지 않기 때문� 개발�가 �접 여러분�게 연� 하거나 향후 변"
 "경 내역� 받거나 할 수 없�� 양지해 주십시오."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -394,7 +424,8 @@ msgstr ""
 "분� �메�� 개발��게 전달 �지 않기 때문� 개발�가 �접 여러분�게 연� "
 "하거나 향후 변경 내역� 받거나 할 수 없�� 양지해 주십시오."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -404,16 +435,16 @@ msgstr ""
 "�� 개발��게 전달 �지 않기 때문� 개발�가 �접 여러분�게 연� 하거나 향"
 "후 변경 내역� 받거나 할 수 없�� 양지해 주십시오."
 
-#: views/addons/display.thtml:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "�가 하기"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "리뷰를 �는 란� 버그 리�트를 올리지 마십시오. 여러분� �메� 주소를 개발�"
@@ -421,50 +452,53 @@ msgstr ""
 "와 �접 연�하시기 바�니다."
 
 # %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "부가 기능� 대한 지�� 얻으시려면 <a href=\"%1$s\">고� 지�</a> 항목� 살"
 "펴 보십시오."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "저장"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "전체 �가 보기 (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "모든 버전 보기"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "모든 버전 정보 기�"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "소스 보기"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "통계 보기"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "여러분� �견� 어떠세요?"
 
@@ -474,7 +508,7 @@ msgstr "공� 작업:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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 " / "
@@ -485,10 +519,11 @@ msgstr " / "
 msgid "addons_home_feature_head"
 msgstr "추천 부가 기능"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -503,7 +538,9 @@ msgstr "최신 버전: "
 msgid "addons_home_other_applications"
 msgstr "기타 프로그램"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -513,19 +550,20 @@ msgstr "기타 프로그램"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -621,6 +659,7 @@ msgstr "맥 OS X용"
 msgid "addons_plugins_for_windows"
 msgstr "윈�우용"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -639,12 +678,13 @@ msgstr ""
 "거나 � 멀티미디어 정보를 표시하는 � 유용 합니다.외부 기능과 연�한다는 ��"
 "서 확장 기능과 조금 다릅니다."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Mozilla Firefox용 플러그�"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "플러그�"
 
@@ -655,6 +695,7 @@ msgstr "플러그�"
 msgid "addons_plugins_support_documentation"
 msgstr "문서 정보"
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -662,23 +703,24 @@ msgstr ""
 "%s는 설치를 진행하기 위해 아래� �반 사용� 약관���를 필요로 합니다."
 
 # %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s 미리 보기"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 msgid "addons_recommended_introduction"
 msgstr ""
 "수 천여개� 부가 기능 중�는 당신�게 �합한 부가 기능� 있습니다. 가장 �기"
 "있는 부가 기능들 중� 골�서 사용해 보십시오!"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "추천 부가 기능"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "추천 부가 기능"
 
@@ -686,6 +728,7 @@ msgstr "추천 부가 기능"
 msgid "addons_searchengines_additional_resources"
 msgstr "부가 정보"
 
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla 개발� 센터"
@@ -703,31 +746,37 @@ msgstr ""
 "� 꺼�신 것 같습니다. 검색 플러그� 설치를 위해 설정�서 �바 스�립트 사용 "
 "옵션� 켜 주십시오."
 
+#. %1 is "make your own" link
+#. %2 is MDC link
 #: 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: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:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "개�화"
 
+#. %1 is the link to mycroft.mozdev.org
 #: 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:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
 # %1 is the addon name
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "검색 엔진"
 
@@ -740,7 +789,7 @@ msgstr "Firefox 검색 엔진 작업� 위해 수고해 주신 Mycroft��사
 msgid "addons_status_disabled"
 msgstr "Disabled"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 #, fuzzy
 msgid "addons_status_incomplete"
 msgstr "Incomplete Version"
@@ -784,11 +833,12 @@ msgstr ""
 "현재 버전들� 테스트 � 참조용으로 제공�니다.최신 부가 기능� 사용하고 있습"
 "니다."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "버전별 변경 사항"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s 버전 기�"
@@ -801,6 +851,7 @@ msgstr "그룹 추가"
 msgid "admin_group_delete_pagetitle"
 msgstr "그룹 삭제"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -926,6 +977,7 @@ msgstr "버전 확� 무시"
 msgid "app_compat_older_firefox_only"
 msgstr "Firefox �전 버전� 위한 부가 기능"
 
+#. %1$s and %2$s are URLs
 #: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
@@ -933,10 +985,13 @@ 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: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:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
@@ -949,23 +1004,23 @@ msgstr ""
 "부가 기능� 사용하려면 <a href=\"http://getfirefox.com\">Firefox 업그레�드</"
 "a>를 하세요."
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "부가 기능 �름순"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "최신 부가 기능순"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "�기 부가 기능순"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "부가 기능 별� 순"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "최근 업��트순"
 
@@ -998,6 +1053,7 @@ msgid "category_extra_mostpopular"
 msgstr "�기 순"
 
 # %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"
@@ -1008,12 +1064,20 @@ msgstr "모� 보기- %1$s"
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
+#. %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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 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:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
@@ -1053,6 +1117,8 @@ 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
 #: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
@@ -1081,6 +1147,10 @@ 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)
 #: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
@@ -1098,6 +1168,8 @@ msgstr ""
 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:69
 #, fuzzy
 msgid "compatibility_report_intro"
@@ -1111,6 +1183,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
@@ -1121,6 +1194,7 @@ 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
 #: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
@@ -1131,6 +1205,7 @@ 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
 #: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
@@ -1141,6 +1216,7 @@ 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
 #: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
@@ -1162,12 +1238,13 @@ msgstr "Information for Add-on Users"
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "기여� 정보를 � 보시려면 %s� 참고하세요."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "위키 페�지"
 
@@ -1209,18 +1286,27 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 ��"
 "센스</a>."
 
+#: 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>."
+
 # 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/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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
@@ -1228,7 +1314,10 @@ msgid "date"
 msgstr "%x"
 
 # date and time format string (strftime)
+#. 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 "%x %X"
@@ -1254,14 +1343,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1307,36 +1424,36 @@ msgstr "단계 5: 완료"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "제출 �움�"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "부가 기능 정지 �태"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "부가 기능 편집"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "부가 기능 �용 �태"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "부가 기능 설명"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "부가 기능 홈페�지"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "부가 기능 �름"
 
@@ -1345,40 +1462,300 @@ msgstr "부가 기능 �름"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "정보 미리 보기"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "개� 정보 보호 정책"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "부가 기능 요약"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "�메� 주소"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "홈페�지 주소"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "버전 정보"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "부가 기능 추천하기"
 
-#: controllers/developers_controller.php:2729
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1402,6 +1779,7 @@ msgstr ""
 "다."
 
 # %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"
@@ -1412,6 +1790,7 @@ 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"
@@ -1431,16 +1810,17 @@ msgstr "부가 기능 제출� 완료하였습니다."
 msgid "devcp_addon_submission_trusted_public"
 msgstr "본 부가 기능� �미 신뢰�어 ��으로 웹 사�트� 공개 합니다."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "부가 기능 제출"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1451,6 +1831,7 @@ 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"
@@ -1479,10 +1860,102 @@ msgstr "다�"
 msgid "devcp_change_addontype"
 msgstr "부가 기능 형� 변경:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "개발� 정보가 업��트 �었습니다."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "미리 보기 추가"
@@ -1575,6 +2048,7 @@ msgstr "기술 지�용 홈페�지가 없습니다."
 msgid "devcp_details_trusted"
 msgstr "신뢰함"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1603,6 +2077,7 @@ msgstr ""
 "다. 본 웹 사�트�서 다운로드 할 수 없으며 업��트 확� 작업� 진행�지 않습"
 "니다. 향후 다시 사용함� 설정하��� 실제로 삭제 가능성� 있습니다."
 
+#. %s is the name of an add-on
 #: views/developers/disable.thtml:55
 #, php-format
 msgid "devcp_disable_disable_title"
@@ -1622,11 +2097,65 @@ 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 "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "개발� 추가"
@@ -1639,10 +2168,297 @@ msgstr "개발� �메� 주소"
 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 "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+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 "개발�"
@@ -1708,6 +2524,206 @@ msgstr "기본 언어"
 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: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 "업��트"
@@ -1718,11 +2734,67 @@ 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 "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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+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
 #, php-format
@@ -1732,6 +2804,7 @@ msgstr[0] "�가 확�"
 msgstr[1] "�가 확� (%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
 #, php-format
@@ -1741,6 +2814,7 @@ msgstr[0] "추천 부가 정보 (1개)"
 msgstr[1] "추천 부가 정보 (%s개)"
 
 # %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1755,6 +2829,8 @@ 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"
@@ -1780,29 +2856,30 @@ msgstr "�가� 노트"
 msgid "devcp_editversion_submit_update"
 msgstr "업��트"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: controllers/developers_controller.php:1992
 msgid "devcp_error_addonname_not_unique"
 msgstr ""
 "부가 기능 �름� �미 존재 합니다. 다� 사항� 확�해 보시기 바�니다. <br /"
@@ -1810,19 +2887,33 @@ msgstr ""
 "터베�스� 중복 항목� 없습니다. 그러면  그 항목� 업��트 하거나 삭제해야 "
 "만 합니다.</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 "참고 �료는 %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 "현재 페�지"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+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"
@@ -1830,7 +2921,7 @@ msgstr ""
 "� 파� 확장�는(%s)는 부가 기능� 사용할 수 없습니다. 아래 중 하나를 사용하"
 "세요: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "GUID 값� 호출�지 않�"
 
@@ -1859,6 +2950,8 @@ msgstr "최대 업로드 파� �기 초과"
 msgid "devcp_error_http_nofile"
 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:401
 #, php-format
 msgid "devcp_error_icon_extension"
@@ -1866,13 +2959,14 @@ msgstr ""
 "� 파� 확장�(%s)는 아�콘� 사용할 수 없습니다. 아래 중 하나를 사용하세요: "
 "%s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "install.rdf가 업습니다."
 
@@ -1880,21 +2974,26 @@ msgstr "install.rdf가 업습니다."
 msgid "devcp_error_install_manifest"
 msgstr "부가 기능 내 install.rdf가 없습니다:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "부가 기능 형�� 선�해 주십시오."
 
+#. %$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 "%s� %s� 대한 유효한 버전� 아닙니다."
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "부가 기능� ID가 유효하지 않습니다: %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"
@@ -1912,6 +3011,7 @@ msgid "devcp_error_invalid_version_spaces"
 msgstr ""
 "� 부가 기능 버전� 유효하지 않습니다: 버전� 공백� �함해서는 안�니다."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1921,6 +3021,7 @@ msgstr "install.rdf�서 정보를 추출하는� 오류가 발�했습니다
 msgid "devcp_error_move_file"
 msgstr "��할 수 없�"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1943,15 +3044,15 @@ msgstr "부가 기능� install.rdf�서 ID를 찾� 수 없습니다."
 msgid "devcp_error_no_platform"
 msgstr "플랫�� 선�하지 않�"
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "후부 추천� 위해 필요 항목� 채워 주셔야 합니다."
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "아� 출시하지 않� 부가 기능� 추천할 수 없습니다."
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Sandbox�서 현재 부가 기능 공개를 추천할 수 있습니다."
 
@@ -1963,6 +3064,8 @@ msgstr "하나 ��� 분류를 선�하세요."
 msgid "devcp_error_one_user"
 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"
@@ -1970,13 +3073,13 @@ msgstr ""
 "� 파� 확장� (%s)는 미리 보기� 사용할 수 없습니다. 아래 중 하나를 선�하세"
 "ìš”: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
 msgid "devcp_error_saving"
 msgstr "��터 저장 중 오류가 발�했습니다."
 
-#: controllers/developers_controller.php:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "� 부가 기능� 업��트할 권한� 없습니다."
 
@@ -1992,7 +3095,7 @@ msgstr ""
 "부가 기능� 외부 updateURL� 사용해서는 안�니다. install.rdf�서 지운 후 다"
 "시 시�해 주세요."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "파�� 업로드 해 주십시오."
@@ -2212,6 +3315,7 @@ 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"
@@ -2255,11 +3359,26 @@ msgstr "부가 기능 제출"
 msgid "devcp_myaddons_title"
 msgstr "개발� �구"
 
+#. %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 "�세 정보로 �아가기"
 
 # %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
@@ -2267,11 +3386,33 @@ msgid "devcp_nominate_submit_nominate"
 msgstr "%s 추천"
 
 # %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: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 ""
@@ -2282,6 +3423,10 @@ msgstr ""
 # %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"
@@ -2296,9 +3441,14 @@ msgstr ""
 "현재 그림� 미리 보기 기본 설정으로 하면 �래 미리 보기 그림� ���으로  사"
 "용 정지 �니다."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2327,6 +3477,60 @@ msgstr "미리 보기 편집"
 msgid "devcp_preview_updated_successfully"
 msgstr "미리 보기를 수정하였습니다."
 
+#: 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 ""
@@ -2337,10 +3541,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "미리 보기 추가"
 
+#: 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 "미리 보기 편집"
 
+#: 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 "미리 보기 파�"
@@ -2349,6 +3563,34 @@ msgstr "미리 보기 파�"
 msgid "devcp_previews_label_makedefault"
 msgstr "현재 그림� 기본 미리 보기로 설정"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "미리 보기 삭제"
@@ -2365,56 +3607,171 @@ msgstr "미리 보기 편집"
 msgid "devcp_previews_submit_upload"
 msgstr "미리 보기 업로드"
 
+#: 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 "형�� 맞지 않습니까?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "� 파�� 삭제하시겠습니까?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
+
+#: 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 "현재 부가 기능 정보 검토 건너 뛰기"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> �� 사용�"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> � 다운로드 횟수"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> 주간 다운로드 호ㅣㅅ수"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "현재 부가 기능 등� 기능� 잠시 정지�었습니다. 다�� 시�하시기 바�니다."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "��함"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "�� 안함"
 
@@ -2430,11 +3787,12 @@ msgstr "사용 정지�"
 msgid "devcp_summary_header_trusted"
 msgstr "신뢰�"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2445,6 +3803,7 @@ 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"
@@ -2454,30 +3813,674 @@ msgstr "테마� 대해 %s를 확� 하세요."
 msgid "devcp_theme_upload_preview_link"
 msgstr "미리 보기 업로드"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "아래 %s를 확�하세요."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "참고 정보"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Edit Version"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "버전 업��트를 완료 하였습니다."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "부가 기능� 사용할 수 없습니다."
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "í•„í„°"
@@ -2486,7 +4489,7 @@ msgstr "í•„í„°"
 msgid "editorcp_logs_filter_by"
 msgstr "í•„í„°(type/action)"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "�벤트 로그"
 
@@ -2538,6 +4541,7 @@ msgstr "설명 숨기기"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "설명 보�기"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2547,7 +4551,7 @@ msgstr "�가 보기 (%s ~ %s) "
 msgid "editorcp_reviewlog_none_found"
 msgstr "기간 내 제출� �가 항목� 없습니다."
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "�가 로그"
 
@@ -2571,24 +4575,24 @@ msgstr "최근 편집� 활� 내역"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "� �가 수"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "부가 기능 �가"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "아래 항목� 모� 채워 주시기 바�니다:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "�가할 파�� 하나 �� 골� 주십시오."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "�신� 부가 기능�는 �가할 수 없습니다."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "외부 프로그램"
 
@@ -2600,39 +4604,39 @@ msgstr "�세 기능 추가"
 msgid "editors_featured_add_feature_submit"
 msgstr "추가"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "�세 기능 추가를 완료했습니다."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "�세 기능를 지울 수 없습니다."
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "�세 기능� 삭제하였습니다."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "부가 기능 �세 정보"
 
@@ -2665,38 +4669,41 @@ msgid "editors_notice_filter_session"
 msgstr "� 필터들� 세션� 유지�는 �안 사용할 수 있습니다."
 
 # %1 is the queue mode
+#. %1 is the queue mode
 #: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "�가할 부가 기능 갯수: %1 개"
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1�"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1시간"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1분"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "편집� 제어�"
 
-#: controllers/editors_controller.php:286
+#. %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 "%s 만 지�"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "출시 전"
 
 # %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2710,19 +4717,24 @@ msgstr "제거"
 msgid "editors_queue_submit_filter"
 msgstr "í•„í„°"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "현재 �가 작업� 정지 �었습니다. 다시 확� 바�니다."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "�가 하기"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "공개 하기"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "�위 �가 요청"
 
@@ -2730,29 +4742,37 @@ msgstr "�위 �가 요청"
 msgid "editors_review_action_sandbox"
 msgstr "Sandbox 유지"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "�가 �견"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "부가 기능� 최신 버전� 웹 사�트와 공개하�� 합니다. 향후 새 버전� 다시 "
 "Sandbox�서 편집�� �가를 거치게 �니다."
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "부가 기능� Sandbox� 계� 유지 합니다."
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr "부가 기능� 공개 웹 사�트� 공개하�� 합니다."
 
-#: views/editors/review.thtml:162
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "공개� 부가 기능� Sandbox로 옮�니다."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "� 부가 기능�서 보안, 저작권 �슈 등과 같� 염려가 있는 경우 관리��게 �"
@@ -2779,15 +4799,15 @@ msgstr "분류:"
 msgid "editors_review_header_compatibility"
 msgstr "호환성:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "설명"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "개발� �견"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2795,85 +4815,112 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "파�:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "항목 기�"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "후보 등� 메시지"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "미리 보기"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "%s �가하기"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "�가� 주� 사항"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "요약 정보"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "버전 노트"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "�가 관리"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "승�/공개 추천"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "승� 거부 하기"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "�전 �가 사항� 없습니다."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "�가 관리"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "승�/공개"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "거부/Sandbox"
 
-#: views/editors/review.thtml:198
+#. 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 "�용 프로그램:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "내부 �답 선�:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "설명:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "운� 체제:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "위로"
 
@@ -2882,7 +4929,7 @@ msgstr "위로"
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "미리 보기가 없습니다."
 
@@ -2891,42 +4938,50 @@ msgstr "미리 보기가 없습니다."
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "�작 과정"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "�작"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "설명"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "날짜"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "�가�"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "버전/파�"
 
-#: controllers/editors_controller.php:411
+#: 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 "�가 작업� 진행 합니다."
 
@@ -2936,6 +4991,13 @@ msgid "editors_reviews_action_delete_review"
 msgstr "Delete review"
 
 #: views/editors/reviews_queue.thtml:104
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+
 #, fuzzy
 msgid "editors_reviews_action_keep"
 msgstr "Remove flags; keep review"
@@ -2952,7 +5014,7 @@ msgstr "처리"
 msgid "editors_reviews_in_reply_to"
 msgstr "�답 주소:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "�가 내용� 잘 처리�었습니다."
 
@@ -2964,23 +5026,23 @@ msgstr "현재 관리해야할 �가 항목� 없습니다."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "제출 과정 �가"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "사�트 기반"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "신규"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "업��트"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "테스트 완료 �용 프로그램"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "테스트 완료 운� 체제"
 
@@ -3021,17 +5083,20 @@ msgstr "플랫�"
 msgid "editors_th_submissiontypes"
 msgstr "제출 형�"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s�"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s시간"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s분"
@@ -3040,8 +5105,8 @@ msgstr "%s분"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "� 항목� 채워야 합니다."
 
@@ -3049,12 +5114,13 @@ msgstr "� 항목� 채워야 합니다."
 msgid "error_access_denied_message"
 msgstr "� 페�지를 보시려면 권한� 필요 합니다."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3064,18 +5130,19 @@ msgstr "� 페�지를 보시려면 권한� 필요 합니다."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "검색 결과가 없습니다!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "여기서 부가 기능� 볼 수 없습니다."
 
@@ -3083,7 +5150,7 @@ msgstr "여기서 부가 기능� 볼 수 없습니다."
 msgid "error_addon_selfreview"
 msgstr "�기가 만든 부가 기능� 리뷰를 올릴 수 없습니다."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "분류 내� 부가 기능� 없습니다!"
 
@@ -3105,24 +5172,25 @@ msgstr "�메� 주소가 유효하지 않습니다."
 msgid "error_field_required"
 msgstr "� 항목� 채워야 합니다."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "파� 없�!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "파� 오류: %s는 존재하지 않습니다."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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 "� 양�� 오류가 있습니다. 수정한 후 다시 제출하십시오."
@@ -3137,16 +5205,18 @@ msgstr "맞지 않습니다. 다시 해보세요!"
 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3165,7 +5235,7 @@ msgstr "오류 공지"
 msgid "error_preview_notfound"
 msgstr "미리 보기 없�!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "별�� 선�하셔야 합니다."
 
@@ -3215,8 +5285,8 @@ msgstr "당신� 계정� 확�해 주세요."
 msgid "error_username_or_pw_wrong"
 msgstr "잘못� 사용� �름�나 암호입니다!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "버전� 찾� 수 없습니다."
 
@@ -3229,12 +5299,14 @@ msgid "feature_learnmore"
 msgstr "�세히 보기"
 
 # %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "%1$s �세히 보기"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3246,6 +5318,45 @@ msgstr[1] "�가 %1$s개"
 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "모든 권한� 소유합니다."
@@ -3282,7 +5393,7 @@ msgstr "다른 언어:"
 msgid "footer_privacy_policy"
 msgstr "개�정보 보호정책"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "저장"
 
@@ -3291,6 +5402,7 @@ 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:110
 msgid "general_addontype_dict_plural"
 msgstr "사전"
@@ -3300,6 +5412,7 @@ 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:108
 msgid "general_addontype_extension_plural"
 msgstr "확장 기능"
@@ -3309,6 +5422,7 @@ 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "언어팩(부가기능)"
@@ -3318,6 +5432,7 @@ 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "언어팩(프로그램)"
@@ -3327,6 +5442,7 @@ 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "플러그�"
@@ -3336,6 +5452,7 @@ 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:111
 msgid "general_addontype_search_plural"
 msgstr "검색 엔진"
@@ -3345,10 +5462,12 @@ 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:109
 msgid "general_addontype_theme_plural"
 msgstr "테마"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3379,12 +5498,12 @@ msgid "header_navlink_addons"
 msgstr "부가 기능"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "로그아웃"
 
@@ -3392,36 +5511,43 @@ msgstr "로그아웃"
 msgid "header_navlink_myaccount"
 msgstr "내 계정"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "등�"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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
+#. %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 "부가 기능 설치 위해 <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/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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3444,7 +5570,7 @@ msgid "langtools_download_langpack"
 msgstr "언어팩 다운로드"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "맞춤법 사전 � 언어팩"
 
@@ -3503,7 +5629,7 @@ msgstr "Firefox"
 #: config/bootstrap.php:277
 #, fuzzy
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3539,6 +5665,7 @@ 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:214
 msgid "other_users"
 msgstr "others"
@@ -3553,42 +5680,41 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_experimental_addons"
 msgstr "Experimental Add-ons"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 #, fuzzy
 msgid "page_title_policy"
 msgstr "Add-ons Policy"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 #, fuzzy
 msgid "page_title_privacy"
 msgstr "Mozilla Privacy Policy"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 #, fuzzy
 msgid "page_title_review_guide"
 msgstr "Review Guidelines"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 #, fuzzy
 msgid "page_title_sandbox"
 msgstr "Sandbox Review System"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 #, fuzzy
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
@@ -3608,6 +5734,7 @@ msgstr ""
 "Mozilla 부가 기능 사�트� 제출� 부가 기능� 아래 �용 프로그램 중 하나를 지"
 "�하는 install.rdf 파�� �함해야 합니다. 아래 버전만 사용 가능 합니다."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3615,6 +5742,8 @@ 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:92
 msgid "pages_appversions_required_files_link"
 msgstr "여기"
@@ -3623,7 +5752,6 @@ msgstr "여기"
 msgid "pages_appversions_versions"
 msgstr "버전"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "앞 페�지로"
 
@@ -3636,6 +5764,7 @@ 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"
@@ -3661,6 +5790,8 @@ msgstr "Please type what you hear."
 
 # %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
 #, fuzzy
 msgid "recaptcha_hardtohear_text"
@@ -3670,6 +5801,8 @@ msgstr ""
 
 # %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
 #, fuzzy
 msgid "recaptcha_hardtoread_text"
@@ -3685,7 +5818,7 @@ msgstr "스팸 차단용 기능"
 msgid "recaptcha_whatsthis"
 msgstr "기능 소개"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "리뷰 올리기 실패!"
 
@@ -3715,7 +5848,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "�사합니다. 리뷰가 편집��게 전달�었습니다."
 
@@ -3729,6 +5862,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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3743,21 +5877,22 @@ msgstr ""
 "li></ul><p>� �세한 정보는 <a href=\"%2$s\">리뷰 가�드��</a>� 참고하시"
 "기 바�니다. </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 "%s� 대한 �가"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "주요 부가 기능"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "새 부가 기능"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "최근 업��트"
 
@@ -3794,6 +5929,7 @@ msgstr "전체 검색 사�트"
 msgid "search_landing_browse_search_engines"
 msgstr "검색 사�트 보기"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3813,12 +5949,13 @@ msgstr "부가 기능 검색"
 msgid "search_rss_description"
 msgstr "검색 결과 RSS 피드"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "검색 결과: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "관리 �구"
 
@@ -3826,7 +5963,7 @@ msgstr "관리 �구"
 msgid "sidebar_navlink_developer_tools"
 msgstr "개발 �구"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "관리 �구"
 
@@ -3834,6 +5971,7 @@ msgstr "관리 �구"
 msgid "sidebar_navlink_welcome"
 msgstr "환�합니다"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3871,6 +6009,7 @@ msgstr "테마"
 msgid "sidebar_pitch_updated_addons"
 msgstr "최근 업��트 항목"
 
+#. %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
@@ -3883,6 +6022,7 @@ 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3900,24 +6040,32 @@ msgstr "개발� �구"
 msgid "statistics_addon_switch"
 msgstr "부가 기능 전환"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "F j�"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "Y년 F j�"
 
+#. 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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3959,7 +6107,7 @@ msgstr "통계 대시보드"
 msgid "statistics_index_view_button"
 msgstr "통계 보기"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
@@ -3977,7 +6125,7 @@ msgstr "현재 통계 삭제"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
@@ -3987,104 +6135,109 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "조건 내 %s 조회"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "조건 추가"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "현재 그래프� 다른 조건 추가"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "� 횟수 숨기기"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "� 횟수 보�기"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "��터 보기 (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "쉼표 분리� ��터 형�으로 보기"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "%s �벤트 숨기기"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "%s �벤트 보�기"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "범위 내 출시� 표시"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Firefox �벤트 숨기기"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Firefox �벤트 보�기"
 
-#: controllers/statistics_controller.php:241
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "범위 내 Firefox 출시� 표시"
 
-#: controllers/statistics_controller.php:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "그래프 닫기"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "그래프 확장"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "그래프 �기 변경"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "�� 사용� 수"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "프로그램"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "기타"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "다운로드 횟수"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "운� 체제"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "부가 기능 �태"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "요약 정보"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "버전"
 
@@ -4108,11 +6261,11 @@ msgstr "알 수 없�"
 msgid "statistics_longnames_version"
 msgstr "부가 기능 버전"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr "그래프로 표시하기� ��터양� �습니다. 나중� 다시 확�해 주십시오."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr "부가 기능 통계 정보가 아� 없습니다. 며칠 후 확�해 주십시오."
 
@@ -4122,11 +6275,11 @@ msgstr ""
 "부가 기능 통계 기능� 업��트 중입니다. 작업 중 최근 ��터는 정확지 않� "
 "수 있습니다. 몇 분 후� 다시 확�해 주시기 바�니다. "
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "통계 대시보드는 현재 사용할 수 없습니다. 나중� 다시 확�해 주십시오."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "통계 대시보드를 보려면 �바스�립트가 켜져 있어야 합니다."
 
@@ -4141,36 +6294,36 @@ msgstr "설정� 업��트 �었습니다!"
 msgid "statistics_pagetitle"
 msgstr "통계 대시보드"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "�간 사용�"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "�간 다운로드"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "�세히 보기"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "한달로 보기"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "간략히 보기"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "한달로 보기"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "�간 통계 요약: %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "RSS 요약 정보"
 
@@ -4209,23 +6362,23 @@ msgstr "공개"
 msgid "statistics_settings_access_public_description"
 msgstr "모든 사용�가 통계를 볼수 있�"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "설정 변경"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "아래 정보는 신중하게 입력해 주십시오."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "현재 대시보드는 <b>비공개 중</b>입니다."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "현재 대시보드는 <b>공개 중</b>입니다."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "처리 중단�"
 
@@ -4242,7 +6395,7 @@ msgstr "설정 저장"
 msgid "statistics_settings_title"
 msgstr "%1$s 통계 설정"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "처리 중"
 
@@ -4266,7 +6419,7 @@ msgstr "알 수없�"
 msgid "statistics_shortnames_version"
 msgstr "버전"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "�균 �� 다운로드 수"
 
@@ -4274,37 +6427,37 @@ msgstr "�균 �� 다운로드 수"
 msgid "statistics_summary_downloads_heading"
 msgstr "다운로드 통계"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "��터가 없�"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s , 날짜: %2$s"
@@ -4313,17 +6466,17 @@ msgstr "%1$s , 날짜: %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "�� 사용� 통계"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: 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:147
+#: 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:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s 통계"
@@ -4349,6 +6502,7 @@ 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:49
 #, fuzzy
 msgid "user_del_account_deleted"
@@ -4373,6 +6527,7 @@ 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:62
 #, fuzzy
 msgid "user_del_error_addons"
@@ -4383,6 +6538,7 @@ msgstr ""
 "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:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
@@ -4401,6 +6557,7 @@ 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:83
 #, fuzzy
 msgid "user_del_error_unknown"
@@ -4414,6 +6571,7 @@ 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:93
 #, fuzzy
 msgid "user_del_header_delete_account"
@@ -4444,6 +6602,7 @@ msgstr ""
 "associated with you."
 
 # %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
@@ -4463,6 +6622,7 @@ msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4478,6 +6638,9 @@ 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
+#. 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"
@@ -4497,6 +6660,7 @@ msgstr ""
 "-- %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4522,6 +6686,8 @@ msgstr "%s 부가 기능 사�트� 가입해 주셔서 �사합니다."
 
 # This is the password reset email
 # %1 is the pw reset URL
+#. 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"
@@ -4548,6 +6714,7 @@ msgid "user_emailchange_error"
 msgstr "오류!"
 
 # %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4558,6 +6725,7 @@ msgid "user_emailchange_success"
 msgstr "성공하였습니다!"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4728,6 +6896,7 @@ msgstr "암호 초기화 �� 보내기"
 msgid "user_register_amo_link"
 msgstr "%s 부가 기능"
 
+#. %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"
@@ -4735,6 +6904,7 @@ msgstr ""
 "%1$s 메� 주소로 당신� 계정� 활성화 할 수 있는 ��를 보냈습니다.Mozilla 부"
 "가 기능 사�트� 로그� 하기 전� 계정 활성화를 해야 합니다."
 
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4750,11 +6920,13 @@ msgstr "확� 메시지 재전송"
 msgid "user_register_congratulations"
 msgstr "축하합니다! 계정 등�� 완료 �었습니다."
 
+#. %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 is the link to the Mozilla Add-ons front page
 #: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
@@ -4819,6 +6991,7 @@ msgid "users_info_pagetitle"
 msgstr "%1$s 사용� 정보"
 
 # %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
@@ -4830,6 +7003,8 @@ 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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4839,6 +7014,8 @@ msgstr ""
 
 # %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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4853,3 +7030,33 @@ msgstr "사용� 암호 초기화"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "새 사용� 등�"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "최신 버전 호환성: "
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "sidebar_navlink_tools"
+#~ msgstr "Tools"
diff --git a/site/app/locale/merge-po.sh b/site/app/locale/merge-po.sh
index f65dae6..1b6d445 100755
--- a/site/app/locale/merge-po.sh
+++ b/site/app/locale/merge-po.sh
@@ -16,7 +16,7 @@ TMPFILE=`mktemp /tmp/${tempfoo}.XXXXXX` || exit 1
 if [[ ($# -ne 2) || (! -f "$1") || (! -d "$2") ]]; then usage; fi
 
 for lang in `find $2 -type f -name "*.po"`; do
-    msgmerge --no-fuzzy-matching $lang $1 > $TMPFILE
-    cp "$TMPFILE" "$lang"
+    sed 's/#\. /# developer_comment /' "$lang" | msgmerge --no-fuzzy-matching - $1 > $TMPFILE
+    sed 's/# developer_comment /#. /' "$TMPFILE" > "$lang"
 done
 rm "$TMPFILE"
diff --git a/site/app/locale/mn/LC_MESSAGES/messages.po b/site/app/locale/mn/LC_MESSAGES/messages.po
index fb4468b..7e062fb 100644
--- a/site/app/locale/mn/LC_MESSAGES/messages.po
+++ b/site/app/locale/mn/LC_MESSAGES/messages.po
@@ -21,6 +21,10 @@ msgstr ""
 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 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
@@ -49,38 +53,34 @@ msgstr "�ийтийн"
 msgid "a_header_sandbox"
 msgstr "Түр хайрцаг"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, fuzzy, php-format
-msgid "added"
-msgstr "Added %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "%s шин�чл�гд��н "
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Хувилбар %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "удаа нийтд�� татагд�ан"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
@@ -97,22 +97,22 @@ msgstr "-г н�г хууд�анд"
 msgid "addon_list_sortby"
 msgstr "Эр�мб�л�лт:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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: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: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
@@ -121,7 +121,7 @@ msgstr "%1$s-н %2$s-д тохир�он хувилбар байхгүй."
 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -140,6 +140,7 @@ msgstr "Үн�лг�� дүгн�лт:"
 msgid "addon_review_add_submit"
 msgstr "Үн�лг�� дүгн�лт�� илг��х"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -173,23 +174,25 @@ msgstr "Тийм"
 msgid "addon_review_delete_header"
 msgstr "Үн�лг�� дүгн�лтийг у�тга"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Дүгн�лт амжилттай у�тгагдлаа."
 
+#. %s is the name of the add-on
 #: 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:534
+#. %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
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -200,7 +203,7 @@ msgstr ""
 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:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
@@ -208,16 +211,16 @@ 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 addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -231,13 +234,13 @@ msgstr "Хөгжүүл�гчийн хариулт:"
 msgid "addon_review_saved_successfully"
 msgstr "Таны үн�лг�� амжилттай хадгалагдлаа. Ба�рлалаа!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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
+#. %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
@@ -263,11 +266,14 @@ msgstr "Previous Add-on"
 msgid "addon_version_permalink"
 msgstr "Permanent link to this version"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "Хамгийн �үүлийн тохирох хувилбар"
+#. %1 is the current Application name (e.g. Firefox)
+#. %2 is the Application's version number
+#: 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:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Илг��х"
 
@@ -276,20 +282,21 @@ msgstr "Илг��х"
 msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
@@ -298,7 +305,7 @@ msgstr "Browse %1$s Themes :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "Үн�лг�� дүгн�лт н�м"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "��м�лт м�д��л�л"
 
@@ -306,11 +313,11 @@ msgstr "��м�лт м�д��л�л"
 msgid "addons_display_categories"
 msgstr "Төрөл анги"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "д�лг�р�нгүй харуулалт"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Таалагд�ангүй"
@@ -319,68 +326,72 @@ msgstr "Таалагд�ангүй"
 msgid "addons_display_edit_review"
 msgstr "Тайлбараа за�варлах"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr ""
 "Эн� н�м�гд�лд хувь хүнт�й холбоотой м�д��ллийг хамгаалах журам заагд�ан "
 "байна."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Зохиогчийн тайлбар"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "В�б хууд�анд нь очих"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Үн�лг�� дүгн�лтүүд"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Д�мжл�г"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Таалагдаж байна"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Урт тайлбар"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 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:421
+#. %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
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "%1$s-н зохио�он бу�ад н�м�гдлүүд"
 msgstr[1] "Other add-ons by these authors"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -392,7 +403,9 @@ msgstr ""
 "хөгжүүл�гч рүү хамт илг��д�ггүй учраа� хөгжүүл�гч��� танд уг алдаа дутагдал "
 "нь дараагийн хувилбарт за�агд�ан ���хийг м�д��л�х боломжгүй байх болно."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -405,7 +418,8 @@ msgstr ""
 "дутагдал нь дараагийн хувилбарт за�агд�ан ���хийг м�д��л�х боломжгүй байх "
 "болно."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -417,68 +431,68 @@ msgstr ""
 "хөгжүүл�гч рүү хамт илг��д�ггүй учраа� хөгжүүл�гч��� танд уг алдаа дутагдал "
 "нь дараагийн хувилбарт за�агд�ан ���хийг м�д��л�х боломжгүй байх болно."
 
-#: views/addons/display.thtml:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Дүгн�лт өгөх"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "<a href=\"%1$s\">Д�мжл�г ту�ламжийн</a> х���гт уг н�м�гд�лд тохир�он "
 "ту�ламжийг хаанаа� авч болохыг харна уу."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Хадгал"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Бүх үн�лг��г харах (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Бүх хувилбарыг нь харах"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Хувилбарын бүр�н түүх"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Эх бичл�гийг нь харах"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Судалгааны үр дүнг харах"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Та юу г�ж бодож байна?"
 
@@ -488,7 +502,7 @@ msgstr "�жиллах хувилбар:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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 "зохиогч"
@@ -499,10 +513,11 @@ msgstr "зохиогч"
 msgid "addons_home_feature_head"
 msgstr "Бидний �анал болголт"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -517,7 +532,9 @@ msgstr "Шин�х�н:"
 msgid "addons_home_other_applications"
 msgstr "Бу�ад програмууд"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -527,19 +544,20 @@ msgstr "Бу�ад програмууд"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -636,6 +654,7 @@ msgstr "Mac OS X машинд"
 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"
@@ -656,12 +675,13 @@ msgstr ""
 "өргөтгөлөө� одоогийн байгаа үйлдлийг өөрчлөх юмуу н�мд�г��р�� бага з�р�г "
 "�лгардаг."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "%1$s-д зориул�ан ердийн плагинууд"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Плагинууд"
 
@@ -672,6 +692,7 @@ msgstr "Плагинууд"
 msgid "addons_plugins_support_documentation"
 msgstr "Заавар бичиг баримт: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -679,25 +700,25 @@ msgstr ""
 "%s �уулгацыг үрг�лжлүүл�х����� өмнө Х�р�гл�х лицензийг зөвшөөр�өн ���хийг "
 "м�д�х шаардлагатай:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s-н үзүүлб�р"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 msgid "addons_recommended_introduction"
 msgstr ""
 "Маш олон н�м�гдлүүд боломжтой байгаа бөгөөд хүн болгонд тохир�он зарим "
 "н�м�гдлүүд байдаг. Танд ту�лах зорилгоор байнга х�р�гл�гдд�г болон өргөн "
 "тарх�ан н�м�гдлүүдийг �нд жаг�аав. Таалан �оёрхоно уу!"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Санал болгогд�он н�м�гдлүүд"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Санал болгогд�он н�м�гдлүүд"
 
@@ -705,7 +726,7 @@ msgstr "Санал болгогд�он н�м�гдлүүд"
 msgid "addons_searchengines_additional_resources"
 msgstr "��м�лт �х �урвалж"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Мозилаг хөгжүүл�гчдийн төв"
@@ -723,35 +744,35 @@ msgstr ""
 "хорьчих�он юм шиг байна. Доорх хайгч плагинуудыг �уулгахын тулд "
 "жаава�криптийг зөвшөөрнө үү."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %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 "Х�рх�н %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: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: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: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:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Хайлт хийгчид"
 
@@ -766,7 +787,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Disabled"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 #, fuzzy
 msgid "addons_status_incomplete"
 msgstr "Incomplete Version"
@@ -811,11 +832,12 @@ msgstr ""
 "Эдг��р хувилбар нь шалгах юмуу лавлагаа зориулалтаар харуулагд�ан болно.  Та "
 "үрг�лж шин� хувилбарыг нь илүүд тооцох х�р�гт�й."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Өөрчлөлтийн бүртг�л агуул�ан хувилбарын түүх"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s хувилбарын түүх"
@@ -828,6 +850,7 @@ msgstr "Бүл�г н�м"
 msgid "admin_group_delete_pagetitle"
 msgstr "Бүл�г у�тга"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -954,6 +977,7 @@ msgstr "Хувилбар шалгахыг алга�"
 msgid "app_compat_older_firefox_only"
 msgstr "Эн� н�м�гд�л нь Firefox-н хуучин хувилбарт зориулагд�ан"
 
+#. %1$s and %2$s are URLs
 #: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
@@ -961,10 +985,13 @@ 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: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:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
@@ -977,23 +1004,23 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Firefox-г шин�чл��д</a> �н� н�м�гдлийг "
 "ашиглана уу"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "��р��р нь �р�мб�лж харах"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Шин�х�н н�м�гдлүүд"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Өргөн тарх�ан н�м�гдлүүд"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Үн�лг��г��р нь �р�мб�лж харах"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Са�хан шин�чл�гд��н н�м�гдлүүд"
 
@@ -1025,7 +1052,7 @@ msgstr "Хамгийн �үүлд шин�чл�гд��н нь �х�нд"
 msgid "category_extra_mostpopular"
 msgstr "Хамгийн өргөн тарх�ан нь �х�нд"
 
-# %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"
@@ -1036,12 +1063,20 @@ msgstr "%1$s төрлөө� бүгдийг нь харуул"
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
+#. %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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 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:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
@@ -1081,6 +1116,8 @@ 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
 #: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
@@ -1109,6 +1146,10 @@ 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)
 #: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
@@ -1126,6 +1167,8 @@ msgstr ""
 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:69
 #, fuzzy
 msgid "compatibility_report_intro"
@@ -1139,6 +1182,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
@@ -1149,6 +1193,7 @@ 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
 #: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
@@ -1159,6 +1204,7 @@ 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
 #: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
@@ -1169,6 +1215,7 @@ 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
 #: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
@@ -1190,12 +1237,13 @@ msgstr "Information for Add-on Users"
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Хамтрах талаарх м�д��ллийг %s хууда�наа� харна уу."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wiki хууда�"
 
@@ -1237,26 +1285,35 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "г���н зохиогчийн �рх дор ашиглагдав</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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 "
 
-# date and time format string (strftime)
+#. 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 "%Y оны %B %e, %I:%M %p"
@@ -1282,14 +1339,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1338,36 +1423,36 @@ msgstr "5-р алхам: �мжилттай дуу�лаа"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Илг��х ту�ламж"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "��м�гдл�л хорих амжилттай боллоо"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "��м�гдлийг за�варла"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "��м�гдл�л зөвшөөрөх амжилттай боллоо"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "��м�гдлийн тодорхойлолт"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "��м�гдлийн в�б хууда�"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "��м�гдлийн н�р"
 
@@ -1376,40 +1461,298 @@ msgstr "��м�гдлийн н�р"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Үзүүлб�рийн гарчиг"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Хувь хүнд холбоотой м�д��л�л хамгаалах журам "
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "��м�гдлийн ерөнхий тайлбар"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Лавлах захианы ха�г"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "Лавлах в�б хууда�"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Хувилбарын т�мд�гл�г��"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "��р д�вшигд��н н�м�гдлүүд"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "��м�гдлийн н�р д�вшүүл�лт амжилттай боллоо!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1432,7 +1775,7 @@ msgstr ""
 "түр хайрцганд байрла�ан байгаа. Үн�л�лт хийгд��ний дараа танд захиагаар "
 "м�д�гд�х болно."
 
-# %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"
@@ -1442,7 +1785,7 @@ msgstr "Түр хайрцагт буй зүйлÑ�ийн дүгнÑ�Ñ… зарчмÑ
 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"
@@ -1465,16 +1808,16 @@ msgstr ""
 "Таны н�м�гд�л итг�гд��н төрөлд багтдаг учраа� �н� хувилбар нь автоматаар "
 "нийтийн хууд�анд орно."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "��м�гдлийг илг��"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1484,7 +1827,7 @@ msgstr "Та магадгүй %s хийж нÑ�мÑ�гдлийнхÑ�Ñ� Ñ�онирÑ
 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"
@@ -1513,10 +1856,102 @@ msgstr "Дараах"
 msgid "devcp_change_addontype"
 msgstr "��м�гдлийн төрөл өөрчлөх:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "Хөгжүүл�гчийн тайлбар шин�чл�гд��н."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Үзүүлб�р н�м�х"
@@ -1609,6 +2044,7 @@ msgstr "Хөгжүүл�гч��� �мар ч в�б хууда�ны ха�г
 msgid "devcp_details_trusted"
 msgstr "Итг�гд��н"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1638,6 +2074,7 @@ msgstr ""
 "н�м�гд�л нь бараг у�тгагдах бөгөөд х�р�в та хү�в�л �н� хууд�анд буцаж ир��д "
 "хорих үйлдлийг цуцалж болно."
 
+#. %s is the name of an add-on
 #: views/developers/disable.thtml:55
 #, php-format
 msgid "devcp_disable_disable_title"
@@ -1658,11 +2095,65 @@ 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 "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Зохиогч н�м�х"
@@ -1675,10 +2166,297 @@ msgstr "Зохиогчийн захианы ха�г"
 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 "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+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 "Зохиогчид"
@@ -1744,6 +2522,206 @@ msgstr "Х�р�гл�х х�л"
 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: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 "Шин�чил"
@@ -1754,11 +2732,66 @@ 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 "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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+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
 #, php-format
@@ -1767,7 +2800,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Х�на�ан үн�лг�� дүгн�лтүүд (%s)"
 msgstr[1] "Х�на�ан үн�лг�� дүгн�лтүүд (%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
 #, php-format
@@ -1776,7 +2809,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "��р д�вшигд��н н�м�гдлүүд (%s)"
 msgstr[1] "��р д�вшигд��н н�м�гдлүүд (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1789,8 +2822,8 @@ msgstr[1] "Шин�чл�лийн хү��лт хүл��ж байн (%s)"
 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"
@@ -1816,29 +2849,30 @@ msgstr "Үн�л�л дүгн�лт хийгчд�д зориул�ан т�мд
 msgid "devcp_editversion_submit_update"
 msgstr "Шин�чил"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: controllers/developers_controller.php:1992
 msgid "devcp_error_addonname_not_unique"
 msgstr ""
 "Таны н�м�гдлийн н�р өгөгдлийн бааз дотор өмнө оруулагд�ан байна. Та: <br /"
@@ -1847,19 +2881,33 @@ msgstr ""
 "өгөгдлийн баазын оруулгах давхарлах х�р�ггүй. Х�р�в давхарла�ан байгаа бол "
 "т�р оруулгаа шин�чл�х ��в�л у�тгаад дахин оролдох х�р�гт�й.</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 "%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 "�н� хууда�"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+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"
@@ -1867,7 +2915,7 @@ msgstr ""
 "Ийм файлын өргөтгөл (%s) нь �онгогд�он н�м�гдлийн төрөлд зөвшөөрөгдөөгүй. Та "
 "дараах төрлөө� н�гийг нь �онгоно уу: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Бүх файлын GUIDs тохир�онгүй"
 
@@ -1896,6 +2944,8 @@ msgstr "Илг��х д��д х�мж��н��� х�т�р��н"
 msgid "devcp_error_http_nofile"
 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:401
 #, php-format
 msgid "devcp_error_icon_extension"
@@ -1903,15 +2953,16 @@ msgstr ""
 "Ийм файл өргөтгөл (%s) нь т�мд�гт зургийн төрөлд таарахгүй байна. Та дараах "
 "төрлөө� н�гийг нь �онгоно уу: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "install.rdf файл байхгүй байна."
 
@@ -1919,21 +2970,26 @@ msgstr "install.rdf файл байхгүй байна."
 msgid "devcp_error_install_manifest"
 msgstr "Дараах алдаанууд install.rdf файлд олдов:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "��м�гдлийн зөв төрлийг �онгоно уу."
 
+#. %$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 "%s нь %s-д тохир�он зөв хувилбар биш байна"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "Эн� н�м�гдлийн таних дугаар нь зөв биш байна: %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"
@@ -1953,6 +3009,7 @@ msgstr ""
 "Эн� н�м�гдлийн хувилбар нь зөв биш байна: хувилбарын дугаар хоо�он зай "
 "агуулах ё�гүй."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1962,6 +3019,7 @@ msgstr "install.rdf файлыг уншиж байхад дараах алдаа
 msgid "devcp_error_move_file"
 msgstr "Файлыг зөөж чадахгүй байна"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1985,15 +3043,15 @@ msgstr ""
 msgid "devcp_error_no_platform"
 msgstr "Үйлдлийн �и�тем �онгогдоогүй байна"
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "Та н�р д�вшүүл�х�д шаардагдах м�д��ллүүдийг оруулах ё�той."
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "Та н�м�гдлийн урьдчил�ан хувилбарыг н�р д�вшүүлж болохгүй."
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Та зөвхөн түр хайрцганд байгаа н�м�гдлийг л н�р д�вшүүлж болно."
 
@@ -2005,6 +3063,8 @@ msgstr "Ядаж н�г төрөл �онгоно уу."
 msgid "devcp_error_one_user"
 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"
@@ -2012,13 +3072,13 @@ msgstr ""
 "Ийм файлын өргөтгөл (%s) нь харуулагдах боломжгүй байна. Дараах төрлөө� "
 "н�гийг �онгоно уу: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
 msgid "devcp_error_saving"
 msgstr "Таны өгөгдлийг хадгалах үед алдаа гарлаа."
 
-#: controllers/developers_controller.php:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Танд �н� н�м�гдлийг шин�чл�х �рх байхгүй байна."
 
@@ -2034,7 +3094,7 @@ msgstr ""
 "��м�гдлүүд нь гаднын шин�чл�х ха�г ашиглаж болохгүй. Та түүнийг install.rdf "
 "файлаа� у�тгаад дахин оролдоно уу."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Файлаа илг��н� үү."
@@ -2255,7 +3315,7 @@ msgstr "Миний н�м�гдлүүд"
 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"
@@ -2298,33 +3358,68 @@ msgstr "��м�гд�л илг��х"
 msgid "devcp_myaddons_title"
 msgstr "Зохиогчид зориул�ан багажнууд"
 
+#. %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 "��м�гдлийн нарийн м�д��л�л рүү буцах"
 
-# %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-г н�р д�вшүүл"
 
-# %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: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 ""
 "Эн� анхдагч үзүүлб�рийг у�тга�наар өөр үзүүлб�рийг автоматаар анхдагч болгож "
 "�онгодог."
 
-# %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"
@@ -2340,9 +3435,14 @@ msgstr ""
 "Эн� үзүүлб�рийг анхдагч болго�ноор одоогийн байгаа анхдагч үзүүлб�рийг "
 "анхдагч төлөв байдлыг арилгадаг."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2371,6 +3471,60 @@ msgstr "Үзүүлб�рийг за�варлах"
 msgid "devcp_preview_updated_successfully"
 msgstr "Үзүүлб�р амжилттай шин�чл�гдл��."
 
+#: 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 ""
@@ -2382,10 +3536,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Үзүүлб�р н�м"
 
+#: 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 "Үзүүлб�рийг за�варла"
 
+#: 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 "Файлыг харуул"
@@ -2394,6 +3558,34 @@ msgstr "Файлыг харуул"
 msgid "devcp_previews_label_makedefault"
 msgstr "Үүнийг анхдагч үзүүлб�р болго"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Үзүүлб�рийг у�тга"
@@ -2410,44 +3602,159 @@ msgstr "Үзүүлб�рийг за�варла"
 msgid "devcp_previews_submit_upload"
 msgstr "Үзүүлб�р илг��х"
 
+#: 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 "Буруу юу?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Та �н� файлыг у�тгах г�ж буйдаа итг�лт�й байна уу?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
+
+#: 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 "Миний одоогийн н�м�гдлийн м�д��ллийг шин�чл�х үйлдлийг алга�"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> өдөр тутмын ид�вхит�й х�р�гл�д�г х�р�гл�гчид"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> удаа татаж ав�ан"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> удаа долоо хоногт татаж ав�ан"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "��м�гд�л илг��х үйлд�л одоогоор хоригд�он. Х���г хугацааны дараа �рг�ж "
@@ -2455,13 +3762,13 @@ msgstr ""
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Би зөвшөөрнө"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Би татгалзана"
 
@@ -2477,11 +3784,11 @@ msgstr "Хоригд�он"
 msgid "devcp_summary_header_trusted"
 msgstr "Итг�гд��н"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2491,7 +3798,7 @@ msgstr "Танд �мар ч н�м�гд�л байхгүй байна. Та %s
 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"
@@ -2501,30 +3808,674 @@ msgstr "Та өөрийнхөө ма�гт тохируулж %s шалгах х
 msgid "devcp_theme_upload_preview_link"
 msgstr "үзүүлб�р н�мж"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Эн� %s н�м�лт зааврыг харна уу."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "хууда�наа�"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Хувилбарыг за�варла"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Хувилбар амжилттай шин�чл�гдл��."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Эн� н�м�гд�л хоригд�он"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Шүүлт"
@@ -2533,7 +4484,7 @@ msgstr "Шүүлт"
 msgid "editorcp_logs_filter_by"
 msgstr "Төрөл/Үйлдл��р нь шүүх"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Үйл �вдлын бүртг�л бичл�г"
 
@@ -2585,6 +4536,7 @@ msgstr "С�тг�гдлийг нуу"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "С�тг�гдлийг харуул"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2594,7 +4546,7 @@ msgstr "%s-� %s хүрт�лх оруулгыг харуул"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Эн� хугацаанд �мар ч үн�лг�� олд�онгүй."
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Х�нан шалгалтын бүртг�л"
 
@@ -2618,24 +4570,24 @@ msgstr "За�варлагчийн �үүлийн үеийн төлөв"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "�ийт үн�лг��"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "��м�гдлийг үн�лж дүгн�х"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Дараах талбаруудыг бөглөнө үү:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Ядаж н�г файлыг үн�лж дүгн�х��р �онгоно уу."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Өөр�дөө үн�лж дүгн�х хориотой."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Гадаад програм"
 
@@ -2647,39 +4599,39 @@ msgstr "Шин� чадвар н�м�х"
 msgid "editors_featured_add_feature_submit"
 msgstr "��м"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Чадварыг амжилттай н�м�в."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Чадварыг у�тгахад алдаа гарав."
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Чадварыг амжилттай у�тгав."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Чадвараар хангагд�ан н�м�гдлүүд"
 
@@ -2711,39 +4663,40 @@ msgstr "��м�гдлийн журам"
 msgid "editors_notice_filter_session"
 msgstr "Эдг��р шүүлтүүрүүд нь �н� х���гт�� ��в�л арилгатал байрлах болно."
 
-# %1 is the queue mode
+#. %1 is the queue mode
 #: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Дүгн�лт хийгд�х��р %s доторх н�м�гдлүүд байхгүй байна."
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 өдрийн"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 цагийн"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 минутын"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "За�варлагч х�нах �амбар"
 
-#: controllers/editors_controller.php:286
+#. %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 "зөвхөн %s "
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Урьдчил�ан хувилбар"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2757,19 +4710,24 @@ msgstr "Ц�в�рх�н"
 msgid "editors_queue_submit_filter"
 msgstr "Шүүлтүүр"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "Одоогоор бүх үн�лж дүгн�х дараалал хоригд�он. Дараа дахин шалгана уу."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Үн�лж дүгн�х �вц"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "�ийтийн хууда� руу оруулах"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Супер дүгн�гчийн хү��лт"
 
@@ -2777,34 +4735,42 @@ msgstr "Супер дүгн�гчийн хү��лт"
 msgid "editors_review_action_sandbox"
 msgstr "Түр хайрцагт үлд��х"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Тайлбарт үн�лг�� дүгн�лт хийх"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "Эн� нь н�м�гд�л болон түүний хамгийн �үүлийн хувилбар ба файлуудыг олон "
 "нийтийн хууд�анд т�мд�гл�д�г. Дараагийн хувилбарууд нь зав�арлагчаар "
 "х�нагдах хүрт�л түр хайрцагт байрлах болно."
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Эн� нь н�м�гдлийг түр хайрцагт үлд��н�."
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Эн� нь нийтийн түр байрлуулах хайрцагт буй н�м�гдлийн хувилбарыг нийтийн "
 "хууд�анд харуулагдах �рх өгдөг."
 
-#: views/editors/review.thtml:162
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Эн� нь нийтийн түр байрлуулах хайрцагт буй н�м�гдлийн хувилбарыг түр "
 "хайрцагт үлд��д�г."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Х�р�в та �н� н�м�гдлийн нууцлал юмуу ��в�л зохиогчийн �рхт�й холбоотой "
@@ -2833,15 +4799,15 @@ msgstr "Төрлүүд:"
 msgid "editors_review_header_compatibility"
 msgstr "Зохицох �и�темүүд:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Тодорхойлолт"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Хөгжүүл�гчийн тайлбар"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2849,85 +4815,111 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Файлууд:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Түүх"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "��р д�вшүүл�лтийн тодорхойлолт"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Үзүүлб�р"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "%s үн�лг�� дүгн�лт хийх"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Үн�л�гчд�д зориул�ан т�мд�гл�л"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "��гтг���н м�д��л�л"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Хувилбарын т�мд�гл�л"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "Зохицуулагчийн үн�лг��"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "��р д�вшүүл�лт зөвшөөрөгд�өн/�ийтийн хууд�анд"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "��р д�вшүүл�лт цуцлагд�ан/Түр хайрцагт"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Ямар ч өмнөх үн�лг��ний оруулга олд�онгүй."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Зохицуулагчийн үн�лг��"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Зөвшөөрөгд�өн/�ийтийн хууд�анд"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Цуцлагд�ан/Түр хайрцагт"
 
-#: views/editors/review.thtml:198
+#. 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 "Програмууд:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "��в�л урьдчилан хадгал�ан хариулт �онгох:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Тайлбар:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Үйлдлийн �и�темүүд:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Д��д х���г рүү"
 
@@ -2936,7 +4928,7 @@ msgstr "Д��д х���г рүү"
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Үзүүлб�р олд�онгүй."
 
@@ -2945,42 +4937,49 @@ msgstr "Үзүүлб�р олд�онгүй."
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Үйлдлийн �вц"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Үйлд�л"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Тайлбар"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Огноо"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Х�наж дүгн���н"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Хувилбар/Файл"
 
-#: controllers/editors_controller.php:411
+#: 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 "Х�нах дүгн�лт амжилттай гүйц�тг�гдл��."
 
@@ -3002,11 +5001,19 @@ msgstr "�лга�"
 msgid "editors_reviews_header_action"
 msgstr "Үйлд�л"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: views/editors/reviews_queue.thtml:67
 msgid "editors_reviews_in_reply_to"
 msgstr "Хариу:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Х�налт дүгн�лтүүд амжилттай гүйц�тг�гдл��!"
 
@@ -3018,23 +5025,23 @@ msgstr "Х�наж дүгн�х ажил байхгүй байна."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Х�наж дүгн�лт хийх"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Ту�гай хууд�анд зориул�ан"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Шин�"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Шин�чл�гд��н"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Шалгагд�ан програмууд"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Шалга�ан үйлдлийн �и�темүүд"
 
@@ -3075,17 +5082,20 @@ msgstr "Үйлдлийн �и�тем"
 msgid "editors_th_submissiontypes"
 msgstr "Илг��х төрөл"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s өдөр"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s цаг"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s минут"
@@ -3094,8 +5104,8 @@ msgstr "%s минут"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Хандах �рхгүй"
 
@@ -3103,12 +5113,13 @@ msgstr "Хандах �рхгүй"
 msgid "error_access_denied_message"
 msgstr "Танд �н� хууд�ыг үз�х �рх байхгүй байна."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3118,18 +5129,19 @@ msgstr "Танд �н� хууд�ыг үз�х �рх байхгүй байна
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "��м�гд�л олд�онгүй!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Эн� н�м�гд�л �нд харуулагдах боломжгүй."
 
@@ -3138,7 +5150,7 @@ msgstr "Эн� н�м�гд�л �нд харуулагдах боломжгүй
 msgid "error_addon_selfreview"
 msgstr "You cannot review your own add-on."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Эн� төрөлд �мар ч н�м�гд�л алга!"
 
@@ -3160,24 +5172,25 @@ msgstr "Эн� хүчинт�й захианы ха�г биш байна."
 msgid "error_field_required"
 msgstr "Эн� талбар хоо�он байх ё�гүй."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Файл олд�онгүй!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Файлын алдаа: %s г�ж байхгүй байна."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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 "Эн� хү�н�гт�нд алдаа байна. Т�дг��рийг за�аад дахин илг��н� үү."
@@ -3195,16 +5208,18 @@ 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3223,7 +5238,7 @@ msgstr "Т�мд�гл�г��"
 msgid "error_preview_notfound"
 msgstr "Үзүүлб�р олд�онгүй!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Та дүгн�лт өгөхийг �онгох ё�той."
 
@@ -3276,8 +5291,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Х�р�гл�гчийн н�р ��в�л нууц үг буруу байна!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Хувилбар олд�онгүй!"
 
@@ -3289,13 +5304,14 @@ msgstr "Буруу нууц үг оруул�ан байна!"
 msgid "feature_learnmore"
 msgstr "��м�лт м�д��л�л"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "%1$s-н талаар н�мж м�д�х"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3307,6 +5323,45 @@ msgstr[1] "үн�лг��нүүд"
 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Бүх �рх хуулиар хамгаалагд�ан."
@@ -3343,7 +5398,7 @@ msgstr "Бу�ад х�л д��р:"
 msgid "footer_privacy_policy"
 msgstr "Хувь хүнд холбогдолтой м�д��ллийг хамгаалах журам"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Хадгал"
 
@@ -3351,7 +5406,7 @@ msgstr "Хадгал"
 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Үгийн �ангууд"
@@ -3360,7 +5415,7 @@ msgstr "Үгийн �ангууд"
 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Өргөтгөлүүд"
@@ -3369,7 +5424,7 @@ msgstr "Өргөтгөлүүд"
 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Х�лний багцнууд (��м�гдлийн)"
@@ -3378,7 +5433,7 @@ msgstr "Х�лний багцнууд (��м�гдлийн)"
 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Х�лний багцнууд (Програмын)"
@@ -3387,7 +5442,7 @@ msgstr "Х�лний багцнууд (Програмын)"
 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Плагинууд"
@@ -3396,7 +5451,7 @@ msgstr "Плагинууд"
 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:111
 msgid "general_addontype_search_plural"
 msgstr "В�бд хайгчид"
@@ -3405,11 +5460,12 @@ msgstr "В�бд хайгчид"
 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Харуулах ма�гууд"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3440,12 +5496,12 @@ msgid "header_navlink_addons"
 msgstr "��м�гдлүүд"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Гарах"
 
@@ -3453,38 +5509,43 @@ msgstr "Гарах"
 msgid "header_navlink_myaccount"
 msgstr "Миний бүртг�л"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Бүртгүүл�х"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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
+#. %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 ""
 "Та �н� н�м�гдлийг �уулгахын тулд <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/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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3507,7 +5568,7 @@ msgid "langtools_download_langpack"
 msgstr "Х�лний багц татаж авах"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Үгийн �ан болон х�лний багц"
 
@@ -3564,7 +5625,7 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3598,7 +5659,7 @@ msgstr "Харуулах ма�гууд"
 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:214
 msgid "other_users"
 msgstr "бу�ад"
@@ -3613,42 +5674,41 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_experimental_addons"
 msgstr "Experimental Add-ons"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 #, fuzzy
 msgid "page_title_policy"
 msgstr "Add-ons Policy"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 #, fuzzy
 msgid "page_title_privacy"
 msgstr "Mozilla Privacy Policy"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 #, fuzzy
 msgid "page_title_review_guide"
 msgstr "Review Guidelines"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 #, fuzzy
 msgid "page_title_sandbox"
 msgstr "Sandbox Review System"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 #, fuzzy
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
@@ -3668,6 +5728,7 @@ msgstr ""
 "н�г�нд нь тохирох install.rdf файлтай байх ё�той. Доорх харуул�ан хувилбарын "
 "жаг�аалт  т�дг��р програмд тохиромжтой байна."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3675,6 +5736,8 @@ 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:92
 msgid "pages_appversions_required_files_link"
 msgstr "�нд"
@@ -3683,7 +5746,6 @@ msgstr "�нд"
 msgid "pages_appversions_versions"
 msgstr "Хувилбарууд"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Өмнөх хууд�анд буцах"
 
@@ -3695,7 +5757,7 @@ 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"
@@ -3722,8 +5784,8 @@ 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
+#. %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"
@@ -3731,8 +5793,8 @@ 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
+#. %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"
@@ -3750,7 +5812,7 @@ msgstr "Are you human?"
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Эн� үн�лг��ний т�мд�гл�лд алдаа гарлаа!"
 
@@ -3780,7 +5842,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr ""
 "Танд ба�рлалаа, �н� үн�лг�� нь за�варлагчаар зөвшөөрөгдөхөөр т�мд�гл�гд�в."
@@ -3795,7 +5857,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:48
 #, fuzzy
 msgid "review_guidelines_short"
@@ -3813,21 +5875,22 @@ msgstr ""
 "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:54 views/reviews/display.thtml:54
 #: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "%s-н үн�лг�� дүгн�лт"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Онцгой шинж чанартай н�м�гдлүүд"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Шин� н�м�гдлүүд"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Шин�чл�гд��н н�м�гдлүүд"
 
@@ -3866,6 +5929,7 @@ msgstr "Бүх хайлт хийгчд�д"
 msgid "search_landing_browse_search_engines"
 msgstr "Хайлт хийгчдийг харуул"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3885,12 +5949,13 @@ msgstr "��м�гд�л хайх"
 msgid "search_rss_description"
 msgstr "Хайлтын үр дүнгийн товч м�д��"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Хайлтын үр дүн: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Зохицуулагчын х�р�г��л"
 
@@ -3898,7 +5963,7 @@ msgstr "Зохицуулагчын х�р�г��л"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Хөгжүүл�гчийн х�р�г��л"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "За�варлагчийн х�р�г��л"
 
@@ -3906,6 +5971,7 @@ msgstr "За�варлагчийн х�р�г��л"
 msgid "sidebar_navlink_welcome"
 msgstr "Тавтай морилно уу"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3943,6 +6009,7 @@ msgstr "Харуулах ма�г"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Шин�чл�гд��н н�м�гдлүүд"
 
+#. %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
@@ -3954,7 +6021,7 @@ msgstr "%1$s KБ"
 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3972,24 +6039,32 @@ msgstr "Хөгжүүл�гчийн багаж"
 msgid "statistics_addon_switch"
 msgstr "��м�гд�лд ��лг�х"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "M. j"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "Y. M. j"
 
+#. 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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -4031,7 +6106,7 @@ msgstr "Судалгааны �амбар"
 msgid "statistics_index_view_button"
 msgstr "Судалгааг харах"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
@@ -4049,7 +6124,7 @@ msgstr "Эн� харуулалтыг у�тга"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
@@ -4059,104 +6134,109 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s �удалгаа олдов"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Харуулалт н�м�х"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Эн� графикт өөр харуулалт н�м�х"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "�ийт тоог нуу"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "�ийт тоог харуул"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Өгөгдлийг харах (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Эн� өгөгдлийг та�лалаар ту�гаарлагд�ан х�лб�р��р авах"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "%s үйл �вцыг нуух"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "%s үйл �вцыг харуул"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Харуулалт д��р н�м�гдлийн гар�ан огноог дар"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Firefox үйл �вцыг нуу"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Firefox үйл �вцыг харуул"
 
-#: controllers/statistics_controller.php:241
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Харуулалт д��р Firefox гар�ан огнооог нуу"
 
-#: controllers/statistics_controller.php:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Графикийг хураа"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Графикийг д�лг�"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Графикийн х�мж��г өөрчил"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Өдөржин х�р�гл�д�г ид�вхит�й х�р�гл�гчид"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Програмууд"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Бу�ад төрлийн"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Татаж авалт"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Үйлдлийн �и�тем"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "��м�гдлийн төлөв байдал"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Дүгн�лт"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "��м�гдлийн хувилбар"
 
@@ -4180,13 +6260,13 @@ msgstr "Үл м�д�гд�х"
 msgid "statistics_longnames_version"
 msgstr "��м�гдлийн хувилбар"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "Эн� графикийг харуулах хангалттай өгөгдөл байхгүй байна. Сүүлд дахин шалгана "
 "уу."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "Таны н�м�гд�лд зориулагд�ан өгөгдөл бид�нд алга байна. Х�д�н өдрийн дараа та "
@@ -4199,11 +6279,11 @@ msgstr ""
 "болов�руулж байх үед оруул�ан �үүлийн м�д��ллүүд хамрагдахгүй байж магадгүй. "
 "Х�д�н минутын дараа �рг�ж шалгана уу."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "Судалгааны �амбар одоогоор хоригд�оно. Сүүлд дахин шалгана уу."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "Судалгааны �амбарт график харуулахын тулд Жаава�крипт шаардлагатай."
 
@@ -4218,36 +6298,36 @@ msgstr "Таны тохиргоо шин�чл�гд��н!"
 msgid "statistics_pagetitle"
 msgstr "Судалгааны �амбар"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Өдөржин х�р�гл�д�г ид�вхит�й х�р�гл�гчид"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Өдрийн татаж авалт"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Томруулж харуул"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "��г �арын харуулалтыг томруул"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Бага�гаж харуул"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "��г �арын харуулалтаар бага�гаж харуул"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "%1$s-н �удалгааны н�г өдрийн үзүүл�лт"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Дүгн���н өгөгдлийн RSS м�д��л�лт"
 
@@ -4288,23 +6368,23 @@ msgstr "�ийтийн"
 msgid "statistics_settings_access_public_description"
 msgstr "Эн� н�м�гдлийн �удалгааны үр дүнг хүн болгон харна"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Тохиргоог өөрчил"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Эн� м�д��ллийг хувийн чухал г�ж тооцож хандана уу."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Эн� �амбар одоогоор <b>хувийн</b> г���н тохируулгатай."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Эн� �амбар одоогоор <b>нийтийн</b> г���н тохируулгатай."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Түгжигд��н"
 
@@ -4321,7 +6401,7 @@ msgstr "Тохиргоог хадгал"
 msgid "statistics_settings_title"
 msgstr "%1$s-н �удалгааны �амбарын тохиргоо"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Түгжигд��гүй"
 
@@ -4345,7 +6425,7 @@ msgstr "ҮМ"
 msgid "statistics_shortnames_version"
 msgstr "Хув"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Өдрийн дундаж татаж авалт"
 
@@ -4353,37 +6433,37 @@ msgstr "Өдрийн дундаж татаж авалт"
 msgid "statistics_summary_downloads_heading"
 msgstr "Татаж авалт"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Өгөгдөл байхгүй"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%2$s-нд %1$s "
@@ -4392,17 +6472,17 @@ msgstr "%2$s-нд %1$s "
 msgid "statistics_summary_updatepings_heading"
 msgstr "Өдрийн ид�вхит�й х�р�гл�гчид"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: 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:147
+#: 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:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s �удалгаа"
@@ -4427,7 +6507,7 @@ msgstr "�ууц үг�� �олих"
 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:49
 #, fuzzy
 msgid "user_del_account_deleted"
@@ -4451,7 +6531,7 @@ msgstr "Confirm Password"
 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:62
 #, fuzzy
 msgid "user_del_error_addons"
@@ -4461,7 +6541,7 @@ msgstr ""
 "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:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
@@ -4479,7 +6559,7 @@ msgstr ""
 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:83
 #, fuzzy
 msgid "user_del_error_unknown"
@@ -4492,7 +6572,7 @@ msgstr ""
 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:93
 #, fuzzy
 msgid "user_del_header_delete_account"
@@ -4522,7 +6602,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
@@ -4541,7 +6621,7 @@ msgstr "I understand that this step cannot be undone."
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4554,9 +6634,9 @@ msgstr ""
 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
+#. 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"
@@ -4576,7 +6656,7 @@ msgstr ""
 "%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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4601,8 +6681,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
 #, php-format
 msgid "user_email_pwreset"
@@ -4629,7 +6709,7 @@ msgstr "%s н�м�гдлийн нууц үг�� өөрчлөх"
 msgid "user_emailchange_error"
 msgstr "�лдаа!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4639,7 +6719,7 @@ msgstr "Та %1$s н�м�гд�л д��рх захианы ха�гийн өө
 msgid "user_emailchange_success"
 msgstr "�мжилттай!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4814,7 +6894,7 @@ msgstr "�ууц үг өөрчлөх холбоо� илг��х"
 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"
@@ -4822,7 +6902,7 @@ msgstr ""
 "Таны бүртг�лийг ид�вхжүүл�х холбоо� таны захианы %1$s ха�г руу илг��гд��н. %2"
 "$s н�м�гд�л рүү н�втр�х����� өмнө т�р холбоо� д��р дарах ё�той."
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4839,7 +6919,7 @@ msgstr "баталгаажуул�ан захиаг дахин илг��ж"
 msgid "user_register_congratulations"
 msgstr "Ба�р хүрг�е! Таны х�р�гл�гчийн бүртг�л амжилттай бүртг�гдл��."
 
-# %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"
@@ -4849,7 +6929,7 @@ msgstr ""
 "магадгүй. Х�р�в танд х�р�гт�й бол д��р өгүүл��н захианы ха�г руу бид  %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4913,7 +6993,7 @@ msgstr "Гоц н�р"
 msgid "users_info_pagetitle"
 msgstr "%1$s х�р�гл�гчийн м�д��л�л"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
@@ -4923,8 +7003,8 @@ msgstr "Reviews by %s"
 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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4933,8 +7013,8 @@ 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
+#. %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"
@@ -4950,3 +7030,33 @@ msgstr "�ууц үг шин��р оруулах"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Шин� х�р�гл�гчийн бүртг�л"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Хамгийн �үүлийн тохирох хувилбар"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "sidebar_navlink_tools"
+#~ msgstr "Х�р�г�лүүд"
diff --git a/site/app/locale/nl/LC_MESSAGES/messages.po b/site/app/locale/nl/LC_MESSAGES/messages.po
index 36b7592..6d66b4d 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-02-07 07:51+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"
@@ -21,6 +21,10 @@ msgstr ""
 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 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
@@ -49,38 +53,34 @@ msgstr "Publiek"
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Toegevoegd op %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Bijgewerkt op %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versie %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "downloads in totaal"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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
+#. %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"
@@ -97,22 +97,22 @@ msgstr "per pagina"
 msgid "addon_list_sortby"
 msgstr "Sorteren op:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "aanbevolen"
 
-# %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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s is niet beschikbaar voor %2$s."
 
-# %1 is the addon name
+#. %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
@@ -121,7 +121,7 @@ msgstr "%1$s is niet beschikbaar voor %2$s."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Terug naar %1$s…"
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -140,6 +140,7 @@ msgstr "Beoordeling:"
 msgid "addon_review_add_submit"
 msgstr "Uw beoordeling indienen"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -173,23 +174,25 @@ msgstr "Ja"
 msgid "addon_review_delete_header"
 msgstr "Beoordeling verwijderen"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Beoordeling succesvol verwijderd."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Beoordeling voor %s bewerken"
 
-# %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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 ""
 "Probleem bij aanduiden van de beoordeling: Opmerkingen voor aangeduide "
 "beoordelingen zijn gelimiteerd tot tussen 10 en 100 karakters; het aantal "
 "karakters was %1$s."
 
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -200,7 +203,7 @@ msgstr ""
 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.
+#. %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"
@@ -208,16 +211,16 @@ msgid_plural "addon_review_others_by_user"
 msgstr[0] "Zie ook %1$s eerdere beoordeling door %2$s voor deze add-on."
 msgstr[1] "Zie ook %1$s eerdere beoordelingen door %2$s voor deze add-on."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Beoordelingen voor %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -231,13 +234,13 @@ msgstr "Antwoord ontwikkelaar:"
 msgid "addon_review_saved_successfully"
 msgstr "Uw beoordeling is succesvol opgeslagen. Bedankt!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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
+#. %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
@@ -260,11 +263,13 @@ msgstr "Vorige add-on"
 msgid "addon_version_permalink"
 msgstr "Permanente koppeling naar deze versie"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "De meest recente versie die compatibel is met"
+#. %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 "De meest recente versie die compatibel is met %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Indienen"
 
@@ -272,19 +277,20 @@ msgstr "Indienen"
 msgid "addons_author_tooltip"
 msgstr "Profiel van de schrijver bekijken"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "Door alle thema’s bladeren :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "Door alle thema’s in de categorie %1$s bladeren :: %2$s Add-ons"
 
@@ -292,7 +298,7 @@ msgstr "Door alle thema’s in de categorie %1$s bladeren :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "Beoordeling toevoegen"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Geavanceerde details"
 
@@ -300,11 +306,11 @@ msgstr "Geavanceerde details"
 msgid "addons_display_categories"
 msgstr "Categorieën"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "gedetailleerde beoordeling"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Niet geweldig"
@@ -313,143 +319,149 @@ msgstr "Niet geweldig"
 msgid "addons_display_edit_review"
 msgstr "Uw beoordeling bewerken"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Deze add-on kent een privacybeleid."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Opmerkingen van de ontwikkelaar"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Startpagina"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Beoordelingen"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Ondersteuning"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Niet slecht"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Uitgebreide beschrijving"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Meer afbeeldingen"
 
-# %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:421
-#, fuzzy
+#. %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] "Andere add-ons door %1$s"
-msgstr[1] "Other add-ons by these authors"
+msgstr[1] "Andere add-ons door deze schrijvers"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "De ontwikkelaar biedt ondersteuning voor deze add-on op %s."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "De ontwikkelaar biedt ondersteuning voor deze add-on op %s of u kunt een e-"
 "mailbericht sturen aan %s."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Waarderen"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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 "
 "beschikbaar aan ontwikkelaars van add-ons en ze willen mogelijk contact met "
 "u opnemen om te helpen bij het oplossen van uw probleem."
 
-# %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "Kijk in de <a href=\"%1$s\">ondersteuningssectie</a> voor het verkrijgen van "
 "ondersteuning voor deze add-on."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Opslaan"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Alle beoordelingen bekijken (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Alle versies bekijken"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Volledige versiegeschiedenis"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Bron bekijken"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Statistieken bekijken"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Wat vindt u er van?"
 
@@ -459,7 +471,7 @@ msgstr "Werkt met:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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"
@@ -470,10 +482,11 @@ msgstr "door"
 msgid "addons_home_feature_head"
 msgstr "Wij bevelen aan:"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -488,7 +501,9 @@ msgstr "Nieuwste:"
 msgid "addons_home_other_applications"
 msgstr "Overige toepassingen"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -498,19 +513,20 @@ msgstr "Overige toepassingen"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -606,6 +622,7 @@ msgstr "voor Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "voor Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -626,12 +643,13 @@ msgstr ""
 "bestanden. Plug-ins zijn anders dan extensies, die bestaande functionaliteit "
 "wijzigen of er iets aan toevoegen."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Veelgebruikte plug-ins voor %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Plug-ins"
 
@@ -642,6 +660,7 @@ msgstr "Plug-ins"
 msgid "addons_plugins_support_documentation"
 msgstr "Ondersteunende documentatie: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -649,25 +668,25 @@ msgstr ""
 "%s vereist de acceptatie van de volgende gebruiksrechtovereenkomst (End User "
 "License Agreement) voordat u kunt doorgaan met installeren:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Voorbeeldweergaven voor %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Aanbevolen add-ons"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Aanbevolen add-ons"
 
@@ -675,7 +694,7 @@ msgstr "Aanbevolen add-ons"
 msgid "addons_searchengines_additional_resources"
 msgstr "Aanvullende hulpbronnen"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Ontwikkelingscentrum"
@@ -693,35 +712,35 @@ msgstr ""
 "dit hebt uitgeschakeld.  Schakel a.u.b. JavaScript in voordat u één van "
 "onderstaande zoekplug-ins probeert te installeren."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %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 "Leer hoe u uw %1$s kunt maken op het %2$s."
 
-# link path to search plugins instructions, relative to devmo
+#. 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 "/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:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "eigen zoekmachine"
 
-# %1 is the link to mycroft.mozdev.org
+#. %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 "Blader door meer zoekmachines op %1$s"
 
-# link text to mycroft.mozdev.org
+#. 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:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Zoekmachines"
 
@@ -735,7 +754,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Uitgeschakeld"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Onvolledige versie"
 
@@ -773,11 +792,12 @@ msgstr ""
 "Deze versies worden als referentie en voor testdoeleinden weergegeven. U "
 "dient altijd de meest recente versie van een add-on te gebruiken."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Versiegeschiedenis met overzicht van wijzigingen"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s versiegeschiedenis"
@@ -790,6 +810,7 @@ msgstr "Groep toevoegen"
 msgid "admin_group_delete_pagetitle"
 msgstr "Groep verwijderen"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -915,16 +936,20 @@ msgstr "Versiecontrole negeren"
 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: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: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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -937,23 +962,23 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Werk Firefox bij</a> om deze add-on te "
 "gebruiken"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Add-ons op naam"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Nieuwste add-ons"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Populaire add-ons"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Add-ons op waardering"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Onlangs bijgewerkte add-ons"
 
@@ -985,7 +1010,7 @@ msgstr "Laatst bijgewerkt eerst"
 msgid "category_extra_mostpopular"
 msgstr "Populairste eerst"
 
-# %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"
@@ -995,11 +1020,19 @@ msgstr "Alle %1$s bekijken"
 msgid "collection_not_found"
 msgstr "Collectie niet gevonden!"
 
+#. %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"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
@@ -1032,6 +1065,8 @@ msgstr "De maxVersion aanpassen zonder uploaden"
 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:130
 msgid "compatibility_developers_login_first"
 msgstr ""
@@ -1055,6 +1090,10 @@ msgstr "Resultaten add-onstatuscontrole"
 msgid "compatibility_developers_retrieving"
 msgstr "Status van gehoste add-ons wordt opgehaald…"
 
+#. %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 gebruikers van %2$s (%3$s&#37; van het totaal)"
@@ -1069,6 +1108,8 @@ msgstr ""
 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:69
 msgid "compatibility_report_intro"
 msgstr ""
@@ -1080,6 +1121,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alfaversies"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Add-ons die compatibel zijn met een alfaversie van %1$s"
@@ -1088,6 +1130,7 @@ msgstr "Add-ons die compatibel zijn met een alfaversie van %1$s"
 msgid "compatibility_report_legend_beta"
 msgstr "Betaversies"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
@@ -1097,6 +1140,7 @@ msgstr ""
 msgid "compatibility_report_legend_latest"
 msgstr "Laatste versie"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Add-ons die geschikt zijn voor de laatste builds van %1$s"
@@ -1105,6 +1149,7 @@ msgstr "Add-ons die geschikt zijn voor de laatste builds van %1$s"
 msgid "compatibility_report_legend_other"
 msgstr "Overige versies"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Add-ons die niet compatibel zijn met enige versie van %1$s"
@@ -1122,12 +1167,13 @@ msgstr "Informatie voor add-ongebruikers"
 msgid "compatibility_view_report"
 msgstr "Compatibiliteitsrapport bekijken"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: 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:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "Wiki-pagina"
 
@@ -1169,26 +1215,35 @@ msgstr ""
 "onder een <a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative "
 "Commons Attribution 2.5 licentie</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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)
+#. 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"
@@ -1214,14 +1269,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 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"
@@ -1269,36 +1352,36 @@ msgstr "Stap 5: Succes"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Hulp bij indienen"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Add-on succesvol uitgeschakeld"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Add-on bewerken"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Add-on succesvol ingeschakeld"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Add-onbeschrijving"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Add-onstartpagina"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Add-onnaam"
 
@@ -1307,40 +1390,298 @@ msgstr "Add-onnaam"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Titel van voorbeeldweergave"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Privacybeleid"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Add-onsamenvatting"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "E-mailadres voor ondersteuning"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL voor ondersteuning"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Versieopmerkingen"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Add-on voordragen"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Add-on succesvol voorgedragen!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1363,7 +1704,7 @@ msgstr ""
 "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
+#. %1 is the link to the sandbox information page
 #: views/developers/add_step5.thtml:63
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1373,7 +1714,7 @@ msgstr "U kunt %s meer lezen over het Sandbox-beoordelingssysteem."
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "hier"
 
-# %1 is the "nominate" link
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1396,16 +1737,16 @@ msgstr ""
 "Omdat uw add-on wordt vertrouwd is deze versie automatisch goedgekeurd voor "
 "het publieke domein."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Add-on inzenden"
 
-#: controllers/developers_controller.php:2375
+#: controllers/developers_controller.php:2460
 msgid "devcp_addon_updated_successfully"
 msgstr "Add-on succesvol bijgewerkt"
 
-# %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"
@@ -1415,7 +1756,7 @@ msgstr "U kunt %s om de interesse in uw add-on te vergroten."
 msgid "devcp_addon_upload_preview_link"
 msgstr "een voorbeeldweergave uploaden"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1444,10 +1785,102 @@ msgstr "Volgende"
 msgid "devcp_change_addontype"
 msgstr "Add-ontype wijzigen:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "Opmerkingen van ontwikkelaar bijgewerkt."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Voorbeeldweergave toevoegen"
@@ -1540,6 +1973,7 @@ msgstr "De ontwikkelaar heeft geen URL voor ondersteuning opgegeven."
 msgid "devcp_details_trusted"
 msgstr "Vertrouwd"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1569,6 +2003,7 @@ msgstr ""
 "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"
@@ -1589,11 +2024,58 @@ msgstr ""
 "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"
+
+#: views/developers/discuss.thtml:57
+msgid "devcp_discuss_allreplies_header"
+msgstr "Antwoorden"
+
+#. 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 ""
+"Er is een fout opgetreden bij het opslaan van uw antwoord. Neem a.u.b. "
+"contact op met %1$s hierover."
+
+#. %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 ""
+"Een Mozilla Add-onseditor heeft meer informatie bij u aangevraagd met "
+"betrekking tot versie %2$s van uw add-on %1$s."
+
+#. %1 is the add-on name
+#: views/developers/discuss.thtml:43
+msgid "devcp_discuss_pagetitle"
+msgstr "Meer informatie geven voor de Add-onbeoordeling van %1$s"
+
+#. submit button text
+#: views/developers/discuss.thtml:79
+msgid "devcp_discuss_submit_reply"
+msgstr "Antwoord indienen"
+
+#: views/developers/discuss.thtml:72
+msgid "devcp_discuss_success_message"
+msgstr ""
+"Uw antwoord is succesvol opgeslagen. De overige deelnemers aan de discussie "
+"worden via e-mail geïnformeerd."
+
+#. 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 "geschreven door %1$s op %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Schrijver toevoegen"
@@ -1606,10 +2088,297 @@ msgstr "E-mailadres van de schrijver"
 msgid "devcp_edit_author_remove"
 msgstr "Verwijderen"
 
+#: 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 "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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
+#, 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 "Schrijvers"
@@ -1675,6 +2444,206 @@ msgstr "Doellocale"
 msgid "devcp_edit_locale_disambiguation_explanation"
 msgstr "korte aanvullende informatie (zoals een lokale dialectnaam)"
 
+#: 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 "Bijwerken"
@@ -1685,11 +2654,66 @@ msgstr ""
 "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">eenvoudige "
 "localenaam</a>, zoals ‘en-US’"
 
+#: views/elements/developers/editbox.thtml:46
+#, fuzzy
+msgid "devcp_editbox_authors"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Aanbevolen add-ons"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1698,7 +2722,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Gescreende beoordeling (%s)"
 msgstr[1] "Gescreende beoordelingen (%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
 #, php-format
@@ -1707,7 +2731,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Voorgedragen add-on (%s)"
 msgstr[1] "Voorgedragen add-ons (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1720,8 +2744,8 @@ msgstr[1] "Wachtende updates (%s)"
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "Aangevinkte bestanden worden verwijderd."
 
-# %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"
@@ -1747,29 +2771,30 @@ msgstr "Opmerkingen voor de beoordelaar"
 msgid "devcp_editversion_submit_update"
 msgstr "Bijwerken"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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: "
@@ -1778,21 +2803,35 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Lees a.u.b. %s als naslag."
 
+#. 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 "deze pagina"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, fuzzy, php-format
+msgid "devcp_error_file_exists"
+msgstr ""
+"Er bestaat al een versie van die add-on. Om deze te vervangen dient u eerst "
+"het bestand %1$s te verwijderen."
+
+#. %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"
@@ -1800,7 +2839,7 @@ 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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Niet alle bestands-GUIDs kloppen"
 
@@ -1829,6 +2868,8 @@ msgstr "Groter dan de maximale uploadgrootte"
 msgid "devcp_error_http_nofile"
 msgstr "Geen bestand ge-upload"
 
+#. %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"
@@ -1836,14 +2877,15 @@ msgstr ""
 "Die bestandsextensie (%s) is niet toegestaan voor een pictogram. Gebruik a.u."
 "b. één van de volgende: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "install.rdf ontbreekt."
 
@@ -1851,21 +2893,26 @@ msgstr "install.rdf ontbreekt."
 msgid "devcp_error_install_manifest"
 msgstr "De volgende fouten zijn aangetroffen in install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Selecteer a.u.b. een geldig add-ontype."
 
+#. %$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 "%s is geen geldige versie voor %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "De ID van deze add-on is ongeldig: %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"
@@ -1883,6 +2930,7 @@ msgid "devcp_error_invalid_version_spaces"
 msgstr ""
 "De versie van deze add-on is ongeldig: versies kunnen geen spaties bevatten."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1892,6 +2940,7 @@ msgstr "De volgende fout is opgetreden bij het ontleden van install.rdf: %s"
 msgid "devcp_error_move_file"
 msgstr "Bestand kon niet verplaatst worden"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1914,15 +2963,15 @@ 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:2718
+#: 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:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "U kunt geen pre-release add-on voordragen."
 
-#: controllers/developers_controller.php:2704
+#: 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 "
@@ -1936,6 +2985,8 @@ msgstr "Selecteer a.u.b. ten minste één categorie."
 msgid "devcp_error_one_user"
 msgstr "Er dient ten minste één schrijver voor deze add-on te zijn."
 
+#. %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"
@@ -1943,13 +2994,13 @@ msgstr ""
 "Die bestandsextensie (%s) is niet toegestaan voor een voorbeeldweergave. "
 "Gebruik a.u.b. één van de volgende: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "U hebt geen rechten om deze add-on bij te werken."
 
@@ -1965,7 +3016,7 @@ 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Upload a.u.b. een bestand."
@@ -2188,7 +3239,7 @@ msgstr "Mijn add-ons"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Gelocaliseerde velden"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2233,33 +3284,68 @@ msgstr "Add-on indienen"
 msgid "devcp_myaddons_title"
 msgstr "Ontwikkelaarshulpmiddelen"
 
+#. %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 "Terug naar add-ondetails"
 
-# %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 voordragen"
 
-# %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 "Automatisch gedetecteerd add-ontype: %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 ""
 "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)
+#. %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"
@@ -2275,9 +3361,14 @@ msgstr ""
 "Door dit de standaardvoorbeeldweergave te maken zal de standaardstatus van "
 "de huidige standaardvoorbeeldweergave vervallen."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2306,6 +3397,60 @@ msgstr "Voorbeeldweergave bewerken"
 msgid "devcp_preview_updated_successfully"
 msgstr "Voorbeeldweergave succesvol bijgewerkt."
 
+#: 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 ""
@@ -2317,10 +3462,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Voorbeeldweergave toevoegen"
 
+#: 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 "Voorbeeldweergave bewerken"
 
+#: 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 "Voorbeeldweergave-bestand"
@@ -2329,6 +3484,34 @@ msgstr "Voorbeeldweergave-bestand"
 msgid "devcp_previews_label_makedefault"
 msgstr "Van deze afbeelding de standaardvoorbeeldweergave maken"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Voorbeeldweergave verwijderen"
@@ -2345,58 +3528,173 @@ msgstr "Voorbeeldweergave bewerken"
 msgid "devcp_previews_submit_upload"
 msgstr "Voorbeeldweergave uploaden"
 
+#: 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 "Onjuist?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Weet u zeker dat u dit bestand wilt verwijderen?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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 "
 "verder gaat."
 
+#: 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 "Het bijwerken van mijn huidige add-oninformatie overslaan"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> actieve dagelijkse gebruikers"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> downloads in totaal"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> downloads per week"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "Indienen van add-ons is momenteel niet mogelijk. Probeer het later nog eens."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Ik accepteer dit"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Ik accepteer dit niet"
 
@@ -2412,11 +3710,11 @@ msgstr "Uitgeschakeld"
 msgid "devcp_summary_header_trusted"
 msgstr "Vertrouwd"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Laatste versie:"
 
-# %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"
@@ -2426,7 +3724,7 @@ msgstr "U hebt geen add-ons. Klik %s om er een in te dienen."
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "hier"
 
-# %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"
@@ -2436,30 +3734,667 @@ msgstr "Zorg er a.u.b. voor een %s voor uw thema."
 msgid "devcp_theme_upload_preview_link"
 msgstr "voorbeeldweergave te uploaden"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Lees a.u.b. %s als naslag."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "deze pagina"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Versie bewerken"
 
-#: controllers/developers_controller.php:2572
+#: 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 "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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Deze add-on is uitgeschakeld"
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "Deze add-on is niet genomineerd."
+
+#: controllers/components/editors.php:213
+msgid "editor_review_error_file_not_pending"
+msgstr "Dit bestand wacht niet op beoordeling."
+
+#. Actions are, for example: approving or rejecting
+#: controllers/components/editors.php:79
+#: controllers/components/editors.php:182
+msgid "editor_review_error_no_action"
+msgstr "Selecteer a.u.b. een beoordelingsactie."
+
+#: controllers/components/editors.php:192
+msgid "editor_review_error_no_applications"
+msgstr "Voer a.u.b. de toepassingen in die u getest hebt."
+
+#. 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 "Voer a.u.b. beoordelingsopmerkingen in."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Selecteer a.u.b. ten minste één bestand om te beoordelen."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "Selecteer a.u.b. de besturingssystemen die u getest hebt."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filteren"
@@ -2468,7 +4403,7 @@ msgstr "Filteren"
 msgid "editorcp_logs_filter_by"
 msgstr "Filteren op type/actie"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Gebeurtenissenlogboek"
 
@@ -2520,6 +4455,7 @@ msgstr "Opmerkingen verbergen"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Opmerkingen weergeven"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2529,7 +4465,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Logboek van beoordelingen"
 
@@ -2553,24 +4489,24 @@ msgstr "Recente editor-activiteit"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Totaal aantal beoordelingen"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Add-on beoordelen"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Vul a.u.b. de volgende velden in:"
 
-#: controllers/editors_controller.php:461
+#: 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:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Zelfbeoordelingen zijn niet toegestaan."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Externe software"
 
@@ -2582,39 +4518,39 @@ msgstr "Aanbeveling toevoegen"
 msgid "editors_featured_add_feature_submit"
 msgstr "Toevoegen"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Verwijderen van aanbeveling gelukt."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Aanbevolen add-ons"
 
@@ -2648,39 +4584,40 @@ msgstr ""
 "Deze filters zullen gedurende deze sessie toegepast blijven, tenzij ze "
 "worden gewist."
 
-# %1 is the queue mode
+#. %1 is the queue mode
 #: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "het laatste etmaal"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "het laatste uur"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "de laatste minuut"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Editor controlevenster"
 
-#: controllers/editors_controller.php:286
+#. %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 "Alleen %s"
 
-#: controllers/editors_controller.php:301
+#: 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:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2694,21 +4631,25 @@ msgstr "Wissen"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Actie beoordelen"
 
+#: views/editors/review.thtml:153
+msgid "editors_review_action_info"
+msgstr "Meer informatie aanvragen"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Naar publieke site doorzetten"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Super-beoordeling aanvragen"
 
@@ -2716,34 +4657,41 @@ msgstr "Super-beoordeling aanvragen"
 msgid "editors_review_action_sandbox"
 msgstr "In sandbox houden"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Opmerkingen beoordelen"
 
-#: views/editors/review.thtml:167
+#: 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: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:170
+#: 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:159
+#: 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:162
+#: 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:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Als u twijfels hebt bij de beveiliging van een add-on, vraagtekens over "
@@ -2771,15 +4719,15 @@ msgstr "Categorieën:"
 msgid "editors_review_header_compatibility"
 msgstr "Compatibiliteit:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Beschrijving"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Opmerkingen van de ontwikkelaar"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2787,85 +4735,108 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Bestanden:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Geschiedenis"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Voordrachtsbericht"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Voorbeeldweergave"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Privacybeleid"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Beoordeling %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Opmerkingen voor de beoordelaar"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Samenvatting"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Versieopmerkingen"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Antwoord"
+
+#: views/elements/developers/editors_review_history_item.thtml:78
+msgid "editors_review_history_info_request"
+msgstr "Informatieaanvraag"
+
+#: views/elements/developers/editors_review_history_item.thtml:62
+#: views/editors/reviewlog.thtml:77
 msgid "editors_review_history_nominated_adminreview"
 msgstr "Beoordeling door beheerder"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Voordracht goedgekeurd/Publiek"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Voordracht afgewezen/Sandbox"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Er zijn geen voorgaande beoordelingsingaven gevonden."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Beoordeling door beheerder"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Goedgekeurd/Publiek"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Afgewezen/Sandbox"
 
-#: views/editors/review.thtml:198
+#. 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] "Antwoord weergeven/verbergen"
+msgstr[1] "Antwoorden (%1$s) weergeven/verbergen"
+
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Toepassingen:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "of selecteer een voorgedefinieerd antwoord:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Opmerkingen:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Besturingssystemen:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Bovenzijde"
 
@@ -2873,7 +4844,7 @@ msgstr "Bovenzijde"
 msgid "editors_review_next_link"
 msgstr "volgende &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Geen voorbeeldweergaven gevonden."
 
@@ -2881,41 +4852,47 @@ msgstr "Geen voorbeeldweergaven gevonden."
 msgid "editors_review_previous_link"
 msgstr "&laquo; vorige"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %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>nr. %1$s</strong> van %2$s in wachtrij"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Actie afhandelen"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Actie"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Opmerkingen"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Datum"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Beoordelaar"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versie/Bestand"
 
-#: controllers/editors_controller.php:411
+#: 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:422
 msgid "editors_reviewed_successfully"
 msgstr "Beoordeling succesvol afgehandeld."
 
@@ -2939,7 +4916,7 @@ msgstr "Actie"
 msgid "editors_reviews_in_reply_to"
 msgstr "In antwoord op:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Beoordelingen succesvol afgehandeld!"
 
@@ -2951,23 +4928,23 @@ msgstr "Er zijn momenteel geen te screenen beoordelingen."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Beoordelingen afhandelen"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Site-specifiek"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Nieuw"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Bijgewerkt"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Geteste toepassing"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Geteste besturingssystemen"
 
@@ -3008,17 +4985,20 @@ msgstr "Platforms"
 msgid "editors_th_submissiontypes"
 msgstr "Aanvraagtypes"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dagen"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s uur"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minuten"
@@ -3027,8 +5007,8 @@ msgstr "%s minuten"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Toegang geweigerd"
 
@@ -3036,12 +5016,13 @@ msgstr "Toegang geweigerd"
 msgid "error_access_denied_message"
 msgstr "u hebt geen rechten om deze pagina te bekijken."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3051,18 +5032,19 @@ msgstr "u hebt geen rechten om deze pagina te bekijken."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Add-on niet gevonden!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Deze add-on kan hier niet worden bekeken."
 
@@ -3070,7 +5052,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:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Geen add-ons in deze categorie!"
 
@@ -3092,24 +5074,25 @@ msgstr "Dit is geen geldig e-mailadres."
 msgid "error_field_required"
 msgstr "Dit veld mag niet leeg zijn."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Bestand niet gevonden!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Bestandsfout: %s bestaat niet."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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 ""
@@ -3128,16 +5111,18 @@ msgstr ""
 "Deze URL heeft een ongeldige opmaak. Geldige URL’s lijken op http://"
 "voorbeeld.com/mijn_pagina."
 
+#. %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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3155,7 +5140,7 @@ msgstr "Opmerking"
 msgid "error_preview_notfound"
 msgstr "Voorbeeldweergave niet gevonden!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "U dient een waardering te selecteren."
 
@@ -3208,8 +5193,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Foutieve gebruikersnaam of wachtwoord!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versie niet gevonden!"
 
@@ -3221,13 +5206,14 @@ msgstr "Foutief wachtwoord ingegeven!"
 msgid "feature_learnmore"
 msgstr "Meer hierover"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Meer over %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3239,6 +5225,40 @@ msgstr[1] "%1$s beoordelingen"
 msgid "feature_view_more_from_category"
 msgstr "Meer bekijken van"
 
+#. 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 "Terug naar 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
+msgid "file_browser_link_expand_all"
+msgstr "Alles uitklappen"
+
+#. 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 "Terug naar beoordeling"
+
+#. 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 :: Bestand zoeken :: %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
+msgid "file_browser_toggle_expand_collapse"
+msgstr "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Alle rechten voorbehouden."
@@ -3275,7 +5295,7 @@ msgstr "Overige talen:"
 msgid "footer_privacy_policy"
 msgstr "Privacybeleid"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Opslaan"
 
@@ -3283,7 +5303,7 @@ msgstr "Opslaan"
 msgid "general_addontype_dict"
 msgstr "Woordenboek"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Woordenboeken"
@@ -3292,7 +5312,7 @@ msgstr "Woordenboeken"
 msgid "general_addontype_extension"
 msgstr "Extensie"
 
-# 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensies"
@@ -3301,7 +5321,7 @@ msgstr "Extensies"
 msgid "general_addontype_lpaddon"
 msgstr "Taalpakket (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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Taalpakketten (Add-on)"
@@ -3310,7 +5330,7 @@ msgstr "Taalpakketten (Add-on)"
 msgid "general_addontype_lpapp"
 msgstr "Taalpakket (Toepassing)"
 
-# 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Taalpakketten (Toepassing)"
@@ -3319,7 +5339,7 @@ msgstr "Taalpakketten (Toepassing)"
 msgid "general_addontype_plugin"
 msgstr "Plug-in"
 
-# 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plug-ins"
@@ -3328,7 +5348,7 @@ msgstr "Plug-ins"
 msgid "general_addontype_search"
 msgstr "Zoekmachine"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Zoekmachines"
@@ -3337,11 +5357,12 @@ msgstr "Zoekmachines"
 msgid "general_addontype_theme"
 msgstr "Thema"
 
-# 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Thema's"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3372,12 +5393,12 @@ msgid "header_navlink_addons"
 msgstr "Add-ons"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Uitloggen"
 
@@ -3385,39 +5406,43 @@ msgstr "Uitloggen"
 msgid "header_navlink_myaccount"
 msgstr "Mijn account"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Registreren"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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.
+#. %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 ""
 "<a href=\"%1$s\">Log in</a> om deze add-on te installeren. <a href=\"%2$s"
 "\">Waarom</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 "Aan %s %s toevoegen"
 
-# %1 is the add-on name, %2 is the app name
+#. %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 "%1$s toevoegen aan %2$s"
 
+#. %1$s is the add-on name
 #: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3440,7 +5465,7 @@ msgid "langtools_download_langpack"
 msgstr "Taalpakket downloaden"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Woordenboeken & Taalpakketten"
 
@@ -3496,7 +5521,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3529,7 +5558,7 @@ msgstr "Thema’s"
 msgid "other_apps_tooltip"
 msgstr "Add-ons voor andere toepassingen zoeken"
 
-# In a user list: user 1, user 2, "others"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "overige"
@@ -3542,36 +5571,34 @@ msgstr "Toepassingsversies"
 msgid "page_title_credits"
 msgstr "Dankzegging"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Experimentele add-ons"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
+msgstr "Veelgestelde vragen"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Veelgestelde vragen over Pas uw Firefox aan"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Add-onsbeleid"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Mozilla privacybeleid"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Beoordelingsrichtlijnen"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Sandbox-beoordelingssysteem"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Hulp bij indienen"
 
@@ -3591,6 +5618,7 @@ msgstr ""
 "toepassingen. Alleen de hieronder genoemde versies zijn toegestaan voor deze "
 "toepassingen."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3598,6 +5626,8 @@ msgstr ""
 "Als uw ondersteunde toepassing geen install.rdf bestand nodig heeft, dient u "
 "er nog altijd een op te geven met de %s aangeduide specificaties."
 
+#. 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 "hier"
@@ -3606,7 +5636,6 @@ msgstr "hier"
 msgid "pages_appversions_versions"
 msgstr "Versies"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Terug naar de vorige pagina"
 
@@ -3618,7 +5647,7 @@ msgstr "Sandbox-informatiepagina"
 msgid "pagination_next_page"
 msgstr "volgende"
 
-# %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"
@@ -3642,16 +5671,16 @@ msgstr "Voer hier uw antwoord in:"
 msgid "recaptcha_enter_whatyouhear"
 msgstr "Type a.u.b. wat u hoort."
 
-# %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 ""
 "Indien dit moeilijk te verstaan is kunt u <a href=\"%1$s\">naar iets anders "
 "luisteren</a> of <a href=\"%2$s\">terugschakelen naar tekst</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
 msgid "recaptcha_hardtoread_text"
 msgstr ""
@@ -3666,7 +5695,7 @@ msgstr "Bent u menselijk?"
 msgid "recaptcha_whatsthis"
 msgstr "Wat is dit?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Fout bij aanduiden van deze beoordeling!"
 
@@ -3691,7 +5720,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam of andere tekst niet zijnde beoordeling"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr ""
 "Bedankt; deze beoordeling is aangeduid voor goedkeuring door een editor."
@@ -3706,7 +5735,7 @@ msgstr ""
 "Is deze beoordeling ongepast, inaccuraat of spam? Klik dan hier om deze aan "
 "te duiden voor beoordeling door een editor."
 
-# %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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3725,21 +5754,22 @@ msgstr ""
 "\">Beoordelingsrichtlijnen</a> voor meer details over add-onbeoordelingen "
 "door gebruikers.</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 "Beoordelingen voor %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Aanbevolen add-ons"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Nieuwste add-ons"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Bijgewerkte add-ons"
 
@@ -3777,6 +5807,7 @@ msgstr "Alle zoekmachines"
 msgid "search_landing_browse_search_engines"
 msgstr "Door zoekmachines bladeren"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3796,12 +5827,13 @@ msgstr "Add-ons zoeken"
 msgid "search_rss_description"
 msgstr "Feed met zoekresultaten"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Zoekresultaten voor: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Hulpmiddelen voor beheerders"
 
@@ -3809,7 +5841,7 @@ msgstr "Hulpmiddelen voor beheerders"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Ontwikkelaarshulpmiddelen"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editorhulpmiddelen"
 
@@ -3817,6 +5849,7 @@ msgstr "Editorhulpmiddelen"
 msgid "sidebar_navlink_welcome"
 msgstr "Welkom"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3854,6 +5887,7 @@ msgstr "Thema"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Bijgewerkte add-ons"
 
+#. %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
@@ -3865,7 +5899,7 @@ msgstr "%1$s KB"
 msgid "stars_not_yet_rated"
 msgstr "Nog niet gewaardeerd"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3883,24 +5917,32 @@ msgstr "Ontwikkelaarshulpmiddelen"
 msgid "statistics_addon_switch"
 msgstr "Add-on wisselen"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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."
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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:147 views/statistics/addon.thtml:158
+#: 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 "%1$s aangemaakt"
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3942,10 +5984,9 @@ msgstr "Statistieken"
 msgid "statistics_index_view_button"
 msgstr "Statistieken bekijken"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
-#, fuzzy
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
-msgstr "View this table in CSV format"
+msgstr "Deze tabel in CSV-opmaak bekijken"
 
 #: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
@@ -3956,117 +5997,118 @@ msgid "statistics_js_dropdowns_removeplot"
 msgstr "Deze graaf verwijderen"
 
 #: controllers/statistics_controller.php:224
-#, fuzzy
 msgid "statistics_js_groupby_selector_date"
-msgstr "Group by: Day"
+msgstr "Groeperen op: Dag"
 
-#: controllers/statistics_controller.php:226
-#, fuzzy
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
-msgstr "Group by: Month"
+msgstr "Groeperen op: Maand"
 
 #: controllers/statistics_controller.php:225
-#, fuzzy
 msgid "statistics_js_groupby_selector_week"
-msgstr "Group by: Week"
+msgstr "Groeperen op: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Vergelijken op: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s gevonden in het bereik"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Graaf toevoegen"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Nog een graaf aan deze grafiek toevoegen"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Totaalaantal verbergen"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Totaalaantal weergeven"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Geef het totaalaantal weer in deze grafiek"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Gegevens bekijken (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Gebeurtenissen van %s verbergen"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "gebeurtenissen van %s weergeven"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Firefoxgebeurtenissen verbergen"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Firefoxgebeurtenissen weergeven"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Grafiek inklappen"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Grafiek uitklappen"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Grafiekgrootte aanpassen"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Actieve dagelijkse gebruikers"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Toepassing"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Aangepast"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Besturingssysteem"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Add-onstatus"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Samenvatting"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Add-onversie"
 
@@ -4090,13 +6132,13 @@ msgstr "Onbekend"
 msgid "statistics_longnames_version"
 msgstr "Add-onversie"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "Er zijn nog onvoldoende gegevens om deze grafiek weer te geven. Probeer het "
 "later nog eens."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "We hebben nog geen gegevens voor uw add-on. Probeer het over een paar dagen "
@@ -4109,12 +6151,12 @@ msgstr ""
 "onvolledig zijn terwijl onze scripts deze informatie bijwerken. Probeer het "
 "over een paar minuten nog eens."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr ""
 "De Statistiekensectie is momenteel uitgeschakeld. Probeer het later nog eens."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "JavaScript is nodig om de statistische grafieken te bekijken."
 
@@ -4129,36 +6171,36 @@ msgstr "Uw instellingen zijn bijgewerkt!"
 msgid "statistics_pagetitle"
 msgstr "Statistieken"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Actieve dagelijkse gebruikers"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Downloads per dag"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Inzoomen"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Eén maand inzoomen"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Uitzoomen"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Eén maand uitzoomen"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Dagsamenvatting van de statistieken voor %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "RSS-feed van samengevatte gegevens"
 
@@ -4198,23 +6240,23 @@ msgstr "Publiek"
 msgid "statistics_settings_access_public_description"
 msgstr "Iedereen kan de statistieken van deze add-on zien"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Instellingen wijzigen"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Deze informatie als vertrouwelijk behandelen."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Deze sectie is momenteel <b>persoonlijk</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Deze sectie is momenteel <b>publiek</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Afgesloten"
 
@@ -4231,7 +6273,7 @@ msgstr "Instellingen opslaan"
 msgid "statistics_settings_title"
 msgstr "Instellingen van Statistieken voor %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Onafgesloten"
 
@@ -4255,7 +6297,7 @@ msgstr "Onb"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Gemiddelde dagelijkse downloads"
 
@@ -4263,37 +6305,37 @@ msgstr "Gemiddelde dagelijkse downloads"
 msgid "statistics_summary_downloads_heading"
 msgstr "Downloads"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Aantal op laatste dag"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in de laatste 7 dagen"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Totaal aantal downloads"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Sinds %1$s"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Nog geen gegevens"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Gemiddeld aantal dagelijkse actieve gebruikers"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Wijziging t.o.v. vorige telling"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s op %2$s"
@@ -4302,17 +6344,17 @@ msgstr "%1$s op %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Actieve dagelijkse gebruikers"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Actieve dagelijkse gebruikers"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Op %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s statistieken"
@@ -4337,7 +6379,7 @@ msgstr "Wachtwoord wijzigen"
 msgid "user_confirmationcode_resent"
 msgstr "De bevestigingscode is opnieuw verstuurd!"
 
-# %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:49
 msgid "user_del_account_deleted"
 msgstr ""
@@ -4357,7 +6399,7 @@ msgstr "Wachtwoord bevestigen"
 msgid "user_del_deletenow"
 msgstr "Mijn gebruikersaccount nu verwijderen"
 
-# %1 is the URL of the user's info page
+#. %1 is the URL of the user's info page
 #: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4367,7 +6409,7 @@ msgstr ""
 "schrijvers voor uw add-on(s) te verwijderen. Hierna kunt u hier uw account "
 "verwijderen."
 
-# %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr ""
@@ -4383,7 +6425,7 @@ msgstr ""
 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
+#. %1 is a link to the amo-admins mailing list
 #: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4395,7 +6437,7 @@ msgstr ""
 msgid "user_del_header_confirm_deletion"
 msgstr "Verwijdering gebruikersaccount bevestigen"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Gebruikersaccount %1$s verwijderen"
@@ -4420,7 +6462,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4436,7 +6478,7 @@ msgstr "Ik begrijp dat deze stap niet ongedaan kan worden gemaakt."
 msgid "user_deleted_nickname"
 msgstr "Verwijderde gebruiker"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4449,9 +6491,9 @@ msgstr ""
 msgid "user_edit_delete_user"
 msgstr "Gebruikersaccount verwijderen"
 
-# 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4471,7 +6513,7 @@ msgstr ""
 "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
+#. %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
@@ -4495,8 +6537,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Bedankt voor uw aanmelding bij %s Add-ons"
 
-# 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
 #, php-format
 msgid "user_email_pwreset"
@@ -4523,7 +6565,7 @@ msgstr "Uw %s Add-ons-wachtwoord resetten"
 msgid "user_emailchange_error"
 msgstr "Fout!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4533,7 +6575,7 @@ msgstr "Bevestig a.u.b. de wijziging van uw e-mailadres bij %1$s Add-ons"
 msgid "user_emailchange_success"
 msgstr "Succes!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4704,7 +6746,7 @@ msgstr "Koppeling voor wachtwoordreset toezenden"
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
 
-# %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"
@@ -4713,7 +6755,7 @@ msgstr ""
 "adres %1$s verzonden. U dient er op te klikken voordat u kunt inloggen op %2"
 "$s Add-ons."
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4730,7 +6772,7 @@ msgstr "bevestigingsbericht opnieuw verzenden"
 msgid "user_register_congratulations"
 msgstr "Gefeliciteerd! Uw gebruikersaccount is succesvol aangemaakt."
 
-# %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"
@@ -4739,7 +6781,7 @@ msgstr ""
 "mailservice deze niet als “junk mail� of “spam� heeft gemarkeerd. Als het "
 "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
+#. %1 is the link to the Mozilla Add-ons front page
 #: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
@@ -4799,7 +6841,7 @@ msgstr "Nickname"
 msgid "users_info_pagetitle"
 msgstr "Gebruikersinformatie voor %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Beoordelingen door %s"
@@ -4808,8 +6850,8 @@ msgstr "Beoordelingen door %s"
 msgid "users_login_pagetitle"
 msgstr "Inloggen"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4818,8 +6860,8 @@ msgstr ""
 "account op Mozilla Add-ons hebt, log dan a.u.b. in, of <a href=\"%1$s\">kom "
 "meer te weten over de sandbox.</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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4835,3 +6877,50 @@ msgstr "Resetten gebruikerswachtwoord"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Nieuwe gebruikersregistratie"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "De meest recente versie die compatibel is met"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "addon_recommended"
+#~ msgstr "Deze add-on wordt aanbevolen door Mozilla"
+
+#~ msgid "recaptcha_enter_numbers"
+#~ msgstr "Voer a.u.b. hieronder de <strong>getallen</strong> in die u hoort."
+
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to a text captcha
+#~ msgid "recaptcha_hardtohear"
+#~ msgstr ""
+#~ "Indien dit moeilijk te verstaan is, kunt u <a href=\"%1$s\">andere "
+#~ "getallen proberen</a> of <a href=\"%2$s\">teruggaan naar tekst</a>."
+
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to an audio captcha
+#~ msgid "recaptcha_hardtoread"
+#~ msgstr ""
+#~ "Indien dit moeilijk te lezen is, kunt u <a href=\"%1$s\">andere woorden "
+#~ "proberen</a> of <a href=\"%2$s\">naar getallen luisteren</a>."
diff --git a/site/app/locale/nl/pages/experimental_addons.thtml b/site/app/locale/nl/pages/experimental_addons.thtml
deleted file mode 100644
index 0176e9f..0000000
--- a/site/app/locale/nl/pages/experimental_addons.thtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<h1>Experimentele add-ons</h1>
-
-
-<h2>Wat is een experimentele add-on?</h2>
-
-<p>Experimentele add-ons zijn bedoeld voor gevorderde gebruikers om add-ons te testen voordat ze beschikbaar komen en beoordeeld worden voor algemeen gebruik. Veel van deze add-ons verkeren nog in de prototypefase. Experimentele add-ons kunnen in het alpha-, beta- or preproductiestadium zijn in termen van kwaliteit, prestaties en functionaliteit.</p>
-
-<p>U dient voorzichtig te zijn bij het installeren van experimentele add-ons, aangezien ze nog niet zijn getest door een editor en mogelijk uw computerinstellingen schade toebrengen.</p>
-
-
-<h2>Hoe herken ik een experimentele add-on op de site?</h2>
-
-<p>Experimentele add-ons zijn gemarkeerd als “experimenteel� en u dient in te loggen voordat u ze kunt installeren.</p>
-
-
-<h2>Waarom moet ik inloggen om een experimentele add-on te installeren?</h2>
-
-<p>U dient in te loggen op de add-onsite om experimentele add-ons te installeren als herinnering aan het feit dat u op het punt staat een risicovolle stap te nemen.</p>
-
-
-<h2>Moet ik ook inloggen of heb ik ook een account nodig om een publieke add-on te installeren?</h2>
-
-<p>Nee. U heeft geen gebruikersaccount nodig en hoeft niet in te loggen op de add-onsite om een publieke add-on te installeren.</p>
diff --git a/site/app/locale/pl/LC_MESSAGES/messages.po b/site/app/locale/pl/LC_MESSAGES/messages.po
index 33e6933..93841d9 100644
--- a/site/app/locale/pl/LC_MESSAGES/messages.po
+++ b/site/app/locale/pl/LC_MESSAGES/messages.po
@@ -14,7 +14,7 @@ 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-02-02 20:04+0100\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"
@@ -27,6 +27,10 @@ msgstr ""
 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 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
@@ -55,38 +59,34 @@ msgstr "Publiczny"
 msgid "a_header_sandbox"
 msgstr "Piaskownica"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Dodano %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Zaktualizowano %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Wersja %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "wszystkich pobrań"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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
+#. %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"
@@ -104,22 +104,22 @@ msgstr "na stronie"
 msgid "addon_list_sortby"
 msgstr "Sortuj wg:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "polecany"
 
-# %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:57
 msgid "addon_not_available_for_platform"
 msgstr "Dodatek %1$s nie jest dostępny dla systemu %2$s."
 
-# %1 is the addon name
+#. %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
@@ -128,7 +128,7 @@ msgstr "Dodatek %1$s nie jest dostępny dla systemu %2$s."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Wróć do %1$s..."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -147,6 +147,7 @@ msgstr "Recenzja:"
 msgid "addon_review_add_submit"
 msgstr "Wyślij recenzję"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -180,23 +181,25 @@ msgstr "Tak"
 msgid "addon_review_delete_header"
 msgstr "Usuń recenzję"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Recenzja została usunięta."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Edytuj recenzjÄ™ dla: %s"
 
-# %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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 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:49
 msgid "addon_review_in_moderation"
 msgstr "Uwaga: przed publikacjÄ… recenzja zostanie sprawdzona przez moderatora."
@@ -205,7 +208,7 @@ msgstr "Uwaga: przed publikacjÄ… recenzja zostanie sprawdzona przez moderatora."
 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.
+#. %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"
@@ -215,16 +218,16 @@ 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."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Recenzje dla: %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -238,13 +241,13 @@ msgstr "Odpowiedź programisty:"
 msgid "addon_review_saved_successfully"
 msgstr "Recenzja została zapisana. Dziękujemy!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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"
 
-# %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:77 views/reviews/delete.thtml:49
 #, php-format
@@ -267,11 +270,14 @@ msgstr "Poprzedni dodatek"
 msgid "addon_version_permalink"
 msgstr "Stały odnośnik do tej wersji"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "Najnowsza wersja kompatybilna z"
+#. %1 is the current Application name (e.g. Firefox)
+#. %2 is the Application's version number
+#: 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:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Przejdź"
 
@@ -279,29 +285,28 @@ msgstr "Przejdź"
 msgid "addons_author_tooltip"
 msgstr "Zobacz profil autora"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
-#, fuzzy
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
-msgstr "Browse all Themes :: %1$s Add-ons"
+msgstr "PrzeglÄ…daj wszystkie motywy :: %1$s - dodatki"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
-#, fuzzy
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
-msgstr "Browse %1$s Themes :: %2$s Add-ons"
+msgstr "Przeglądaj motywy z kategorii %1$s :: %2$s – dodatki"
 
 #: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Dodaj recenzjÄ™"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Informacje dodatkowe"
 
@@ -309,11 +314,11 @@ msgstr "Informacje dodatkowe"
 msgid "addons_display_categories"
 msgstr "Kategorie"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "Szczegółowa recenzja"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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Ä™"
@@ -322,147 +327,154 @@ msgstr "Nie podoba mi siÄ™"
 msgid "addons_display_edit_review"
 msgstr "Edytuj recenzjÄ™"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "To rozszerzenie posiada politykę prywatności."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Komentarze autora"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Strona domowa"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Recenzje"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Wsparcie techniczne"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Podoba mi siÄ™"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Szczegółowy opis"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Obrazki"
 
-# %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:421
-#, fuzzy
+#. %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] "Inne dodatki autorstwa %1$s"
-msgstr[1] "Other add-ons by these authors"
+msgstr[1] "Inne dodatki tych autorów"
+msgstr[2] ""
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
 "Wsparcie techniczne dla tego rozszerzenia jest świadczone przez autora pod e-"
 "mailem %s"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: 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"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
 "Wsparcie techniczne dla tego rozszerzenia jest świadczone przez autora na "
 "stronie %s "
 
-#: views/addons/display.thtml:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Oceń dodatek"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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."
 
-# %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Wytyczne dla recenzentów</a>"
 
-# %1 is the support section link
-#: views/addons/display.thtml:396 views/addons/display.thtml:400
+#. %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 ""
 "Sprawdź w sekcji <a href=\"%1$s\">wsparcie techniczne</a>, gdzie można "
 "otrzymać pomoc dla rozszerzenia."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Zapisz"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Zobacz wszystkie recenzje (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Wyświetl wszystkie wersje"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Pełna historia wersji"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: 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:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Wyświetl statystyki"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Jakie jest Twoje zdanie?"
 
@@ -472,7 +484,7 @@ msgstr "Działa z:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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: "
@@ -483,10 +495,11 @@ msgstr "Autor: "
 msgid "addons_home_feature_head"
 msgstr "Polecamy"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -502,7 +515,9 @@ msgstr "Najnowsze:"
 msgid "addons_home_other_applications"
 msgstr "Inne programy"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -512,19 +527,20 @@ msgstr "Inne programy"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -620,6 +636,7 @@ msgstr "dla Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "dla Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -640,12 +657,13 @@ msgstr ""
 "multimedialnych. Wtyczki nieco różnią się od rozszerzeń, które modyfikują "
 "lub dodają coś do istniejącej funkcjonalności."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Często używane wtyczki dla programu %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Wtyczki"
 
@@ -656,6 +674,7 @@ msgstr "Wtyczki"
 msgid "addons_plugins_support_documentation"
 msgstr "Dokumentacja: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -663,24 +682,24 @@ msgstr ""
 "Przed kontynuowaniem instalacji %s wymaga zaakceptowania warunków poniższej "
 "licencji użytkownika (EULA)"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "PodglÄ…d dla: %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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!"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Polecane dodatki"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Polecane dodatki"
 
@@ -688,7 +707,7 @@ msgstr "Polecane dodatki"
 msgid "addons_searchengines_additional_resources"
 msgstr "Dodatkowe zasoby"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
@@ -706,35 +725,35 @@ msgstr ""
 "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
+#. %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 "Dowiedz siÄ™, jak %1$s na stronie %2$s."
 
-# link path to search plugins instructions, relative to devmo
+#. 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 "/pl/docs/Tworzenie_wtyczek_OpenSearch_dla_Firefoksa"
 
-# link text for "make your own" (opensearch engine)
+#. link text for "make your own" (opensearch engine)
 #: 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
+#. %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 "Więcej wyszukiwarek znajdziesz na stronie %1$s"
 
-# link text to mycroft.mozdev.org
+#. 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:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Wyszukiwarki"
 
@@ -748,7 +767,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Wyłączony"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Wersja niekompletna"
 
@@ -786,11 +805,12 @@ msgstr ""
 "Wersje te są wyświetlane w celach informacyjnych i testowych. Należy zawsze "
 "używać najnowszych wersji danego dodatku."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Historia wersji z informacjami o zmianach"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s - historia wersji"
@@ -803,6 +823,7 @@ msgstr "Dodaj grupÄ™"
 msgid "admin_group_delete_pagetitle"
 msgstr "Usuń grupę"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -928,16 +949,20 @@ msgstr "Pomijaj sprawdzanie wersji"
 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: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>"
 
+#. %1$s is a URL
 #: 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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -950,23 +975,23 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Zaktualizuj Firefoksa</a>, aby używać tego "
 "dodatku"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Dodatki wg nazwy"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Najnowsze dodatki"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Popularne dodatki"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Dodatki wg oceny"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Ostatnio zaktualizowane dodatki"
 
@@ -998,7 +1023,7 @@ msgstr "Najpierw ostatnio zaktualizowane"
 msgid "category_extra_mostpopular"
 msgstr "Najpierw najpopularniejsze"
 
-# %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"
@@ -1008,11 +1033,19 @@ msgstr "Wszystkie z kategorii: %1$s"
 msgid "collection_not_found"
 msgstr "Nie znaleziono kolekcji!"
 
+#. %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"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
@@ -1045,6 +1078,8 @@ msgstr "Zmień maxVersion bez ponownego wysyłania dodatku"
 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:130
 msgid "compatibility_developers_login_first"
 msgstr ""
@@ -1068,6 +1103,10 @@ msgstr "Wyniki sprawdzania statusu dodatków"
 msgid "compatibility_developers_retrieving"
 msgstr "Pobieranie informacji o statusie dodatków..."
 
+#. %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żytkowników %2$s (%3$s&#37; wszystkich)"
@@ -1082,6 +1121,8 @@ msgstr ""
 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:69
 msgid "compatibility_report_intro"
 msgstr ""
@@ -1093,6 +1134,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Wersje alfa"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Dodatki kompatybilne z wersjÄ… alfa programu %1$s"
@@ -1101,6 +1143,7 @@ msgstr "Dodatki kompatybilne z wersjÄ… alfa programu %1$s"
 msgid "compatibility_report_legend_beta"
 msgstr "Wersje beta"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
@@ -1110,6 +1153,7 @@ msgstr ""
 msgid "compatibility_report_legend_latest"
 msgstr "Najnowsza wersja"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Dodatki kompatybilne z najnowszÄ… wersjÄ… programu %1$s"
@@ -1118,6 +1162,7 @@ msgstr "Dodatki kompatybilne z najnowszÄ… wersjÄ… programu %1$s"
 msgid "compatibility_report_legend_other"
 msgstr "Inne wersje"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Dodatki niekompatybilne z żadną wersją programu %1$s"
@@ -1135,12 +1180,13 @@ msgstr "Informacje dla użytkowników dodatków"
 msgid "compatibility_view_report"
 msgstr "Informacje o kompatybilności dodatków"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: 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:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "stronie wiki"
 
@@ -1182,26 +1228,35 @@ msgstr ""
 "href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons "
 "Attribution 2.5 License</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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)
+#. 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"
@@ -1227,14 +1282,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1282,36 +1365,36 @@ msgstr "Krok 5: Koniec"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Pomoc w wysłaniu"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Dodatek został wyłączony"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Edytuj dodatek"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Dodatek został włączony"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Opis dodatku"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Strona domowa dodatku"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Nazwa dodatku"
 
@@ -1320,40 +1403,298 @@ msgstr "Nazwa dodatku"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Opis obrazka podglÄ…du"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Polityka prywatności"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Podsumowanie dodatku"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Adres e-mail wsparcia technicznego"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "Adres URL wsparcia technicznego"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Informacje o wersji"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Nominuj dodatek"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Dodatek został nominowany!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1376,7 +1717,7 @@ msgstr ""
 "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
+#. %1 is the link to the sandbox information page
 #: views/developers/add_step5.thtml:63
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1386,7 +1727,7 @@ msgstr "Możesz dowiedzieć się więcej o systemie recenzji piaskownicy %s."
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "tutaj"
 
-# %1 is the "nominate" link
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1409,16 +1750,16 @@ msgstr ""
 "Ponieważ dodatek jest zaufany, ta wersja została automatycznie zatwierdzona "
 "do publicznego dostępu."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Wyślij dodatek"
 
-#: controllers/developers_controller.php:2375
+#: controllers/developers_controller.php:2460
 msgid "devcp_addon_updated_successfully"
 msgstr "Dodatek został wysłany"
 
-# %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"
@@ -1428,7 +1769,7 @@ msgstr "Aby zwiększyć zainteresowanie swoim dodatkiem, możesz także %s."
 msgid "devcp_addon_upload_preview_link"
 msgstr "dołączyć jego podgląd"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1457,10 +1798,102 @@ msgstr "Dalej"
 msgid "devcp_change_addontype"
 msgstr "Zmień typ dodatku:"
 
-#: controllers/developers_controller.php:1402
+#: 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 "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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Dodaj obrazek podglÄ…du"
@@ -1553,6 +1986,7 @@ msgstr "Twórca nie podał adresu URL wsparcia technicznego."
 msgid "devcp_details_trusted"
 msgstr "Zaufany"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1582,6 +2016,7 @@ msgstr ""
 "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"
@@ -1602,11 +2037,65 @@ msgstr ""
 "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 "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Dodaj autora"
@@ -1619,10 +2108,297 @@ msgstr "Adres e-mail autora"
 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 "Add New Author"
+
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+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"
@@ -1688,6 +2464,206 @@ msgstr "Docelowa lokalizacja"
 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 "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 "Aktualizuj"
@@ -1698,11 +2674,66 @@ 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 "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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Polecane dodatki"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1712,7 +2743,7 @@ msgstr[0] "Recenzja moderowana (%s)"
 msgstr[1] "Recenzje moderowane (%s)"
 msgstr[2] "Recenzje moderowane (%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
 #, php-format
@@ -1722,7 +2753,7 @@ msgstr[0] "Dodatek nominowany (%s)"
 msgstr[1] "Dodatki nominowane (%s)"
 msgstr[2] "Dodatki nominowane (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1736,8 +2767,8 @@ msgstr[2] "Aktualizacje w toku (%s)"
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "Zaznaczone pliki zostaną usunięte."
 
-# %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"
@@ -1763,29 +2794,30 @@ msgstr "Informacje dla recenzenta"
 msgid "devcp_editversion_submit_update"
 msgstr "Aktualizuj"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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:"
@@ -1794,19 +2826,33 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Więcej informacji można znaleźć na %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 "tej stronie"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+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"
@@ -1814,7 +2860,7 @@ msgstr ""
 "To rozszerzenie pliku (%s) nie jest dozwolone dla wybranego typu dodatku. "
 "Prosimy skorzystać z jednego z tych: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Niektóre kody GUID plików nie pasują"
 
@@ -1843,6 +2889,8 @@ msgstr "Został przekroczony maksymalny rozmiar wysyłanego pliku."
 msgid "devcp_error_http_nofile"
 msgstr "Nie wysłano żadnego pliku"
 
+#. %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"
@@ -1850,14 +2898,15 @@ msgstr ""
 "To rozszerzenie pliku (%s) nie jest dozwolone dla ikony. Prosimy skorzystać "
 "z jednego z tych: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Brak pliku install.rdf."
 
@@ -1865,21 +2914,26 @@ 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:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Proszę wybrać poprawny typ dodatku."
 
+#. %$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 "%s nie jest prawidłową wersją dla %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "Identyfikator (ID) dla tego dodatku jest nieprawidłowy: %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"
@@ -1899,6 +2953,7 @@ msgid "devcp_error_invalid_version_spaces"
 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
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1908,6 +2963,7 @@ msgstr "Podczas przetwarzania pliku install.rdf został znaleziony błąd: %s"
 msgid "devcp_error_move_file"
 msgstr "Nie można przenieść pliku"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1931,15 +2987,15 @@ msgstr "W pliku install.rdf nie znaleziono identyfikatora (ID) tego dodatku."
 msgid "devcp_error_no_platform"
 msgstr "Nie wybrano platformy"
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "Nominacja wymaga dostarczenia żądanych informacji."
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "Nie można nominować przedpremierowego wydania dodatku."
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr ""
 "Można jedynie nominować dodatki, które aktualnie znajdują się w piaskownicy."
@@ -1952,6 +3008,8 @@ msgstr "Należy wybrać przynajmniej jedną kategorię."
 msgid "devcp_error_one_user"
 msgstr "Dodatek musi mieć określonego przynajmniej jednego 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"
@@ -1959,13 +3017,13 @@ msgstr ""
 "Nie można wybrać tego rozszerzenia pliku (%s) dla pliku podglądu. Wybierz "
 "jedno z poniższych: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Nie posiadasz uprawnień, by aktualizować ten dodatek."
 
@@ -1981,7 +3039,7 @@ 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Wyślij plik."
@@ -2204,7 +3262,7 @@ msgstr "Moje dodatki"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Pola lokalizowane"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2249,33 +3307,68 @@ msgstr "Wyślij dodatek"
 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: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 "Wróć do szczegółów dot. dodatku"
 
-# %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 "Nominuj %s"
 
-# %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 "Typ dodatku został wykryty automatycznie: %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 ""
 "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)
+#. %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"
@@ -2291,9 +3384,14 @@ msgstr ""
 "Ustawienie tego podglądu jako domyślnego spowoduje, że obecny podgląd "
 "domyślny straci swój status."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2322,6 +3420,60 @@ msgstr "Edycja podglÄ…du"
 msgid "devcp_preview_updated_successfully"
 msgstr "Podgląd został uaktualniony."
 
+#: 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 ""
@@ -2333,10 +3485,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Dodaj podglÄ…d"
 
+#: 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 "Edytuj podglÄ…d"
 
+#: 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 "PodglÄ…d pliku"
@@ -2345,6 +3507,34 @@ msgstr "PodglÄ…d pliku"
 msgid "devcp_previews_label_makedefault"
 msgstr "Ustaw ten obrazek podglądu jako domyślny"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Usuń podgląd"
@@ -2361,56 +3551,171 @@ msgstr "Edytuj podglÄ…d"
 msgid "devcp_previews_submit_upload"
 msgstr "Wyślij"
 
+#: 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 "Niepoprawne?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Czy na pewno chcesz usunąć ten plik?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 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>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 "Pomiń aktualizację informacji o dodatku"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> aktywnych dziennych użytkowników"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "Liczba wszystkich pobrań: <em>%s</em>"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "Tygodniowa liczba pobrań <em>%s</em>"
 
-#: controllers/developers_controller.php:1481
+#: 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 "Dodawanie dodatków jest obecnie zablokowane. Spróbuj ponownie później."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Zgadzam siÄ™"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Nie zgadzam siÄ™"
 
@@ -2426,11 +3731,11 @@ msgstr "Wyłączony"
 msgid "devcp_summary_header_trusted"
 msgstr "Zaufany"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Najnowsza wersja:"
 
-# %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"
@@ -2440,7 +3745,7 @@ msgstr "Nie masz jeszcze żadnych dodatków. Kliknij %s, aby jakiś wysłać."
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "tutaj"
 
-# %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"
@@ -2450,30 +3755,674 @@ msgstr "Należy upewnić się, czy %s swojego motywu."
 msgid "devcp_theme_upload_preview_link"
 msgstr "wysyła się podgląd"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Więcej informacji można znaleźć na %s."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "tej stronie"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Edycja wersji"
 
-#: controllers/developers_controller.php:2572
+#: 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 "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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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: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 "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filtr"
@@ -2482,7 +4431,7 @@ msgstr "Filtr"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtr wg typu/akcji"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Dziennik zdarzeń"
 
@@ -2534,6 +4483,7 @@ msgstr "Ukryj komentarze"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Wyświetl komentarze"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2543,7 +4493,7 @@ msgstr "Wyświetl wpisy między %s i %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Brak recenzji dla tego okresu."
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "PrzeglÄ…daj zdarzenie"
 
@@ -2567,24 +4517,24 @@ msgstr "Aktywność redaktora"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Recenzji razem"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Recenzja dodatku"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Uzupełnij następujące pola:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Wybierz przynajmniej jeden plik do recenzji."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Recenzowanie własnych dodatków jest zabronione."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Zewnętrzne oprogramowanie"
 
@@ -2596,39 +4546,39 @@ msgstr "Dodaj cechÄ™"
 msgid "editors_featured_add_feature_submit"
 msgstr "Dodaj"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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ć cechy."
 
-#: controllers/editors_controller.php:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Dodano cechÄ™."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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ć cechy."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:712
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Edycja cechy zakończona powodzeniem."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:685
+#: 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:730
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Nie udało się usunąć cechy."
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Usunięto cechę."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Polecane dodatki"
 
@@ -2661,39 +4611,40 @@ msgid "editors_notice_filter_session"
 msgstr ""
 "Te filtry pozostanÄ… aktywne na czas trwania sesji lub do wyczyszczenia."
 
-# %1 is the queue mode
+#. %1 is the queue mode
 #: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Aktualnie żadne %s nie są dostępne do recenzji."
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 dzień"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 godzina"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minuta"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Panel kontrolny redaktora"
 
-#: controllers/editors_controller.php:286
+#. %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 "Tylko %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Wydanie przedpremierowe"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2707,20 +4658,25 @@ msgstr "Wyczyść"
 msgid "editors_queue_submit_filter"
 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"
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Akcja recenzji"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Publikuj"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "PoproÅ› o Super-Review"
 
@@ -2728,33 +4684,41 @@ msgstr "PoproÅ› o Super-Review"
 msgid "editors_review_action_sandbox"
 msgstr "Pozostaw w piaskownicy"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Komentarze do recenzji"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "To oznaczy dodatek i jego ostatnią wersję jako publiczne. Przyszłe wersje "
 "trafiÄ… do piaskownicy, do momentu zrecenzowania przez edytora."
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "To pozostawi dodatek w piaskownicy."
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "To zatwierdzi wersjÄ™ z piaskownicy publicznego dodatku i zezwoli na jej "
 "wyświetlenie na stronie publicznej."
 
-#: views/editors/review.thtml:162
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "To spowoduje, że wersja z piaskownicy publicznego dodatku pozostanie w "
 "piaskownicy."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Jeśli masz jakieś zastrzeżenia do bezpieczeństwa tego dodatku, kwestii "
@@ -2782,15 +4746,15 @@ msgstr "Kategorie:"
 msgid "editors_review_header_compatibility"
 msgstr "Kompatybilność"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Opis"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Komentarze autora"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2798,85 +4762,111 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Pliki:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Historia elementu"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Wiadomość o nominacji"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "PodglÄ…dy"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Polityka prywatności"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Recenzja: %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Uwagi dla recenzenta"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Podsumowanie"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Informacje o wersji"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "ZarzÄ…dzanie recenzjÄ…"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Nominacja zatwierdzona/Publiczna"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Nominacja zablokowana/Piaskownica"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Brak wcześniejszych recenzji."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "ZarzÄ…dzanie recenzjÄ…"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Zatwierdzone/Publiczne"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Zablokowane/Piaskownica"
 
-#: views/editors/review.thtml:198
+#. 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 "Aplikacje:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "lub wybierz odpowiedź:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Komentarze:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Systemy operacyjne:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Do góry"
 
@@ -2884,7 +4874,7 @@ msgstr "Do góry"
 msgid "editors_review_next_link"
 msgstr "następna &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Nie znaleziono podglądów."
 
@@ -2892,41 +4882,48 @@ msgstr "Nie znaleziono podglądów."
 msgid "editors_review_previous_link"
 msgstr "&laquo; poprzednia"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %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 w kolejce "
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Wykonaj akcjÄ™"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Akcja"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Komentarze"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Data"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Recenzent"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Wersja/plik"
 
-#: controllers/editors_controller.php:411
+#: 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 "Recenzja została wysłana."
 
@@ -2950,7 +4947,7 @@ msgstr "Akcja"
 msgid "editors_reviews_in_reply_to"
 msgstr "W odpowiedzi na:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Recenzje zostały wysłane!"
 
@@ -2962,23 +4959,23 @@ msgstr "Brak recenzji do moderacji."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Wyślij recenzje"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Specyficzne dla danej strony"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Nowy"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Aktualizuj"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Testowana aplikacja"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Testowane systemy operacyjne"
 
@@ -3019,17 +5016,20 @@ msgstr "Platformy"
 msgid "editors_th_submissiontypes"
 msgstr "Typy wysyłania"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dni"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s godzin"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minut(y)"
@@ -3038,8 +5038,8 @@ msgstr "%s minut(y)"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Brak dostępu"
 
@@ -3047,12 +5047,13 @@ msgstr "Brak dostępu"
 msgid "error_access_denied_message"
 msgstr "Brak uprawnień do przeglądania tej strony."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3062,18 +5063,19 @@ msgstr "Brak uprawnień do przeglądania tej strony."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Nie znaleziono dodatku."
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Ten dodatek nie może zostać pokazany tutaj."
 
@@ -3081,13 +5083,13 @@ 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:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "W tej kategorii nie ma żadnych dodatków."
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr ""
+msgstr "Nie znaleziono kanału RSS dodatku"
 
 #: views/users/register.thtml:60 views/users/edit.thtml:176
 #: views/developers/add_step2.thtml:117 controllers/api_controller.php:907
@@ -3103,24 +5105,25 @@ msgstr "Podany e-mail jest niepoprawny."
 msgid "error_field_required"
 msgstr "To pole nie może być puste."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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."
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "BÅ‚Ä…d pliku: %s nie istnieje."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3137,16 +5140,18 @@ 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3164,7 +5169,7 @@ msgstr "Uwaga"
 msgid "error_preview_notfound"
 msgstr "Nie znaleziono podglÄ…du."
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Musisz wybrać ocenę."
 
@@ -3217,8 +5222,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Nie znaleziono wersji."
 
@@ -3230,13 +5235,14 @@ msgstr "Wprowadzono złe hasło."
 msgid "feature_learnmore"
 msgstr "Dowiedz się więcej"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Więcej o dodatku %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3249,6 +5255,45 @@ msgstr[2] "%1$s recenzji"
 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Wszelkie prawa zastrzeżone."
@@ -3285,7 +5330,7 @@ msgstr "Inne języki:"
 msgid "footer_privacy_policy"
 msgstr "Polityka prywatności"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Zapisz"
 
@@ -3293,7 +5338,7 @@ msgstr "Zapisz"
 msgid "general_addontype_dict"
 msgstr "SÅ‚ownik"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "SÅ‚owniki"
@@ -3302,7 +5347,7 @@ msgstr "SÅ‚owniki"
 msgid "general_addontype_extension"
 msgstr "Rozszerzenie"
 
-# 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Rozszerzenia"
@@ -3311,7 +5356,7 @@ msgstr "Rozszerzenia"
 msgid "general_addontype_lpaddon"
 msgstr "Pakiet językowy (dodatek)"
 
-# 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Pakiety językowe (dodatek)"
@@ -3320,7 +5365,7 @@ msgstr "Pakiety językowe (dodatek)"
 msgid "general_addontype_lpapp"
 msgstr "Pakiet językowy (aplikacja)"
 
-# 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Pakiety językowe (aplikacja)"
@@ -3329,7 +5374,7 @@ msgstr "Pakiety językowe (aplikacja)"
 msgid "general_addontype_plugin"
 msgstr "Wtyczka"
 
-# 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Wtyczki"
@@ -3338,7 +5383,7 @@ msgstr "Wtyczki"
 msgid "general_addontype_search"
 msgstr "Wyszukiwarka"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Wyszukiwarki"
@@ -3347,11 +5392,12 @@ msgstr "Wyszukiwarki"
 msgid "general_addontype_theme"
 msgstr "Motyw"
 
-# 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Motywy"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3382,12 +5428,12 @@ msgid "header_navlink_addons"
 msgstr "Dodatki"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Wyloguj siÄ™"
 
@@ -3395,36 +5441,41 @@ msgstr "Wyloguj siÄ™"
 msgid "header_navlink_myaccount"
 msgstr "Moje konto"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Zarejestruj siÄ™"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "PodglÄ…d dodatku %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/install.thtml:229
 msgid "install_a_login_to_install"
 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/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Dodaj 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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3447,7 +5498,7 @@ msgid "langtools_download_langpack"
 msgstr "Pobierz pakiet językowy"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Słowniki i pakiety językowe"
 
@@ -3503,7 +5554,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3536,7 +5591,7 @@ msgstr "Motywy"
 msgid "other_apps_tooltip"
 msgstr "Znajdź dodatki dla innych programów"
 
-# In a user list: user 1, user 2, "others"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "inni"
@@ -3549,36 +5604,34 @@ msgstr "Wersje aplikacji"
 msgid "page_title_credits"
 msgstr "Podziękowania"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Dodatek eksperymentalny"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
+msgstr "Często zadawane pytania"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Dostosuj swojego Firefoksa - FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Polityka dodatków"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Polityka prywatności Mozilli"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Informacje o recenzjach"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "System recenzji piaskownicy"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Wysyłanie dodatków - pomoc"
 
@@ -3597,6 +5650,7 @@ msgstr ""
 "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:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3604,6 +5658,8 @@ 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:92
 msgid "pages_appversions_required_files_link"
 msgstr "tej stronie"
@@ -3612,7 +5668,6 @@ msgstr "tej stronie"
 msgid "pages_appversions_versions"
 msgstr "Wersje"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Wróć do poprzedniej strony"
 
@@ -3624,7 +5679,7 @@ msgstr "Strona informacyjna piaskownicy"
 msgid "pagination_next_page"
 msgstr "następne"
 
-# %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"
@@ -3648,16 +5703,16 @@ msgstr "Wprowadź tutaj swoją odpowiedź:"
 msgid "recaptcha_enter_whatyouhear"
 msgstr "Wpisz to, co słyszysz."
 
-# %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 ""
 "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
+#. %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 ""
@@ -3672,7 +5727,7 @@ msgstr "Czy jesteś człowiekiem?"
 msgid "recaptcha_whatsthis"
 msgstr "Co to jest?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Podczas oznaczania recenzji flagą wystąpił błąd!"
 
@@ -3697,7 +5752,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam lub inna nierecenzowana zawartość"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr ""
 "Dziękujemy. Recenzja została oznaczona flagą w celu zatwierdzenia jej przez "
@@ -3713,7 +5768,7 @@ 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
+#. %1 is the URL of the support section, %2 for the review guidelines
 #: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3732,21 +5787,22 @@ msgstr ""
 "<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: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:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Polecane dodatki"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Najnowsze dodatki"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Zaktualizowane dodatki"
 
@@ -3783,6 +5839,7 @@ msgstr "Wszystkie wyszukiwarki"
 msgid "search_landing_browse_search_engines"
 msgstr "PrzeglÄ…daj wyszukiwarki"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3803,12 +5860,13 @@ msgstr "Szukaj dodatków"
 msgid "search_rss_description"
 msgstr "Wyniki szukania kanałów"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Wyniki wyszukiwania dla: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Narzędzia administratora"
 
@@ -3816,7 +5874,7 @@ msgstr "Narzędzia administratora"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Narzędzia programisty"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Narzędzia redaktora"
 
@@ -3824,6 +5882,7 @@ msgstr "Narzędzia redaktora"
 msgid "sidebar_navlink_welcome"
 msgstr "Witamy"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3861,6 +5920,7 @@ msgstr "motywu"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Ostatnio zaktualizowane"
 
+#. %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
@@ -3872,7 +5932,7 @@ msgstr "%1$s KB"
 msgid "stars_not_yet_rated"
 msgstr "Nieoceniony"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3890,24 +5950,32 @@ msgstr "Narzędzia programisty"
 msgid "statistics_addon_switch"
 msgstr "Przełącz dodatek"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "%d.%m."
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "%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:147 views/statistics/addon.thtml:158
+#: 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3949,10 +6017,9 @@ msgstr "Panel statystyk"
 msgid "statistics_index_view_button"
 msgstr "Wyświetl statystyki"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
-#, fuzzy
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
-msgstr "View this table in CSV format"
+msgstr "Pokaż tę tabelę w formacie CSV"
 
 #: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
@@ -3963,117 +6030,119 @@ msgid "statistics_js_dropdowns_removeplot"
 msgstr "Usuń ten wykres"
 
 #: controllers/statistics_controller.php:224
-#, fuzzy
 msgid "statistics_js_groupby_selector_date"
-msgstr "Group by: Day"
+msgstr "Grupuj wg: dni"
 
-#: controllers/statistics_controller.php:226
-#, fuzzy
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
-msgstr "Group by: Month"
+msgstr "Grupuj wg: miesięcy"
 
 #: controllers/statistics_controller.php:225
-#, fuzzy
 msgid "statistics_js_groupby_selector_week"
-msgstr "Group by: Week"
+msgstr "Grupuj wg: tygodni"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "Odnaleziono w zakresie: %s"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Dodaj wykres"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
-msgstr "Dodaj kolejny wykres do tego grafu"
+msgstr "Dodaje kolejny wykres do tego grafu"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
-msgstr "Ukryj sumę całkowitą"
+msgstr "Ukryj sumaryczny wykres"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
-msgstr "Wyświetl sumę całkowitą"
+msgstr "Wyświetl sumaryczny wykres"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
-msgstr "Przedstaw na tym wykresie całkowity licznik"
+msgstr "Nanosi na graf sumaryczny wykres"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Wyświetl dane (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
-msgstr "Pobierz plik CSV z tymi danymi"
+msgstr "Wyświetla plik z tymi danymi w formacie CSV"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
-msgstr "Ukryj zdarzenia dodatku %s"
+msgstr "Ukryj wydania %s"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
-msgstr "Wyświetl zdarzenia dodatku %s"
+msgstr "Wyświetl wydania %s"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
-msgstr "Nałóż na wykres daty wydań dodatku"
+msgstr "Pokazuje/ukrywa na wykresach daty wydań dodatku"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
-msgstr "Ukryj zdarzenia Firefoksa"
+msgstr "Ukryj wydania Firefoksa"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
-msgstr "Wyświetl zdarzenia Firefoksa"
+msgstr "Wyświetl wydania Firefoksa"
 
-#: controllers/statistics_controller.php:241
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
-msgstr "Nałóż na wykres daty wydań Firefoksa"
+msgstr "Pokazuje/ukrywa na wykresach daty wydań Firefoksa"
 
-#: controllers/statistics_controller.php:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
-msgstr "Zwiń graf"
+msgstr "Pomniejsz graf"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
-msgstr "Rozwiń graf"
+msgstr "Powiększ graf"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
-msgstr "Zmień rozmiar grafu"
+msgstr "Zmienia rozmiar grafu"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Aktywni dzienni użytkownicy"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Program"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "WÅ‚asne"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Liczba pobrań"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "System operacyjny"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Status dodatku"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Podsumowanie"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Wersja dodatku"
 
@@ -4097,13 +6166,13 @@ msgstr "Nieznany"
 msgid "statistics_longnames_version"
 msgstr "Wersja dodatku"
 
-#: views/statistics/addon.thtml:104
+#: 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."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr "Brak danych dla tego dodatku. Prosimy spróbować ponownie za kilka dni."
 
@@ -4114,12 +6183,12 @@ msgstr ""
 "niekompletne podczas procesu ich aktualizacji. Prosimy spróbować ponownie za "
 "kilka minut."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr ""
 "Panel statystyk jest obecnie zablokowany. Prosimy spróbować ponownie później."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr ""
 "Do wyświetlenia wykresów w panelu statystyk konieczne jest włączenie obsługi "
@@ -4136,36 +6205,36 @@ msgstr "Twoje ustawienia zostały zaktualizowane!"
 msgid "statistics_pagetitle"
 msgstr "Panel statystyk"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Aktywni dzienni użytkownicy"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Dzienna liczba pobrań"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Powiększ"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Powiększ o jeden miesiąc"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Pomniejsz"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Pomniejsz o jeden miesiÄ…c"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Dzienne podsumowanie statystyk dla dodatku %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Kanał RSS z danymi podsumowania"
 
@@ -4204,23 +6273,23 @@ msgstr "Publiczny"
 msgid "statistics_settings_access_public_description"
 msgstr "Każdy może przeglądać statystyki tego dodatku"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Zmień ustawienia"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Informacje te należy traktować jako poufne."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Panel jest obecnie <b>prywatny</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Panel jest obecnie <b>publiczny</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Zablokowany"
 
@@ -4237,7 +6306,7 @@ msgstr "Zapisz ustawienia"
 msgid "statistics_settings_title"
 msgstr "Ustawienia panelu statystyk dla %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Odblokowany"
 
@@ -4261,7 +6330,7 @@ msgstr "nn."
 msgid "statistics_shortnames_version"
 msgstr "Wer"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Średnia dzienna liczba pobrań"
 
@@ -4269,37 +6338,37 @@ msgstr "Średnia dzienna liczba pobrań"
 msgid "statistics_summary_downloads_heading"
 msgstr "Pobrania"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149 views/statistics/addon.thtml:169
+#: 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:70 views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s - %2$s"
@@ -4308,17 +6377,17 @@ msgstr "%1$s - %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Aktywni dzienni użytkownicy"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: 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:147
+#: 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/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s - statystyki"
@@ -4343,7 +6412,7 @@ msgstr "Zmień hasło"
 msgid "user_confirmationcode_resent"
 msgstr "Kod potwierdzający został wysłany ponownie."
 
-# %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:49
 msgid "user_del_account_deleted"
 msgstr ""
@@ -4363,7 +6432,7 @@ msgstr "Potwierdź hasło"
 msgid "user_del_deletenow"
 msgstr "Usuń moje konto"
 
-# %1 is the URL of the user's info page
+#. %1 is the URL of the user's info page
 #: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4372,7 +6441,7 @@ msgstr ""
 "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
+#. %1 is a link to the amo-editors mailing list
 #: 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."
@@ -4386,7 +6455,7 @@ msgstr ""
 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
+#. %1 is a link to the amo-admins mailing list
 #: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr "W celu usunięcia błędu, proszę skontaktować się z %1$s."
@@ -4395,7 +6464,7 @@ msgstr "W celu usunięcia błędu, proszę skontaktować się z %1$s."
 msgid "user_del_header_confirm_deletion"
 msgstr "Potwierdź usunięcie konta"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Usuwanie konta %1$s"
@@ -4420,7 +6489,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4436,7 +6505,7 @@ msgstr "Zdaję sobie sprawę, że ten krok nie może być cofnięty."
 msgid "user_deleted_nickname"
 msgstr "Konto użytkownika zostało usunięte"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4449,9 +6518,9 @@ msgstr ""
 msgid "user_edit_delete_user"
 msgstr "Usuwanie konta użytkownika"
 
-# 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4471,7 +6540,7 @@ msgstr ""
 "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
+#. %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
@@ -4495,8 +6564,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 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
+#. 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"
@@ -4524,7 +6593,7 @@ msgstr "Zresetuj swoje hasło do %s Add-ons"
 msgid "user_emailchange_error"
 msgstr "BÅ‚Ä…d!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4534,7 +6603,7 @@ msgstr "Proszę potwierdzić zmianę adresu e-mail w %1$s Add-ons"
 msgid "user_emailchange_success"
 msgstr "Zmiana została dokonana."
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4704,7 +6773,7 @@ msgstr "Zresetuj moje hasło"
 msgid "user_register_amo_link"
 msgstr "%s - Dodatki"
 
-# %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"
@@ -4712,7 +6781,7 @@ 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
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4729,7 +6798,7 @@ msgstr "ponowne przesłanie kodu potwierdzającego"
 msgid "user_register_congratulations"
 msgstr "Gratulujemy! Twoje konto zostało utworzone."
 
-# %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"
@@ -4739,7 +6808,7 @@ msgstr ""
 "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
+#. %1 is the link to the Mozilla Add-ons front page
 #: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
@@ -4799,7 +6868,7 @@ msgstr "Pseudonim"
 msgid "users_info_pagetitle"
 msgstr "Informacje o użytkowniku %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Autor recenzji: %s"
@@ -4808,8 +6877,8 @@ msgstr "Autor recenzji: %s"
 msgid "users_login_pagetitle"
 msgstr "Nazwa użytkownika"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4818,8 +6887,8 @@ msgstr ""
 "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
+#. %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"
@@ -4835,3 +6904,37 @@ msgstr "Resetowanie hasła użytkownika"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Rejestracja nowego użytkownika"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Najnowsza wersja kompatybilna z"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "recaptcha_enter_numbers"
+#~ msgstr "Wprowadź poniżej <strong>liczby</strong>, które usłyszysz."
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
\ 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 9ea5f9a..ed56668 100644
--- a/site/app/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/site/app/locale/pt_BR/LC_MESSAGES/messages.po
@@ -22,6 +22,10 @@ msgstr ""
 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 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
@@ -50,38 +54,34 @@ msgstr "Público"
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, fuzzy, php-format
-msgid "added"
-msgstr "Added %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Atualizado em %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versão %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "total de downloads"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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
+#. %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"
@@ -98,22 +98,22 @@ msgstr "por página"
 msgid "addon_list_sortby"
 msgstr "Ordenar por:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "recomendado"
 
-# %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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s não está disponível para %2$s."
 
-# %1 is the addon name
+#. %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
@@ -122,7 +122,7 @@ msgstr "%1$s não está disponível para %2$s."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Voltar à %1$s..."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -141,6 +141,7 @@ msgstr "Revisão:"
 msgid "addon_review_add_submit"
 msgstr "Enviar sua revisão"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -174,23 +175,25 @@ msgstr "Sim"
 msgid "addon_review_delete_header"
 msgstr "Remover Revisão"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Revisão removida com sucesso."
 
+#. %s is the name of the add-on
 #: 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:534
+#. %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."
+"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:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -201,24 +204,25 @@ msgstr ""
 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.
+#. %1 is the review count, %2 is the nickname or full name of the user.
 #: 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] "See %1$s previous reviews submitted by %2$s for this add-on."
+msgstr[0] "Veja %1$s revisão anterior enviada por %2$s para este Complemento."
+msgstr[1] ""
+"Veja %1$s revisões anteriores enviadas por %2$s para este Complemento."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Revisões para %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -232,13 +236,13 @@ msgstr "Resposta do desenvolvedor:"
 msgid "addon_review_saved_successfully"
 msgstr "Sua revisão foi salva com sucesso. Obrigado!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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
+#. %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
@@ -250,24 +254,27 @@ msgstr "por %1$s em %2$s (deu nota %3$s)"
 #: views/addons/home.thtml:114
 #, fuzzy
 msgid "addon_slider_tooltip_next"
-msgstr "Next Add-on"
+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 "Previous Add-on"
+msgstr "Complemento Anterior"
 
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "A versão mais recente compatível com"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-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:118
+#, fuzzy
+msgid "addon_versions_getlatestversion"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Ir"
 
@@ -275,29 +282,30 @@ msgstr "Ir"
 msgid "addons_author_tooltip"
 msgstr "Ver o perfil do autor"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 #, fuzzy
 msgid "addons_browse_all_themes_title"
-msgstr "Browse all Themes :: %1$s Add-ons"
+msgstr "Navegar em todos os Temas :: %1$s Complementos "
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, php-format
 msgid "addons_browse_browse_category"
-msgstr "Navegar pela %s"
+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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
-msgstr "Browse %1$s Themes :: %2$s Add-ons"
+msgstr "Navegar em Temas %1$s :: Complementos %2$s"
 
 #: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Adicionar uma revisão"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Detalhes avançados"
 
@@ -305,11 +313,11 @@ msgstr "Detalhes avançados"
 msgid "addons_display_categories"
 msgstr "Categorias"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "revisão detalhada"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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"
@@ -318,66 +326,70 @@ msgstr "Não gosto"
 msgid "addons_display_edit_review"
 msgstr "Editar sua revisão"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Este complemento tem uma política de privacidade."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Comentário do(s) desenvolvedor(es)"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Página na Web"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Revisões"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Suporte"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Gosto"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Descrição longa"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Mais imagens"
 
-# %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:421
+#. %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
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Outros complementos de %1$s"
-msgstr[1] "Other add-ons by these authors"
+msgstr[1] "Outros complementos destes autores"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -390,7 +402,9 @@ 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:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -403,7 +417,8 @@ 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:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -416,67 +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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Avalie"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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 "
 "eles podem precisar entrar em contato para ajudar a resolver o problema."
 
-# %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %1 is the support section link
+#: 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."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Salvar"
 
-#: views/addons/display.thtml:415
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Ver todos os complementos em %1$s"
 
-# %1 is the number of reviews
-#: views/addons/display.thtml:302
+#. %1 is the number of reviews
+#: 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:195 views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Histórico completo de versões"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: 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:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Ver as estatísticas"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "O que você acha?"
 
@@ -486,7 +501,7 @@ msgstr "Funciona em:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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"
@@ -497,10 +512,11 @@ msgstr "por"
 msgid "addons_home_feature_head"
 msgstr "Recomendamos"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -515,7 +531,9 @@ msgstr "Mais novos:"
 msgid "addons_home_other_applications"
 msgstr "Outras aplicações"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -525,19 +543,20 @@ msgstr "Outras aplicações"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -585,14 +604,15 @@ msgstr "Ver todos os complementos atualizados recentemente"
 #, fuzzy
 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>"
+"<ol><li>Clique no link abaixo para salvar o arquivo.</li><li>No Mozilla "
+"Sunbird, abra os Complementos do Menu de Ferramentas.</li><li>Clique no "
+"botão de Instalação, localize/selecione o arquivo que você fez download "
+"depois clique \"OK\".</li></ol>"
 
 #: views/elements/install.thtml:107
 #, fuzzy
 msgid "addons_install_in_sunbird_title"
-msgstr "How to Install in Sunbird"
+msgstr "Como instalar no Sunbird"
 
 #: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
@@ -634,6 +654,7 @@ msgstr "para Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "para Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -654,12 +675,13 @@ msgstr ""
 "pouco diferente de complementos, que incrementam ou modificam "
 "funcionalidades já existentes."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugins para %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
@@ -670,6 +692,7 @@ msgstr "Plugins"
 msgid "addons_plugins_support_documentation"
 msgstr "Documentação de suporte: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -677,25 +700,25 @@ msgstr ""
 "%s necessita que você aceite o seguinte termo de aceitação do usuário antes "
 "que a instalação possa prosseguir:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Visualização para %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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 "
 "populares. Divirta-se!"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Complementos recomendados"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Complementos recomendados"
 
@@ -703,7 +726,7 @@ msgstr "Complementos recomendados"
 msgid "addons_searchengines_additional_resources"
 msgstr "Recursos adicionais"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Centro do Desenvolvedor Mozilla"
@@ -721,35 +744,35 @@ msgstr ""
 "você o desativou. Por favor, ative-o antes de tentar instalar qualquer um "
 "dos mecanismos de pesquisa abaixo."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %1 is "make your own" link
+#. %2 is MDC link
 #: 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
+#. 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 "/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:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "criar o seu"
 
-# %1 is the link to mycroft.mozdev.org
+#. %1 is the link to mycroft.mozdev.org
 #: 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
+#. 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:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Mecanismos de pesquisa"
 
@@ -762,37 +785,37 @@ msgstr ""
 #: controllers/components/amo.php:201 controllers/components/amo.php:229
 #, fuzzy
 msgid "addons_status_disabled"
-msgstr "Disabled"
+msgstr "Desabilitado"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 #, fuzzy
 msgid "addons_status_incomplete"
-msgstr "Incomplete Version"
+msgstr "Versão Incompleta"
 
 #: controllers/components/amo.php:197 controllers/components/amo.php:227
 #, fuzzy
 msgid "addons_status_nominated"
-msgstr "In Sandbox; Public Nomination"
+msgstr "Na Sandbox; Nominado para Publicação"
 
 #: controllers/components/amo.php:195 controllers/components/amo.php:226
 #, fuzzy
 msgid "addons_status_pending"
-msgstr "In Sandbox; Pending Review"
+msgstr "Na Sandbox; Com revisão pendente"
 
 #: controllers/components/amo.php:199 controllers/components/amo.php:228
 #, fuzzy
 msgid "addons_status_public"
-msgstr "Public"
+msgstr "Público"
 
 #: controllers/components/amo.php:193 controllers/components/amo.php:225
 #, fuzzy
 msgid "addons_status_sandbox"
-msgstr "In Sandbox"
+msgstr "Na Sandbox"
 
 #: controllers/components/amo.php:203
 #, fuzzy
 msgid "addons_status_unknown"
-msgstr "Unknown"
+msgstr "Desconhecido"
 
 #: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
@@ -808,11 +831,12 @@ msgstr ""
 "Estas versões são exibidas para referência e teste. Você deve sempre usar as "
 "versões mais novas para um complemento."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Histórico de versões com changelogs."
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Histórico de versões do %1$s"
@@ -825,6 +849,7 @@ msgstr "Adicionar grupo"
 msgid "admin_group_delete_pagetitle"
 msgstr "Remover grupo"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -950,6 +975,7 @@ msgstr "Ignorar verificação de versão"
 msgid "app_compat_older_firefox_only"
 msgstr "Este complemento é para versões mais antigas do Firefox"
 
+#. %1$s and %2$s are URLs
 #: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
@@ -957,10 +983,13 @@ 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: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:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
@@ -973,23 +1002,23 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Atualize o Firefox</a> para utilizar este "
 "complemento"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Complementos por nome"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Complementos mais novos"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Complementos populares"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Complementos por avaliação"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Complementos atualizados recentemente"
 
@@ -1021,7 +1050,7 @@ msgstr "Atualizados mais recentemente primeiro"
 msgid "category_extra_mostpopular"
 msgstr "Mais populares primeiro"
 
-# %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"
@@ -1030,168 +1059,189 @@ msgstr "Ver todos em %1$s"
 #: controllers/collections_controller.php:84
 #, fuzzy
 msgid "collection_not_found"
-msgstr "Collection not found!"
+msgstr "Coleção não encontrada!"
+
+#. %s is a date in the _('date') format
+#: views/elements/collections_interactive_addon.thtml:85
+#, fuzzy, php-format
+msgid "collections_interactive_addon_added"
+msgstr "Adicionado %s"
 
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 msgid "compatibility_dashboard_center_header"
-msgstr "Add-on Compatibility Center"
+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: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."
+"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:107
 #, fuzzy
 msgid "compatibility_dashboard_loading"
-msgstr "Loading data..."
+msgstr "Carregando dados..."
 
 #: views/compatibility/dashboard.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_main_link"
-msgstr "Back to Main"
+msgstr "Voltar para principal"
 
 #: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_report"
-msgstr "Add-on Compatibility Report"
+msgstr "Relatório de compatibilidade dos Complementos "
 
 #: 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"
+msgstr "Informações para Desenvolvedores de Complementos"
 
 #: views/compatibility/developers.thtml:64
 #, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
-msgstr "Adjust maxVersion without uploading"
+msgstr "Ajuste maxVersion sem fazer upload"
 
 #: views/compatibility/dashboard.thtml:128
 #, fuzzy
 msgid "compatibility_developers_check_status"
-msgstr "Check Status of My Add-ons"
+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: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."
+"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:118
 #, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
-msgstr "Mozilla Developer Center Logo"
+msgstr "Logotipo do Mozilla Developer Center"
 
 #: views/compatibility/developers.thtml:71
 #, fuzzy
 msgid "compatibility_developers_no_addons"
-msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
+msgstr "Você não possui Complementos mantidos no Mozilla Add-ons."
 
 #: views/compatibility/dashboard.thtml:137
 #: views/compatibility/developers.thtml:53
 #, fuzzy
 msgid "compatibility_developers_results"
-msgstr "Add-on Status Check Results"
+msgstr "Resultados da Checagem de Status dos Complementos"
 
 #: views/compatibility/dashboard.thtml:141
 #, fuzzy
 msgid "compatibility_developers_retrieving"
-msgstr "Retrieving status of hosted add-ons..."
+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:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
-msgstr "%1$s %2$s users (%3$s&#37; of total)"
+msgstr "%1$s %2$s usuários (%3$s&#37; do total)"
 
 #: 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."
+"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:98
 #, fuzzy
 msgid "compatibility_report_detailed_link"
-msgstr "View Detailed Report"
+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: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."
+"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:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha"
-msgstr "Alpha Versions"
+msgstr "Versões Alpha"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
-msgstr "Add-ons compatible with an alpha version of %1$s"
+msgstr "Complementos compatíveis com uma versão alpha do %1$s"
 
 #: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta"
-msgstr "Beta Versions"
+msgstr "Versões Beta"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: 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"
+msgstr "Complementos compatíveis com uma versão beta ou candidata do %1$s"
 
 #: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest"
-msgstr "Latest Version"
+msgstr "Última versão"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: 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"
+msgstr "Complementos atualizados com a última versão do %1$s"
 
 #: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other"
-msgstr "Other Versions"
+msgstr "Outras versões"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
-msgstr "Add-ons not compatible with any version of %1$s"
+msgstr "Complementos não compatíveis com quaisquer versões do %1$s"
 
 #: views/compatibility/dashboard.thtml:66
 #, fuzzy
 msgid "compatibility_report_title"
-msgstr "Add-on Compatibility Report"
+msgstr "Relatório de Compatibilidade de Complementos"
 
 #: 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"
+msgstr "Informações para Usuários de Complementos"
 
 #: views/compatibility/dashboard.thtml:48
 #, fuzzy
 msgid "compatibility_view_report"
-msgstr "View Compatibility Report"
+msgstr "Ver Relatório de Compatibilidade"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Para saber como contribuir, veja o nosso %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wiki page"
 
@@ -1233,26 +1283,35 @@ msgstr ""
 "<a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons "
 "Attribution 2.5 </a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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"
 
-# date and time format string (strftime)
+#. 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 de %B de %Y às %I:%M %p"
@@ -1278,14 +1337,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 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"
@@ -1333,36 +1420,36 @@ msgstr "Passo 5: Sucesso"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ajuda para enviar"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Complemento desativado com sucesso"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Editar complemento"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Complemento ativado com sucesso"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: 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:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: 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:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Nome do complemento"
 
@@ -1371,40 +1458,298 @@ msgstr "Nome do complemento"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Rótulo para visualização"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: 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:2185
-#: controllers/developers_controller.php:2473
+#: 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:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Email para suporte"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL para suporte"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: 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:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Indicar complemento"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Complemento indicado com sucesso!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1427,7 +1772,7 @@ msgstr ""
 "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
+#. %1 is the link to the sandbox information page
 #: views/developers/add_step5.thtml:63
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1437,7 +1782,7 @@ msgstr "Você pode ler mais sobre o sistema de revisões da sandbox clicando %s.
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "aqui"
 
-# %1 is the "nominate" link
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1460,16 +1805,16 @@ 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:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Enviar complemento"
 
-#: controllers/developers_controller.php:2375
+#: controllers/developers_controller.php:2460
 msgid "devcp_addon_updated_successfully"
 msgstr "Complemento atualizado com sucesso"
 
-# %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"
@@ -1479,7 +1824,7 @@ msgstr "Você pode %s para tentar aumentar o interesse em seu complemento."
 msgid "devcp_addon_upload_preview_link"
 msgstr "escrever uma revisão"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1508,10 +1853,102 @@ msgstr "Próximo"
 msgid "devcp_change_addontype"
 msgstr "Mudar tipo do complemento:"
 
-#: controllers/developers_controller.php:1402
+#: 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 "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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Adicionar visualização"
@@ -1604,6 +2041,7 @@ msgstr "O desenvolvedor não forneceu uma URL para suporte."
 msgid "devcp_details_trusted"
 msgstr "Confiável"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1633,6 +2071,7 @@ msgstr ""
 "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"
@@ -1653,11 +2092,65 @@ msgstr ""
 "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 "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Adicionar autor"
@@ -1670,10 +2163,297 @@ msgstr "Endereço de email do autor: "
 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 "Add New Author"
+
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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"
@@ -1739,6 +2519,206 @@ msgstr "Idioma alvo"
 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 "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 "Atualizar"
@@ -1747,11 +2727,66 @@ msgstr "Atualizar"
 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 "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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Complementos em destaque"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1760,7 +2795,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Revisões avaliadas (%s)"
 msgstr[1] "Revisões avaliadas (%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
 #, php-format
@@ -1769,7 +2804,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Complementos indicados (%s)"
 msgstr[1] "Complementos indicados (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1782,8 +2817,8 @@ msgstr[1] "Atualizações pendentes (%s)"
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "Os arquivos selecionados serão deletados."
 
-# %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"
@@ -1809,29 +2844,30 @@ msgstr "Notas para o revisor"
 msgid "devcp_editversion_submit_update"
 msgstr "Atualizar"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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."
 
+#. %s is a number
 #: views/developers/add_step2.thtml:126
-#: controllers/developers_controller.php:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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: "
@@ -1839,20 +2875,34 @@ msgstr ""
 "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.
 #: controllers/components/developers.php:591
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Por favor, veja %s para referência."
 
+#. 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 "esta página"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+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"
@@ -1860,7 +2910,7 @@ msgstr ""
 "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:1654
+#: 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"
 
@@ -1889,6 +2939,8 @@ msgstr "Excede o valor máximo para envio"
 msgid "devcp_error_http_nofile"
 msgstr "Nenhum arquivo enviado"
 
+#. %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"
@@ -1896,13 +2948,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:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Arquivo install.rdf ausente."
 
@@ -1910,21 +2963,26 @@ msgstr "Arquivo install.rdf ausente."
 msgid "devcp_error_install_manifest"
 msgstr "Os seguintes erros foram encontrados em install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Por favor, selecione um tipo válido de complemento."
 
+#. %$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 "%s não é uma versão válida para %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "A ID deste complemento não é válida: %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"
@@ -1941,6 +2999,7 @@ msgid "devcp_error_invalid_version_spaces"
 msgstr ""
 "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
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1950,6 +3009,7 @@ msgstr "O seguinte erro ocorreu na leitura de install.rdf: %s"
 msgid "devcp_error_move_file"
 msgstr "Não foi possível mover arquivo"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1972,15 +3032,15 @@ msgstr "Nenhuma ID foi encontrada para este complemento em install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "Nenhuma plataforma selecionada"
 
-#: controllers/developers_controller.php:2718
+#: 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:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Você só pode indicar complementos que estejam na SandBox."
 
@@ -1992,6 +3052,8 @@ msgstr "Por favor, escolha ao menos uma categoria."
 msgid "devcp_error_one_user"
 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
 #: controllers/components/developers.php:1081
 #, php-format
 msgid "devcp_error_preview_extension"
@@ -1999,13 +3061,13 @@ 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:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Você não tem permissão para atualizar este complemento."
 
@@ -2021,7 +3083,7 @@ 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Por favor, envie um arquivo."
@@ -2243,7 +3305,7 @@ msgstr "Meus complementos"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Campos traduzidos"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2287,33 +3349,68 @@ msgstr "Enviar um complemento"
 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: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 "Voltar para os detalhes do complemento"
 
-# %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 "Indicar %s"
 
-# %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 "Tipo do complemento detectado automaticamente: %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 ""
 "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)
+#. %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"
@@ -2329,9 +3426,14 @@ msgstr ""
 "Tornar esta visualização padrão irá remover o status da visualização padrão "
 "atual."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2360,6 +3462,60 @@ msgstr "Editar visualização"
 msgid "devcp_preview_updated_successfully"
 msgstr "Visualização atualizada com sucesso."
 
+#: 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 ""
@@ -2371,10 +3527,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Adicionar visualização"
 
+#: 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 "Editar visualização"
 
+#: 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 "Arquivo de visualização"
@@ -2383,6 +3549,34 @@ msgstr "Arquivo de visualização"
 msgid "devcp_previews_label_makedefault"
 msgstr "Tornar esta a imagem de visualização padrão"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Excluír visualização"
@@ -2399,45 +3593,160 @@ msgstr "Editar visualização"
 msgid "devcp_previews_submit_upload"
 msgstr "Carregar visualização"
 
+#: 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 "Incorreto?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Tem certeza de que deseja excluír este arquivo?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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>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 "Pular a atualização das informações do complemento"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Usuários ativos por dia"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> total de downloads"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> downloads semanais"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "Submissões de complementos estão desabilitadas no momento. Por favor, tente "
@@ -2445,13 +3754,13 @@ msgstr ""
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Eu aceito"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Não aceito"
 
@@ -2467,11 +3776,11 @@ msgstr "Desabilitado"
 msgid "devcp_summary_header_trusted"
 msgstr "Confiável"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Última versão:"
 
-# %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"
@@ -2481,7 +3790,7 @@ msgstr "Você não possui nenhum complemento. Clique %s para enviar um."
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "aqui"
 
-# %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"
@@ -2491,30 +3800,674 @@ msgstr "Assegure-se de %s para seu tema."
 msgid "devcp_theme_upload_preview_link"
 msgstr "carregar uma visualização"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Por favor, veja %s para referência."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "esta página"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Editar versão"
 
-#: controllers/developers_controller.php:2572
+#: 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 "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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Este complemento está desativado"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filtrar"
@@ -2523,7 +4476,7 @@ msgstr "Filtrar"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtrar por tipo/ação"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Log de eventos"
 
@@ -2575,6 +4528,7 @@ msgstr "Ocultar comentários"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Mostrar comentários"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2584,7 +4538,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Log da revisão"
 
@@ -2608,24 +4562,24 @@ msgstr "Atividades recentes dos editores"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total de revisões"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Revisar complemento"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Por favor, preencha os seguintes campos:"
 
-#: controllers/editors_controller.php:461
+#: 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:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Não é permitido revisar seus próprios complementos."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Software externo"
 
@@ -2637,39 +4591,39 @@ msgstr "Adicionar característica"
 msgid "editors_featured_add_feature_submit"
 msgstr "Adicionar"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Característica removida com sucesso."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Complementos em destaque"
 
@@ -2695,46 +4649,47 @@ msgstr "Guia do editor"
 
 #: views/editors/queue.thtml:113
 msgid "editors_link_policy"
-msgstr "Políticas do complemento"
+msgstr "Políticas de Uso dos Complemento"
 
 #: 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
+#. %1 is the queue mode
 #: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Não existem complementos %s para revisar."
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 Dia"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hora"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minuto"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Painel de controle do editor"
 
-#: controllers/editors_controller.php:286
+#. %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 "apenas %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Pré-distribuição"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2748,21 +4703,26 @@ msgstr "Limpar"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Ação de revisão"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Publicar"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Requisitar super-revisão"
 
@@ -2770,34 +4730,42 @@ msgstr "Requisitar super-revisão"
 msgid "editors_review_action_sandbox"
 msgstr "Manter na sandbox"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Comentários da revisão"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "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:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Isto irá manter o complemento na sandbox."
 
-#: views/editors/review.thtml:159
+#: 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 "
 "parte pública."
 
-#: views/editors/review.thtml:162
+#: 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 "
 "na sandbox."
 
-#: views/editors/review.thtml:174
+#: 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 "
@@ -2825,15 +4793,15 @@ msgstr "Categorias:"
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilidade:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Descrição"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Comentários do desenvolvedor"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2841,85 +4809,111 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Arquivos:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Histórico do item"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Mensagem de indicação"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Visualizações"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Políticas de privacidade"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Revisão %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notas para o revisor"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Sumário"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Notas da versão"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "Revisão do administrador"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Indicação aprovada/publicada"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Indicação negada/sandboxed"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Não foram encontradas entradas de revisões anteriores."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Revisão do administrador"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "aprovado/público"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "negado/sandbox"
 
-#: views/editors/review.thtml:198
+#. 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 "aplicações:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "ou selecione uma resposta prévia:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "comentários:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistemas operacionais:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Topo"
 
@@ -2928,7 +4922,7 @@ msgstr "Topo"
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Não foram encontradas visualizações."
 
@@ -2937,42 +4931,49 @@ msgstr "Não foram encontradas visualizações."
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %1 is the add-ons rank in the queue, %2 is the total queue length
 #: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
-msgstr "<strong># %1$s</strong> of %2$s in queue"
+msgstr "<strong># %1$s</strong> de %2$s na fila"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Ações para o processo"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Ação"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comentários"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Data"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Revisor"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "versão/arquivo"
 
-#: controllers/editors_controller.php:411
+#: 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 "Revisão processada com sucesso."
 
@@ -2994,11 +4995,19 @@ msgstr "Pular"
 msgid "editors_reviews_header_action"
 msgstr "Ação"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: views/editors/reviews_queue.thtml:67
 msgid "editors_reviews_in_reply_to"
 msgstr "Em resposta a:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Revisões processadas com sucesso!"
 
@@ -3010,23 +5019,23 @@ 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:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Sites específicos"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Novo"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Atualizado"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Aplicação testada"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistemas operacionais testados"
 
@@ -3067,17 +5076,20 @@ msgstr "Plataformas"
 msgid "editors_th_submissiontypes"
 msgstr "Tipos de submissão"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dias"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s horas"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutos"
@@ -3086,8 +5098,8 @@ msgstr "%s minutos"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Acesso negado"
 
@@ -3095,12 +5107,13 @@ msgstr "Acesso negado"
 msgid "error_access_denied_message"
 msgstr "Você não tem autorização para ver esta página."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3110,18 +5123,19 @@ msgstr "Você não tem autorização para ver esta página."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Complemento não encontrado!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Este complemento não pode ser visualizado aqui."
 
@@ -3129,7 +5143,7 @@ msgstr "Este complemento não pode ser visualizado aqui."
 msgid "error_addon_selfreview"
 msgstr "Você não pode revisar seu próprio complemento."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Não existem complementos nesta categoria!"
 
@@ -3151,24 +5165,25 @@ msgstr "Este não é um endereço de email válido."
 msgid "error_field_required"
 msgstr "Este campo não pode ser vazio."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Arquivo não encontrado!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Erro de arquivo: %s não existe."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3185,16 +5200,18 @@ msgstr ""
 "Este endereço tem um formato inválido. Endereços válidos são do tipo http://"
 "example.com/minha_página."
 
+#. %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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3203,7 +5220,7 @@ msgstr "Argumento não existente: %s"
 #: controllers/components/amo.php:506 controllers/components/amo.php:531
 #, fuzzy
 msgid "error_no_files_in_addon"
-msgstr "No Files"
+msgstr "Sem arquivos"
 
 #: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
 msgid "error_notice"
@@ -3213,7 +5230,7 @@ msgstr "Aviso"
 msgid "error_preview_notfound"
 msgstr "Visualização não encontrada!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Você precisa selecionar uma nota."
 
@@ -3264,8 +5281,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Usuário ou senha incorretos!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versão não encontrada!"
 
@@ -3277,13 +5294,14 @@ msgstr "Senha digitada inválida!"
 msgid "feature_learnmore"
 msgstr "Saiba mais"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Saiba mais sobre %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3295,6 +5313,45 @@ msgstr[1] "revisões"
 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Todos os direitos reservados."
@@ -3331,7 +5388,7 @@ msgstr "Outros idiomas:"
 msgid "footer_privacy_policy"
 msgstr "Política de privacidade"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "salvar"
 
@@ -3339,7 +5396,7 @@ msgstr "salvar"
 msgid "general_addontype_dict"
 msgstr "Dicionário"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Dicionários"
@@ -3348,7 +5405,7 @@ msgstr "Dicionários"
 msgid "general_addontype_extension"
 msgstr "Extensão"
 
-# 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensões"
@@ -3357,7 +5414,7 @@ msgstr "Extensões"
 msgid "general_addontype_lpaddon"
 msgstr "Pacote de idioma (Complemento)"
 
-# 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Pacotes de idiomas (Complemento)"
@@ -3366,7 +5423,7 @@ msgstr "Pacotes de idiomas (Complemento)"
 msgid "general_addontype_lpapp"
 msgstr "Pacote de idioma (Aplicação)"
 
-# 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Pacotes de idiomas (Aplicação)"
@@ -3375,7 +5432,7 @@ msgstr "Pacotes de idiomas (Aplicação)"
 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
@@ -3384,7 +5441,7 @@ msgstr "Plugins"
 msgid "general_addontype_search"
 msgstr "Mecanismo de pesquisa"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Mecanismos de pesquisa"
@@ -3393,11 +5450,12 @@ msgstr "Mecanismos de pesquisa"
 msgid "general_addontype_theme"
 msgstr "Tema"
 
-# 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Temas"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3428,12 +5486,12 @@ msgid "header_navlink_addons"
 msgstr "Complementos"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Sair"
 
@@ -3441,36 +5499,41 @@ msgstr "Sair"
 msgid "header_navlink_myaccount"
 msgstr "Minha conta"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Registrar"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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
+#. %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 "<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/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
+#. %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 "Adicionar %1$s a %2$s"
 
+#. %1$s is the add-on name
 #: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3493,7 +5556,7 @@ msgid "langtools_download_langpack"
 msgstr "Baixar pacote de idioma"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dicionários e pacotes de idiomas"
 
@@ -3550,7 +5613,7 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3583,7 +5646,7 @@ msgstr "Temas"
 msgid "other_apps_tooltip"
 msgstr "Encontre complementos para outras aplicações"
 
-# In a user list: user 1, user 2, "others"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "outros"
@@ -3591,52 +5654,51 @@ msgstr "outros"
 #: controllers/pages_controller.php:90
 #, fuzzy
 msgid "page_title_appversions"
-msgstr "Application Versions"
+msgstr "Versões da Aplicação"
 
 #: controllers/pages_controller.php:92
 #, fuzzy
 msgid "page_title_credits"
-msgstr "Credits"
+msgstr "Créditos"
 
-#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_experimental_addons"
-msgstr "Experimental Add-ons"
+msgstr "Complementos Experimentais"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
+msgstr "Perguntas Frequentes"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
-msgstr "Fashion your Firefox FAQ"
+msgstr "FAQ do Fashion Your Firefox"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 #, fuzzy
 msgid "page_title_policy"
-msgstr "Add-ons Policy"
+msgstr "Política de Uso dos Complementos"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 #, fuzzy
 msgid "page_title_privacy"
-msgstr "Mozilla Privacy Policy"
+msgstr "Política de Privacidade Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 #, fuzzy
 msgid "page_title_review_guide"
-msgstr "Review Guidelines"
+msgstr "Regras gerais para Revisores"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 #, fuzzy
 msgid "page_title_sandbox"
-msgstr "Sandbox Review System"
+msgstr "Sistema de Revisão da Sandbox"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 #, fuzzy
 msgid "page_title_submissionhelp"
-msgstr "Submission Help"
+msgstr "Ajuda com Envio"
 
 #: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
@@ -3653,6 +5715,7 @@ msgstr ""
 "rdf com pelo menos uma das aplicações abaixo. Somente as versões listadas "
 "são suportadas para estas aplicações."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3660,6 +5723,8 @@ msgstr ""
 "Se sua aplicação não necessita do arquivo install.rdf, você deverá incluir "
 "devido aos requisitos pelas propriedades especificadas %s."
 
+#. 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 "aqui"
@@ -3668,7 +5733,6 @@ msgstr "aqui"
 msgid "pages_appversions_versions"
 msgstr "Versões"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Voltar para a página anterior"
 
@@ -3680,7 +5744,7 @@ msgstr "Página de informação da sandbox"
 msgid "pagination_next_page"
 msgstr "próximo"
 
-# %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"
@@ -3705,8 +5769,8 @@ msgstr "Insira sua resposta aqui:"
 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
+#. %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"
@@ -3714,8 +5778,8 @@ 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
+#. %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"
@@ -3731,37 +5795,37 @@ msgstr "Você é humano?"
 msgid "recaptcha_whatsthis"
 msgstr "O que é isso?"
 
-#: controllers/reviews_controller.php:556
+#: 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 "Misplaced bug report or support request"
+msgstr "Pedido de suporte ou relato de Bug inválivo"
 
 #: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 #, fuzzy
 msgid "review_flag_reason_instructions"
-msgstr "Report this review (select a reason)"
+msgstr "Relatar esta revisão (selecione uma razão)"
 
 #: models/reviews_moderation_flag.php:67
 #, fuzzy
 msgid "review_flag_reason_language"
-msgstr "Inappropriate language/dialog"
+msgstr "Linguajar inapropriado"
 
 #: models/reviews_moderation_flag.php:71
 #, fuzzy
 msgid "review_flag_reason_other"
-msgstr "Other (please specify)"
+msgstr "Outros ( especificar )"
 
 #: models/reviews_moderation_flag.php:65
 #, fuzzy
 msgid "review_flag_reason_spam"
-msgstr "Spam or otherwise non-review content"
+msgstr "Spam ou conteúdo que não é uma revisão"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Obrigado; esta revisão foi marcada para aprovação de um editor."
 
@@ -3775,7 +5839,7 @@ msgstr ""
 "Esta revisão é inapropriada, incorreta ou spam? Clique aqui para marcá-la "
 "para revisão de um editor."
 
-# %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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3794,21 +5858,22 @@ msgstr ""
 "ul><p>Leia as <a href=\"%2$s\">Dicas de revisão</a> para maiores detalhes "
 "sobre revisões de complementos.</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 "Revisões para %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Complementos selecionados"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Complementos mais novos"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Atualizar complementos"
 
@@ -3847,6 +5912,7 @@ msgstr "Todos os mecanismos de pesquisa"
 msgid "search_landing_browse_search_engines"
 msgstr "Ver mecanismos de pesquisa"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3866,12 +5932,13 @@ msgstr "Procure por complementos"
 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:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Resultados da procura: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Ferramentas administrativas"
 
@@ -3879,7 +5946,7 @@ msgstr "Ferramentas administrativas"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Ferramentas do desenvolvedor"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Ferramentas de edição"
 
@@ -3887,6 +5954,7 @@ msgstr "Ferramentas de edição"
 msgid "sidebar_navlink_welcome"
 msgstr "Bem vindo"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3924,6 +5992,7 @@ msgstr "Tema"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Complementos atualizados"
 
+#. %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
@@ -3935,7 +6004,7 @@ msgstr "%1$s KB"
 msgid "stars_not_yet_rated"
 msgstr "Sem pontuação"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3953,24 +6022,32 @@ msgstr "Ferramentas do desenvolvedor"
 msgid "statistics_addon_switch"
 msgstr "Trocar complemento"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 de %b"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 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:147 views/statistics/addon.thtml:158
+#: 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -4012,10 +6089,10 @@ msgstr "Painel de estatísticas"
 msgid "statistics_index_view_button"
 msgstr "Ver estatísticas"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
-msgstr "View this table in CSV format"
+msgstr "Visualizar esta tabela em formato CSV"
 
 #: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
@@ -4028,116 +6105,121 @@ msgstr "Remover este parâmetro"
 #: controllers/statistics_controller.php:224
 #, fuzzy
 msgid "statistics_js_groupby_selector_date"
-msgstr "Group by: Day"
+msgstr "Agrupar por: Dia"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
-msgstr "Group by: Month"
+msgstr "Agrupar por: Mês"
 
 #: controllers/statistics_controller.php:225
 #, fuzzy
 msgid "statistics_js_groupby_selector_week"
-msgstr "Group by: Week"
+msgstr "Agrupar por: Semana"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s encontrado"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Adicionar parâmetro"
 
-#: controllers/statistics_controller.php:246
+#: 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:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Ocultar a contagem total"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Mostrar a contagem total"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_tooltip"
-msgstr "Plot the total count on this graph"
+msgstr "Colocar a contagem total neste gráfico"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Ver dados (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Ocultar %s eventos"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Mostrar %s eventos"
 
-#: controllers/statistics_controller.php:244
+#: 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"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Ocultar eventos do Firefox"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Mostrar eventos do Firefox"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Encolher gráfico"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expandir gráfico"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Redimensionar o gráfico"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Usuários ativos diariamente"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplicação"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personalizado"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistema operacional"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Estado do complemento"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Sumário"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Versão do complemento"
 
@@ -4161,13 +6243,13 @@ msgstr "Desconhecido"
 msgid "statistics_longnames_version"
 msgstr "Versão do complemento"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "Não existem dados suficientes para exibir este gráfico. Por favor, verifique "
 "novamente mais tarde."
 
-#: views/statistics/addon.thtml:116
+#: 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 "
@@ -4180,13 +6262,13 @@ msgstr ""
 "podem estar incompletos enquatno nossos scripts trabalham para atualizar a "
 "informação. Por favor, verifique novamente dentro de alguns minutos."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr ""
 "O painel de estatísticas está desativado no momento. Por favor, verifique "
 "novamente mais tarde."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr ""
 "É necessário JavaScript para ver os gráficos do painel de estatísticas."
@@ -4202,36 +6284,36 @@ msgstr "Suas configurações foram atualizadas!"
 msgid "statistics_pagetitle"
 msgstr "Painel de estatísticas"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Usuários ativos diariamente"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Downloads diários"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Aproximar"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Aproximar para um mês"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Afastar"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Afastar um mês"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Resumo diários das estatísticas de %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "RSS feed do resumo dos dados"
 
@@ -4271,23 +6353,23 @@ msgstr "Público"
 msgid "statistics_settings_access_public_description"
 msgstr "Todos podem ver as estatísticas deste compelento"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Alterar as configurações"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Por favor, trate essas informações como confidenciais."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Este painel é atualmente <b>privado</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Este painel é atualmente <b>público</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Bloqueado"
 
@@ -4304,7 +6386,7 @@ msgstr "Salvar configurações"
 msgid "statistics_settings_title"
 msgstr "Configurações do painel de estatísticas de  %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Desbloqueado"
 
@@ -4328,7 +6410,7 @@ msgstr "Desc."
 msgid "statistics_shortnames_version"
 msgstr "Ver."
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Média de downloads diários"
 
@@ -4336,37 +6418,37 @@ msgstr "Média de downloads diários"
 msgid "statistics_summary_downloads_heading"
 msgstr "Downloads"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Contagem do último dia"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads nos últimos 7 dias"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Total de downloads"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: 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:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Sem dados até o momento"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: 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"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Alteração desde última contagem"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s em %2$s"
@@ -4375,17 +6457,17 @@ msgstr "%1$s em %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Usuários ativos por dia"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Usuários ativos por dia"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Em %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Estatísticas para %1$s"
@@ -4410,121 +6492,124 @@ msgstr "Mudar senha"
 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
+#. %1 is the email address, %2 is the URL of the user registration page
 #: 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>."
+"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:95
 #, fuzzy
 msgid "user_del_community_sad"
-msgstr "The Mozilla Add-ons community is sad to see you go."
+msgstr "A comunidade de Mozilla Add-ons ficará triste em saber que vai."
 
 #: views/users/delete.thtml:116
 #, fuzzy
 msgid "user_del_confirm_password"
-msgstr "Confirm Password"
+msgstr "Confirme senha"
 
 #: views/users/delete.thtml:127
 #, fuzzy
 msgid "user_del_deletenow"
-msgstr "Delete my user account now"
+msgstr "Delete minha conta de usuário agora"
 
-# %1 is the URL of the user's info page
+#. %1 is the URL of the user's info page
 #: 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."
+"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 "
+"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
+#. %1 is a link to the amo-editors mailing list
 #: 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."
+msgstr ""
+"Se você tem outras perguntas, por favor entre em contato com %1$s para obter "
+"assistência."
 
 #: 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."
+"Você precisa marcar a caixa \"Eu Concordo...\" antes de deletar sua conta."
 
 #: views/users/delete.thtml:78
 #, fuzzy
 msgid "user_del_error_password"
-msgstr "Please enter your password correctly in order to perform this step."
+msgstr "Por favor entre com sua senha corretamente para completar este passo."
 
-# %1 is a link to the amo-admins mailing list
+#. %1 is a link to the amo-admins mailing list
 #: 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."
+"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:103
 #, fuzzy
 msgid "user_del_header_confirm_deletion"
-msgstr "Confirm account deletion"
+msgstr "Confirme Deletar de Conta"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/delete.thtml:93
 #, fuzzy
 msgid "user_del_header_delete_account"
-msgstr "Delete User Account %1$s"
+msgstr "Deletar conta de usuário %1$s"
 
 #: views/users/delete.thtml:48
 #, fuzzy
 msgid "user_del_header_farewell"
-msgstr "Farewell!"
+msgstr "Despedida!"
 
 #: views/users/delete.thtml:108
 #, fuzzy
 msgid "user_del_nologin"
-msgstr "You will not be able to log into Mozilla Add-ons anymore."
+msgstr "Você não poderá acessar o Mozilla Add-ons novamente."
 
 #: 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:"
+"Ao clicar \"deletar\" sua conta será <strong>permanentemente removida</"
+"strong>. Ou seja:"
 
 #: 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."
+"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
+#. %1 is a link to the amo-editors mailing list
 #: 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."
+"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:123
 #, fuzzy
 msgid "user_del_understand_permanent"
-msgstr "I understand that this step cannot be undone."
+msgstr "Eu entendo que este passo não tem volta."
 
 #: views/helpers/addons_html.php:184
 #, fuzzy
 msgid "user_deleted_nickname"
-msgstr "Deleted User"
+msgstr "Usuário deletado"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4536,11 +6621,11 @@ msgstr ""
 #: views/users/edit.thtml:183
 #, fuzzy
 msgid "user_edit_delete_user"
-msgstr "Delete user account"
+msgstr "Apagar conta de usuário"
 
-# 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4559,7 +6644,7 @@ msgstr ""
 "Obrigado por participar do %2$s Add-ons\n"
 "-- Pessoal do %2$s Add-ons"
 
-# %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, fuzzy, php-format
@@ -4583,8 +6668,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Obrigado por participar do %s Add-ons"
 
-# 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
 #, php-format
 msgid "user_email_pwreset"
@@ -4611,7 +6696,7 @@ msgstr "Resetar sua senha do %s Add-ons"
 msgid "user_emailchange_error"
 msgstr "Erro!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, fuzzy, php-format
 msgid "user_emailchange_subject"
@@ -4621,7 +6706,7 @@ msgstr "Por favor, confirme a troca de endereço de e-mail no %1$s Add-ons"
 msgid "user_emailchange_success"
 msgstr "Successo!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, fuzzy, php-format
 msgid "user_emailchange_successful_description"
@@ -4684,7 +6769,7 @@ msgstr "Senha antiga"
 #: views/users/edit.thtml:100 views/users/edit.thtml:182
 #, fuzzy
 msgid "user_form_otheractions"
-msgstr "Other Actions"
+msgstr "Outras ações"
 
 #: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
@@ -4796,7 +6881,7 @@ msgstr "Enviar endereço para resetar senha"
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
 
-# %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"
@@ -4804,7 +6889,7 @@ msgstr ""
 "Um endereço para ativar sua conta de usuário foi enviado ao email %1$s. Você "
 "deverá clicar no endereço antes de acessar o %2$s Add-ons."
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4821,7 +6906,7 @@ msgstr "envie novamente o email de confirmação"
 msgid "user_register_congratulations"
 msgstr "Parabéns! Sua conta foi criada com sucesso."
 
-# %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"
@@ -4830,7 +6915,7 @@ msgstr ""
 "de email não colocou a mensagem na \"lixeira\" ou \"spam\". Se precisar, "
 "podemos %1$s utilizando o email acima."
 
-# %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4839,17 +6924,17 @@ msgstr "Obrigado por se registrar e bem-vindo ao %1$s!"
 #: 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."
+msgstr "O primeiro nome, último nome, ou apelido deve ser adicionado."
 
 #: views/users/edit.thtml:97 views/users/edit.thtml:133
 #, fuzzy
 msgid "user_tab_notifications"
-msgstr "Notifications"
+msgstr "Notificações"
 
 #: views/users/edit.thtml:96 views/users/edit.thtml:104
 #, fuzzy
 msgid "user_tab_profile"
-msgstr "User Profile"
+msgstr "Profile do Usuário"
 
 #: controllers/users_controller.php:209
 msgid "user_verified_okay"
@@ -4858,7 +6943,7 @@ msgstr "Verificado com sucesso!"
 #: controllers/users_controller.php:698
 #, fuzzy
 msgid "users_delete_pagetitle"
-msgstr "Delete User Account"
+msgstr "Apagar conta de usuário"
 
 #: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
@@ -4894,18 +6979,18 @@ msgstr "Apelido"
 msgid "users_info_pagetitle"
 msgstr "Informação de usuário para %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
-msgstr "Reviews by %s"
+msgstr "Revisões por %s"
 
 #: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Login do usuário"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4914,8 +6999,8 @@ msgstr ""
 "tem uma conta no Mozilla Add-ons, faça login, ou <a href=\"%1$s\">leia mais "
 "sobre a sandbox.</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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4931,3 +7016,33 @@ msgstr "Resetar senha de usuário"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Registro de novo usuário"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "A versão mais recente compatível com"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "sidebar_navlink_tools"
+#~ msgstr "Ferramentas"
diff --git a/site/app/locale/pt_PT/LC_MESSAGES/messages.po b/site/app/locale/pt_PT/LC_MESSAGES/messages.po
index 863f4dc..3d4cc3b 100644
--- a/site/app/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/site/app/locale/pt_PT/LC_MESSAGES/messages.po
@@ -17,6 +17,10 @@ msgstr ""
 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 parenthesis are included in the string. :(
 #: views/elements/install.thtml:69
 #: views/elements/install.thtml:185
 #: views/elements/install.thtml:199
@@ -56,44 +60,40 @@ msgstr "Público"
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Adicionado %s"
-
-#: views/elements/addon_listitem.thtml:145
+#. %s is a date in the _('date') format
+#: views/elements/addon_listitem.thtml:138
 #: views/elements/feature.thtml:111
-#: views/addons/display.thtml:103
+#: 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/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versão %s"
 
-#: views/elements/addon_listitem.thtml:136
+#: views/elements/addon_listitem.thtml:129
 #: views/elements/feature.thtml:103
-#: views/addons/display.thtml:115
+#: views/addons/display.thtml:139
 #: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "transferências"
 
-#: views/addons/display.thtml:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "Transferências totais"
 
-#: views/elements/addon_listitem.thtml:136
+#: views/elements/addon_listitem.thtml:129
 #: views/elements/feature.thtml:103
-#: views/addons/display.thtml:114
-#: views/addons/display.thtml:118
+#: 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
+#. %1 is the add-on count, %2 the category name
 #: views/addons/browse_thumbs.thtml:118
 #: views/addons/browse.thtml:75
 #, php-format
@@ -111,7 +111,7 @@ msgstr "por página"
 msgid "addon_list_sortby"
 msgstr "Ordenar por:"
 
-#: views/elements/addon_listitem.thtml:69
+#: views/elements/addon_listitem.thtml:68
 #: views/elements/feature.thtml:89
 #: views/addons/display.thtml:51
 #: views/addons/browse_thumbs.thtml:67
@@ -119,17 +119,17 @@ msgstr "Ordenar por:"
 msgid "addon_listitem_flag_experimental"
 msgstr "em teste"
 
-#: views/elements/addon_listitem.thtml:72
+#: views/elements/addon_listitem.thtml:71
 #: views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "recomendado"
 
-# %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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s não está disponível para %2$s."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/addons/policy.thtml:108
 #: views/addons/previews.thtml:60
 #: views/addons/versions.thtml:113
@@ -141,7 +141,7 @@ msgstr "%1$s não está disponível para %2$s."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Voltar a %1$s..."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58
 #: views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
@@ -161,6 +161,7 @@ msgstr "Comentário:"
 msgid "addon_review_add_submit"
 msgstr "Submeter o seu comentário"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -195,20 +196,22 @@ msgstr "Sim"
 msgid "addon_review_delete_header"
 msgstr "Eliminar comentário"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Comentário eliminado com sucesso."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Editar comentário para %s"
 
-# %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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 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:49
 msgid "addon_review_in_moderation"
 msgstr "Nota: Antes do seu comentário ser apresentado, será moderado por um editor."
@@ -217,7 +220,7 @@ msgstr "Nota: Antes do seu comentário ser apresentado, será moderado por um ed
 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.
+#. %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"
@@ -225,16 +228,16 @@ msgid_plural "addon_review_others_by_user"
 msgstr[0] "Veja o comentário anterior do %1$s submetido por %2$s ."
 msgstr[1] "Veja os %1$s comentários anteriores submetidos por %2$s para este extra."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Avaliações para %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -248,15 +251,15 @@ msgstr "Resposta do Desenvolvedor:"
 msgid "addon_review_saved_successfully"
 msgstr "O seu comentário foi guardado com sucesso. Obrigado!"
 
-#: views/addons/display.thtml:285
-#: views/addons/display.thtml:288
+#: 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
+#. %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
@@ -283,12 +286,13 @@ msgstr "Extra anterior"
 msgid "addon_version_permalink"
 msgstr "Ligação permanebte para esta versão"
 
-#: views/addons/versions.thtml:123
-#: views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-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:118
+msgid "addon_versions_getlatestversion"
+msgstr "A versão mais recente compatível com o %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Ir"
 
@@ -297,19 +301,20 @@ msgstr "Ir"
 msgid "addons_author_tooltip"
 msgstr "Ver perfil do autor"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "Navegar em todos os temas :: Extras do %1$s"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "Navegar nos temas do %1$s :: Extras do %2$s"
 
@@ -317,7 +322,7 @@ msgstr "Navegar nos temas do %1$s :: Extras do %2$s"
 msgid "addons_display_add_review"
 msgstr "Adicionar comentário"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Detalhes avançados"
 
@@ -325,11 +330,11 @@ msgstr "Detalhes avançados"
 msgid "addons_display_categories"
 msgstr "Categorias"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "comentário detalhado"
 
-#: views/addons/display.thtml:368
+#: views/addons/display.thtml:392
 #: views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
@@ -339,145 +344,153 @@ msgstr "Não gostei"
 msgid "addons_display_edit_review"
 msgstr "Editar o seu comentário"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Este extra tem uma política de privacidade."
 
-#: views/addons/display.thtml:367
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Comentários do desenvolvedor"
 
-#: views/addons/display.thtml:208
-#: views/addons/display.thtml:211
+#: views/addons/display.thtml:232
+#: views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Página Inicial"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
-msgstr "Avaliações"
+msgstr "Comentários"
 
-#: views/addons/display.thtml:225
-#: views/addons/display.thtml:228
+#: views/addons/display.thtml:249
+#: views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Suporte"
 
-#: views/addons/display.thtml:369
+#: views/addons/display.thtml:393
 #: views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Gostei"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "descrição Longa"
 
-#: views/addons/display.thtml:371
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Mais Imagens"
 
-# %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:421
+#. %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] "Outros extras de %1$s"
 msgstr[1] "Outros extras destes autores"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147
+#: controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "O suporte para este extra e fornecido pelo desenvolvedor em %s"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: 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"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Avalie"
 
-#: views/addons/display.thtml:370
+#: 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:387
-#: views/addons/display.thtml:390
+#: 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:405
+#. %1 is the review guidelines link
+#: 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:396
-#: views/addons/display.thtml:400
+#. %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 "Veja a <a href=\"%1$s\">secção de suporte</a> para saber onde obter ajuda sobre este extra."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Guardar"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: 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:195
-#: views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Histórico Completo da Versão"
 
-#: views/addons/display.thtml:335
+#: views/addons/display.thtml:359
 #: views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Ver a fonte"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Ver estatísticas"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "O que acha?"
 
@@ -487,7 +500,7 @@ msgstr "Funciona com:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129
+#: views/elements/addon_listitem.thtml:122
 #: views/elements/feature.thtml:95
 #: views/addons/policy.thtml:62
 #: views/addons/display.thtml:68
@@ -503,13 +516,13 @@ msgid "addons_home_feature_head"
 msgstr "Nós recomendamos"
 
 #: controllers/search_controller.php:211
-#: controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254
-#: controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528
-#: controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897
-#: controllers/addons_controller.php:953
+#: controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383
+#: controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657
+#: controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, 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."
@@ -522,7 +535,9 @@ msgstr "Mais Recentes:"
 msgid "addons_home_other_applications"
 msgstr "Outras Aplicações"
 
-#: controllers/developers_controller.php:64
+#. %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:610
@@ -537,25 +552,26 @@ msgstr "Outras Aplicações"
 #: controllers/users_controller.php:698
 #: controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
-#: controllers/reviews_controller.php:345
-#: controllers/reviews_controller.php:424
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
 #: controllers/search_controller.php:178
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214
-#: controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530
-#: controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689
-#: controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776
-#: controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58
-#: controllers/pages_controller.php:123
+#: controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283
+#: controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516
+#: controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803
+#: controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885
+#: controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -651,6 +667,7 @@ msgstr "para Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "para Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -664,13 +681,14 @@ msgstr "Procura um plugin que não está aqui?"
 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."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugins Comuns para o %1$s"
 
 #: controllers/components/amo.php:724
-#: controllers/addons_controller.php:776
+#: controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
@@ -684,28 +702,29 @@ msgstr "Plugins"
 msgid "addons_plugins_support_documentation"
 msgstr "Documentação de Suporte: "
 
+#. %s is the name of the add-on
 #: 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 addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Pré-visualizações para %s"
 
 #: views/addons/recommended.thtml:50
-#: controllers/addons_controller.php:1018
+#: controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Extras Recomendados"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Extras Recomendados"
 
@@ -714,7 +733,7 @@ msgstr "Extras Recomendados"
 msgid "addons_searchengines_additional_resources"
 msgstr "Recursos adicionais"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153
 #: views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
@@ -728,41 +747,41 @@ msgstr "Desculpe, precisa de um navegador baseado no Mozilla (como o Firefox) pa
 msgid "addons_searchengines_error_nojavascript"
 msgstr "O JavaScript é necessário para instalar plugins, mas parece que o tem desactivado. Por favor active o JavaScript antes de tentar instalar qualquer dos plugins procurados abaixo."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %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 "Saiba como %1$s em %2$s."
 
-# link path to search plugins instructions, relative to devmo
+#. 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 "/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:151
 #: views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "como fazer o seu"
 
-# %1 is the link to mycroft.mozdev.org
+#. %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 "Navegar muitos mais motores de pesquisa em %1$s"
 
-# link text to mycroft.mozdev.org
+#. 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:755
-#: controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884
+#: controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Motores de Pesquisa"
 
@@ -777,6 +796,7 @@ msgid "addons_status_disabled"
 msgstr "Desactivado"
 
 #: controllers/components/amo.php:191
+#: controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Versão incompleta"
 
@@ -818,11 +838,12 @@ 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."
 
 #: views/addons/versions.thtml:50
-#: controllers/addons_controller.php:1184
+#: controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Histórico da Versão com Registo de alterações"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s Histórico da Versão"
@@ -835,6 +856,7 @@ msgstr "Adicionar Grupo"
 msgid "admin_group_delete_pagetitle"
 msgstr "Apagar Grupo"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -963,14 +985,18 @@ msgstr "Ignorar a verificação da versão"
 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: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: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: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>"
@@ -979,23 +1005,23 @@ msgstr "Esta versão necessita do ainida não lançado <a href=\"%1$s\">Firefox
 msgid "app_compat_update_firefox"
 msgstr "<a href=\"http://getfirefox.com\">Actualize o Firefox</a> para utilizar este extra"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Extras por nome"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Extras mais recentes"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Extras populares"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Extras por avaliação"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Extras actualizados recentemente"
 
@@ -1028,7 +1054,7 @@ msgstr "Os mais Recentemente Actualizados Primeiro"
 msgid "category_extra_mostpopular"
 msgstr "Os mais Populares Primeiro"
 
-# %1 is the category name
+#. %1$s is the category name
 #: views/addons/searchengines.thtml:135
 #: views/addons/category_landing.thtml:51
 #, php-format
@@ -1039,11 +1065,19 @@ msgstr "Ver todos %1$s"
 msgid "collection_not_found"
 msgstr "Coleção não encontrada!"
 
+#. %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"
+
 #: 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: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."
@@ -1075,6 +1109,8 @@ msgstr "Ajustar a maxVersion sem carregar"
 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: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."
@@ -1096,6 +1132,10 @@ msgstr "Resultados da verificação do estado dos extras"
 msgid "compatibility_developers_retrieving"
 msgstr "A obter dados sobre o estado dos extras hospedados..."
 
+#. %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 %2$s utilizadores (%3$s&#37; no total)"
@@ -1108,6 +1148,8 @@ msgstr "Os extras abaixo têm 95% de uso conhecido pela Mozilla e são ordenados
 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: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."
@@ -1116,6 +1158,7 @@ msgstr " %1$s extras que tenham 95&#37; de uso do extra conhecido pela Mozilla,
 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:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Extras compatíveis com uma versão alpha do %1$s"
@@ -1124,6 +1167,7 @@ msgstr "Extras compatíveis com uma versão alpha do %1$s"
 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:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "Extras compatíveis com uma versão beta ou release candidate do %1$s"
@@ -1132,6 +1176,7 @@ msgstr "Extras compatíveis com uma versão beta ou release candidate do %1$s"
 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:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Extras actualizados com a última versão do %1$s"
@@ -1140,6 +1185,7 @@ msgstr "Extras actualizados com a última versão do %1$s"
 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:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Extras não compatíveis com nenhuma versão do %1$s"
@@ -1158,12 +1204,13 @@ msgstr "Informação para os utilizadores dos extras"
 msgid "compatibility_view_report"
 msgstr "Ver relatório de compatibilidade"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: 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:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "página wiki"
 
@@ -1199,12 +1246,16 @@ msgstr "Software e Imagens"
 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>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147
+#: views/elements/addon_listitem.thtml:140
 #: views/elements/feature.thtml:112
 #: views/users/info.thtml:70
 #: views/editors/reviews_queue.thtml:57
@@ -1214,9 +1265,9 @@ msgstr "Alguns ícones utilizados são da <a href=\"http://www.famfamfam.com/lab
 #: 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:286
-#: views/addons/display.thtml:290
+#: 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
@@ -1227,8 +1278,11 @@ msgstr "Alguns ícones utilizados são da <a href=\"http://www.famfamfam.com/lab
 msgid "date"
 msgstr "%B %e, %Y"
 
-# date and time format string (strftime)
+#. 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 "%B %e, %Y, %I:%M %p"
@@ -1254,14 +1308,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1303,36 +1385,36 @@ msgstr "Passo 5: Sucesso"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ajuda da Submissão"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Extra desactivado com sucesso"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Editar Extra"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Extra activado com sucesso"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: 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:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "ALUF"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: 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:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Nome do Extra"
 
@@ -1341,40 +1423,240 @@ msgstr "Nome do Extra"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Captura da Pré-visualização"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: 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:2185
-#: controllers/developers_controller.php:2473
+#: 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:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Correio Electrónico de Suporte"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL de Suporte"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: 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:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Nomear Extra"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Extra nomeado com sucesso!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: views/developers/addon_status.thtml:178
+msgid "devcp_addon_status_action_activate"
+msgstr "Tornar activo"
+
+#: 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:136
+msgid "devcp_addon_status_action_complete"
+msgstr "Completar extra"
+
+#: 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:182
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Tornar inactivo"
+
+#: 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:144
+msgid "devcp_addon_status_action_move"
+msgstr "Mover para oSandbox"
+
+#: 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:140
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nomear par público"
+
+#: 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:148
+msgid "devcp_addon_status_action_public"
+msgstr "Tornar público"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+msgid "devcp_addon_status_criteria_description"
+msgstr "Necessária descrição do extra "
+
+#: views/developers/addon_status.thtml:99
+msgid "devcp_addon_status_criteria_name"
+msgstr "Necessário nome do extra"
+
+#: 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 "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 "Add-on Summary required"
+
+#. %s is the status in a span, e.g. "<span>_('Public')</span>".
+#: views/developers/addon_status.thtml:58
+msgid "devcp_addon_status_header"
+msgstr "Estado do extra: %s"
+
+#: views/developers/addon_status.thtml:153
+msgid "devcp_addon_status_header_actions"
+msgstr "Acções disponíveis"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+msgid "devcp_addon_status_public"
+msgstr "Público"
+
+#: 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 "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 "Estado  do %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"
@@ -1392,7 +1674,7 @@ 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 "
 
-# %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"
@@ -1402,7 +1684,7 @@ msgstr "Pode ler mais sobre o Sistema de comentários do Sandbox em %s."
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "aqui"
 
-# %1 is the "nominate" link
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1420,16 +1702,16 @@ 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."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Submeter Extra"
 
-#: controllers/developers_controller.php:2375
+#: controllers/developers_controller.php:2460
 msgid "devcp_addon_updated_successfully"
 msgstr "Extra actualizado com sucesso"
 
-# %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"
@@ -1439,7 +1721,7 @@ msgstr "Pode desejar que %s para aumentar o interesse no seu extra."
 msgid "devcp_addon_upload_preview_link"
 msgstr "carregar um comentário"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1474,10 +1756,88 @@ msgstr "Seguinte"
 msgid "devcp_change_addontype"
 msgstr "Mudar o tipo de extra:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "Comentário actualizado do Developer."
 
+#: views/developers/dashboard.thtml:68
+msgid "devcp_dashboard_active"
+msgstr "Activo"
+
+#. %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 "Alterar estado"
+
+#. %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 "Estado do extra: %s"
+
+#: views/developers/dashboard.thtml:43
+msgid "devcp_dashboard_header_main"
+msgstr "Quadro do desenvolvedor"
+
+#: views/developers/dashboard.thtml:110
+msgid "devcp_dashboard_header_welcome"
+msgstr "Bem vindo ao quadro do desenvolvedor"
+
+#: views/developers/dashboard.thtml:68
+msgid "devcp_dashboard_inactive"
+msgstr "Inactivo"
+
+#. %s is a date in the _('date') format
+#: views/developers/dashboard.thtml:65
+msgid "devcp_dashboard_last_edited"
+msgstr "Última edição em %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 "Começar"
+
+#: views/developers/dashboard.thtml:82
+msgid "devcp_dashboard_versions"
+msgstr "Versões e ficheiros"
+
+#: views/developers/dashboard.thtml:91
+msgid "devcp_dashboard_versions_new"
+msgstr "Carregar uma nova versão"
+
+#. %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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Adicionar pré-visualização"
@@ -1570,6 +1930,7 @@ msgstr "Nenhum url de suporte fornecido pelo desenvolvedor."
 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
@@ -1596,6 +1957,7 @@ 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."
 
+#. %s is the name of an add-on
 #: views/developers/disable.thtml:55
 #, php-format
 msgid "devcp_disable_disable_title"
@@ -1613,11 +1975,53 @@ 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."
 
+#. %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"
+
+#: views/developers/discuss.thtml:57
+msgid "devcp_discuss_allreplies_header"
+msgstr "Respostas"
+
+#. 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 "Houve um erro ao guardar a sua respostay. Contacte %1$s sobre este 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 "Um editor de extras da Mozilla pediu-lhe mais informação sobre a versão %2$s do seu extra %1$s."
+
+#. %1 is the add-on name
+#: views/developers/discuss.thtml:43
+msgid "devcp_discuss_pagetitle"
+msgstr "Fornecer mais informação sobre o comentário %1$s do extra."
+
+#. submit button text
+#: views/developers/discuss.thtml:79
+msgid "devcp_discuss_submit_reply"
+msgstr "Submeter resposta"
+
+#: views/developers/discuss.thtml:72
+msgid "devcp_discuss_success_message"
+msgstr "A sua resposta foi guardada com sucesso. Os outros participantes na serão notificados por correio electrónicol."
+
+#. 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 "escrito por %1$s em %2$s"
+
 #: views/developers/edit.thtml:65
 #: views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
@@ -1631,10 +2035,234 @@ msgstr "Endereço de Correio Electrónico do Autor"
 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:94
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Adicionar autor"
+
+#: 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:96
+msgid "devcp_edit_authors_add_loading"
+msgstr "A verificar a conta de correio..."
+
+#: 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:57
+msgid "devcp_edit_authors_header_current"
+msgstr "Autores actuais"
+
+#: views/developers/addon_edit_authors.thtml:49
+msgid "devcp_edit_authors_header_manage"
+msgstr "Gerir autores dos extras"
+
+#: 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: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
+msgid "devcp_edit_authors_option_empty"
+msgstr "----------------"
+
+#: 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:61
+msgid "devcp_edit_authors_th_author"
+msgstr "Autor"
+
+#. Column name in a table.
+#: 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:62
+msgid "devcp_edit_authors_th_role"
+msgstr "Papel"
+
+#: views/developers/addon_edit_authors.thtml:75
+msgid "devcp_edit_authors_update_author"
+msgstr "Actualizar autores"
+
+#: views/developers/addon_edit_categories.thtml:99
+msgid "devcp_edit_categories_button_update"
+msgstr "Actualizar categorias"
+
+#: views/developers/addon_edit_categories.thtml:88
+msgid "devcp_edit_categories_does_not_fit"
+msgstr "O meu extra não se adequa a nenhuma das categorias existentes.."
+
+#. %s is the application name (Firefox, Thunderbird).
+#: views/developers/addon_edit_categories.thtml:61
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categorias"
+
+#: views/developers/addon_edit_categories.thtml:49
+msgid "devcp_edit_categories_header_manage"
+msgstr "Gerir categorias dos extras"
+
+#: views/developers/addon_edit_categories.thtml:91
+msgid "devcp_edit_categories_hover"
+msgstr "Passe por cima de uma categoria para ver a sua descrição."
+
+#. %s is the category number (1, 2, 3).
+#: views/developers/addon_edit_categories.thtml:67
+msgid "devcp_edit_categories_label_category_num"
+msgstr "Categoria %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
+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:115
+msgid "devcp_edit_description_button_update"
+msgstr "Actualizar descrições"
+
+#: 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:50
+msgid "devcp_edit_descriptions_header"
+msgstr "Editar descrições dos extras"
+
+#: 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
+msgid "devcp_edit_descriptions_transbox_comments_name"
+msgstr "Comentários do desenvolvedor"
+
+#: 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
+msgid "devcp_edit_descriptions_transbox_description_name"
+msgstr "Descrição do extra"
+
+#: 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
+msgid "devcp_edit_descriptions_transbox_eula_name"
+msgstr "Acordo de licença de utilizador final"
+
+#: 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
+msgid "devcp_edit_descriptions_transbox_privacy_name"
+msgstr "Política de privacidade"
+
+#: 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 "Sumário do extra"
+
+#: views/developers/addon_edit.thtml:46
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Gerir autores dos extras"
+
+#: views/developers/addon_edit.thtml:48
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Gerir categorias dos extras"
+
+#: views/developers/addon_edit.thtml:50
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Gerir descrições dos extras"
+
+#: views/developers/addon_edit.thtml:52
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Gerir propriedades dos extras"
+
 #: 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"
@@ -1700,6 +2328,178 @@ msgstr "Idioma de destino"
 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: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
+msgid "devcp_edit_properties_current_icon"
+msgstr "�cone actual"
+
+#: 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
+msgid "devcp_edit_properties_header"
+msgstr "Editar propriedades do extra"
+
+#: views/developers/addon_edit_properties.thtml:185
+msgid "devcp_edit_properties_header_addon_type"
+msgstr "Tipo de extra"
+
+#: 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:83
+msgid "devcp_edit_properties_header_default_locale"
+msgstr "Idioma por defeito"
+
+#: views/developers/addon_edit_properties.thtml:165
+msgid "devcp_edit_properties_header_flags"
+msgstr "Etiquetas do extra"
+
+#: 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 "Actualizar"
@@ -1708,11 +2508,66 @@ 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'"
 
+#: views/elements/developers/editbox.thtml:46
+#, fuzzy
+msgid "devcp_editbox_authors"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Extras"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1721,7 +2576,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Avaliações Moderadas (%s)"
 msgstr[1] "Avaliações Moderadas (%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
 #, php-format
@@ -1730,7 +2585,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Extras Nomeados (%s)"
 msgstr[1] "Extras Nomeados (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1743,8 +2598,8 @@ msgstr[1] "Actualizações Pendentes (%s)"
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "Os ficheiros seleccionados serão eliminados."
 
-# %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"
@@ -1770,51 +2625,64 @@ msgstr "Notas para o Avaliador"
 msgid "devcp_editversion_submit_update"
 msgstr "Actualizar"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Para referência veja %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 "esta página"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, fuzzy, php-format
+msgid "devcp_error_file_exists"
+msgstr "Já existe uma versão deste extra. Para o substituir , tem de eliminar primeiro o ficheiro %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 "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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Nem todos os ficheiros de GUIDs são iguais"
 
@@ -1843,18 +2711,21 @@ msgstr "Excede o tamanho máximo permitido"
 msgid "devcp_error_http_nofile"
 msgstr "Nenhum ficheiro carregado"
 
+#. %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 "A extensão do ficheiro (%s) não é permitida para um ícone. Utilize um dos seguintes: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Não está presente nenhum install.rdf."
 
@@ -1862,21 +2733,26 @@ 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:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Por favor seleccione um tipo válido de extra."
 
+#. %$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 "%s não é uma versão válida para %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "O ID deste extra é inválido: %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"
@@ -1890,6 +2766,7 @@ msgstr "A versão deste extra é inválida: Por favor veja a <a href=\"http://de
 msgid "devcp_error_invalid_version_spaces"
 msgstr "A versão deste extra é inválida: as versões não podem conter espaços."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1899,6 +2776,7 @@ msgstr "O seguinte erro ocorreu a fazer parsing a install.rdf: %s"
 msgid "devcp_error_move_file"
 msgstr "Não foi possível mover o ficheiro"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1921,15 +2799,15 @@ 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:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "Tem de fornecer os seguintes detalhes para nomeação."
 
-#: controllers/developers_controller.php:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Apenas pode nomear extras que estejam no sandbox."
 
@@ -1941,18 +2819,20 @@ msgstr "Seleccione pelo menos uma categoria."
 msgid "devcp_error_one_user"
 msgstr "Tem de haver pelo menos um autor para este extra."
 
+#. %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 "Essa extensão de ficheiro (%s) não é permitida para pré-visualização. Utilize um dos seguintes: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Não tem autorização para actualizar este extra."
 
@@ -1964,7 +2844,7 @@ 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Por favor carregue um ficheiro."
@@ -2186,7 +3066,7 @@ msgstr "Os meus Extras"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Campos Traduzidos"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2226,31 +3106,60 @@ msgstr "Submeter Extra"
 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: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 "Voltar aos detalhes do extra"
 
-# %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 "Nomear %s"
 
-# %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 "Tipo de extra detectado automaticamente: %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 "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)
+#. %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
@@ -2262,9 +3171,14 @@ msgstr "O idioma por defeito deste extra (%1$s [%2$s]) é diferente do idioma ac
 msgid "devcp_notice_makedefault"
 msgstr "Tornar esta a pré-visualização por defeito irá alterar o estado da pré-visualização actual."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2293,6 +3207,55 @@ msgstr "Editar Pré-visualização"
 msgid "devcp_preview_updated_successfully"
 msgstr "Pré-visualização actualizada com sucesso."
 
+#: 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 "Utilize o formulário abaixo para carregar screeshots em PNG, JPG, ou GIF so seu extra. Imagens maiores que 700 pixéis de largura e 525 pixéis de altura serão automaticamente redimensionadas."
@@ -2301,10 +3264,20 @@ 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:79
+#, fuzzy
+msgid "devcp_previews_header_caption"
+msgstr "Preview Caption"
+
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "Editar Pré-visualização"
 
+#: 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 "Pré-visualizar Ficheiro"
@@ -2314,6 +3287,31 @@ msgstr "Pré-visualizar Ficheiro"
 msgid "devcp_previews_label_makedefault"
 msgstr "Tornar esta imagem a pré-definida"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Eliminar Pré-visualização"
@@ -2330,57 +3328,151 @@ msgstr "Editar Pré-visualização"
 msgid "devcp_previews_submit_upload"
 msgstr "Carregar Pré-visualização"
 
+#: 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 "Incorrecto?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Tem a certeza que deseja eliminar este ficheiro?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78
+#: 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>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 "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:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Utilizadores diários Activos"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> Transferências no total"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Transferências Semanais"
 
-#: controllers/developers_controller.php:1481
+#: 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 "As submissões de Extras estão desactivadas de momento. Por favor volte a mais tarde."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83
+#: views/developers/uploader.thtml:76
 #: views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Eu Aceito"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82
+#: views/developers/uploader.thtml:75
 #: views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Eu Recuso"
@@ -2397,12 +3489,12 @@ msgstr "Desactivado"
 msgid "devcp_summary_header_trusted"
 msgstr "De Confiança"
 
-#: views/developers/dashboard.thtml:82
+#: views/developers/dashboard.thtml:85
 #: views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Última Versão:"
 
-# %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"
@@ -2412,7 +3504,7 @@ msgstr "Não tem nenhum extra. Clique %s para submeter um."
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "aqui"
 
-# %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"
@@ -2422,30 +3514,592 @@ msgstr "tenha a certeza de %s para o seu tema."
 msgid "devcp_theme_upload_preview_link"
 msgstr "carregar uma pré-visualização"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Para referência veja %s."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "esta página"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Editar Versão"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Versão actualizada com sucesso."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+msgid "devcp_versions_edit_th_status"
+msgstr "Estado"
+
+#: 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 "Notas de lançamento"
+
+#: 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 "Actualizar versões"
+
+#: views/developers/versions.thtml:49
+msgid "devcp_versions_header_manage"
+msgstr "Gerir versões e ficheiros"
+
+#: views/developers/versions.thtml:87
+msgid "devcp_versions_no_versions"
+msgstr "Sem versões."
+
+#. %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
+msgid "devcp_versions_th_created"
+msgstr "Criado"
+
+#: views/developers/versions.thtml:57
+msgid "devcp_versions_th_status"
+msgstr "Estado"
+
+#: views/developers/versions.thtml:56
+msgid "devcp_versions_th_version"
+msgstr "Versão"
+
 #: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Este extra está desactivado"
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "Este extra não foi nomeado"
+
+#: controllers/components/editors.php:213
+msgid "editor_review_error_file_not_pending"
+msgstr "O ficheiro não está à espera de revisão."
+
+#. Actions are, for example: approving or rejecting
+#: controllers/components/editors.php:79
+#: controllers/components/editors.php:182
+msgid "editor_review_error_no_action"
+msgstr "Por favor seleccione uma acção para a revisão"
+
+#: controllers/components/editors.php:192
+msgid "editor_review_error_no_applications"
+msgstr "Por favor escreva as aplicações que testou."
+
+#. 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 "Por favor escreva o comentário da revisão"
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Por favor seleccione pelo menos um comentário."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "Por favor escreva os sistemas operativos que testou."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filtro"
@@ -2455,7 +4109,7 @@ msgid "editorcp_logs_filter_by"
 msgstr "Filtrar por tipo/acção"
 
 #: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:788
+#: controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Registo de Eventos"
 
@@ -2507,6 +4161,7 @@ msgstr "Ocultar Comentários"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Mostrar Comentários"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2517,7 +4172,7 @@ msgid "editorcp_reviewlog_none_found"
 msgstr "Nenhum comentário encontrado para este período."
 
 #: views/editors/reviewlog.thtml:42
-#: controllers/editors_controller.php:814
+#: controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Registo do comentário"
 
@@ -2541,24 +4196,24 @@ msgstr "Actividade Recente do Editor"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total de comentários"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Avaliar Extra"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Por favor complete os seguintes campos:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Seleccione pelo menos um ficheiro para rever."
 
-#: controllers/editors_controller.php:395
+#: 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:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Software Externo"
 
@@ -2572,43 +4227,43 @@ msgid "editors_featured_add_feature_submit"
 msgstr "Adicionar"
 
 #: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Adicionar funcionalidade falhou."
 
-#: controllers/editors_controller.php:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "A eliminação da funcionalidade falhou."
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Eliminação da funcionalidade feita com sucesso."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Funcionalidades do Extra"
 
@@ -2642,41 +4297,42 @@ msgstr "Política dos Extras"
 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
+#. %1 is the queue mode
 #: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 dia"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hora"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minuto"
 
-#: controllers/editors_controller.php:58
-#: controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61
+#: controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Painel de controlo do Editor"
 
-#: controllers/editors_controller.php:286
+#. %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 "apenas %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Pré-lançamento"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2690,19 +4346,23 @@ msgstr "Limpar"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Acção do comentário"
 
+#: views/editors/review.thtml:153
+msgid "editors_review_action_info"
+msgstr "Pedir mais informação"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Tornar Público"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Pedir Super-comentário"
 
@@ -2710,27 +4370,31 @@ msgstr "Pedir Super-comentário"
 msgid "editors_review_action_sandbox"
 msgstr "Manter no Sandbox"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Comentários da avaliação"
 
-#: views/editors/review.thtml:167
+#: 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: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:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Isto irá manter o extra no sandbox."
 
-#: views/editors/review.thtml:159
+#: 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:162
+#: 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:174
+#: 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."
 
@@ -2754,15 +4418,15 @@ msgstr "Categorias:"
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilidade:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Descrição"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Comentários do Developer"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "ALUF"
 
@@ -2770,92 +4434,109 @@ msgstr "ALUF"
 msgid "editors_review_header_files"
 msgstr "Ficheiros:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Histórico do Item"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Mensagem de Nomeação"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Pré-visualizações"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Política de Privacidade"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Avaliar %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notas para o avaliador"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Sumário"
 
-#: views/editors/review.thtml:240
+#: 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
+msgid "editors_review_history_info_reply"
+msgstr "Responder"
+
+#: views/elements/developers/editors_review_history_item.thtml:78
+msgid "editors_review_history_info_request"
+msgstr "Pedido de informação"
+
+#: views/elements/developers/editors_review_history_item.thtml:62
 #: views/editors/reviewlog.thtml:77
-#: views/editors/review.thtml:295
 msgid "editors_review_history_nominated_adminreview"
 msgstr "Comentário do Admin"
 
+#: views/elements/developers/editors_review_history_item.thtml:56
 #: views/editors/reviewlog.thtml:71
-#: views/editors/review.thtml:289
 msgid "editors_review_history_nominated_approved"
 msgstr "Nomeação Aprovada/Pública"
 
+#: views/elements/developers/editors_review_history_item.thtml:59
 #: views/editors/reviewlog.thtml:74
-#: views/editors/review.thtml:292
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomeação Negada/Sandbox"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Não foi encontrada nenhum comentário anterior."
 
+#: views/elements/developers/editors_review_history_item.thtml:73
 #: views/editors/reviewlog.thtml:88
-#: views/editors/review.thtml:306
 msgid "editors_review_history_pending_adminreview"
 msgstr "Comentário do Admin"
 
+#: views/elements/developers/editors_review_history_item.thtml:67
 #: views/editors/reviewlog.thtml:82
-#: views/editors/review.thtml:300
 msgid "editors_review_history_pending_approved"
 msgstr "Aprovado/Público"
 
+#: views/elements/developers/editors_review_history_item.thtml:70
 #: views/editors/reviewlog.thtml:85
-#: views/editors/review.thtml:303
 msgid "editors_review_history_pending_denied"
 msgstr "Negado/Sandbox"
 
-#: views/editors/review.thtml:198
+#. 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] "Mostrar/Ocultar respostas (%1$s)"
+msgstr[1] "Mostrar/Ocultar respostas (%1$s)"
+
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Aplicações:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "ou seleccione uma resposta:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Comentários:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistemas Operativos:"
 
-#: views/editors/review.thtml:268
-#: views/editors/review.thtml:324
+#: views/editors/review.thtml:281
+#: views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Topo"
 
@@ -2863,7 +4544,7 @@ msgstr "Topo"
 msgid "editors_review_next_link"
 msgstr "segu &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Nenhuma pré-visualização encontrada."
 
@@ -2871,41 +4552,45 @@ msgstr "Nenhuma pré-visualização encontrada."
 msgid "editors_review_previous_link"
 msgstr "&laquo; ante"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %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> de %2$s em espera"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Acção do Processo"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Acção"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comentários"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Data"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Revisor"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versão/Ficheiro"
 
-#: controllers/editors_controller.php:411
+#: 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:422
 msgid "editors_reviewed_successfully"
 msgstr "Comentário processado com sucesso."
 
@@ -2929,7 +4614,7 @@ msgstr "Acção"
 msgid "editors_reviews_in_reply_to"
 msgstr "Em resposta a:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Comentários processados com sucesso!"
 
@@ -2941,23 +4626,23 @@ 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:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Específico de um Sítio"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Novo"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Actualizado"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Aplicação Testada"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistemas Operativos Testados"
 
@@ -2999,17 +4684,20 @@ msgstr "Plataformas"
 msgid "editors_th_submissiontypes"
 msgstr "Tipos de Submissão"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dias"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s horas"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutos"
@@ -3021,8 +4709,8 @@ msgstr "%s minutos"
 #: controllers/components/amo.php:610
 #: controllers/components/amo.php:611
 #: controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Acesso Negado"
 
@@ -3030,12 +4718,13 @@ msgstr "Acesso Negado"
 msgid "error_access_denied_message"
 msgstr "Não está autorizado a ver esta página."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3045,22 +4734,23 @@ msgstr "Não está autorizado a ver esta página."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340
 #: controllers/api_controller.php:123
 #: controllers/api_controller.php:759
 #: controllers/api_controller.php:894
 #: controllers/api_controller.php:925
-#: controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Extra não encontrado!"
 
 #: controllers/files_controller.php:83
-#: controllers/files_controller.php:185
+#: controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Este extra não é visível aqui."
 
@@ -3068,7 +4758,7 @@ 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:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Nenhum Extra nesta categoria!"
 
@@ -3098,17 +4788,18 @@ msgid "error_field_required"
 msgstr "Este campo não pode estar vazio."
 
 #: controllers/files_controller.php:75
-#: controllers/files_controller.php:91
-#: controllers/files_controller.php:94
-#: controllers/files_controller.php:152
-#: controllers/files_controller.php:165
-#: controllers/files_controller.php:174
-#: controllers/files_controller.php:192
-#: controllers/editors_controller.php:509
+#: 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 "Ficheiro não encontrado!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Erro no ficheiro: %s não existe."
@@ -3116,11 +4807,11 @@ msgstr "Erro no ficheiro: %s não existe."
 #: views/users/register.thtml:49
 #: views/users/edit.thtml:84
 #: views/reviews/add.thtml:84
-#: controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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"
@@ -3138,6 +4829,7 @@ msgstr "Captcha inválido, tente novamente!"
 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:254
@@ -3145,13 +4837,13 @@ msgstr "Este URL tem um formato inválido. URLs válidos são do tipo http://exa
 #: controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
-#: controllers/reviews_controller.php:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475
 #: controllers/api_controller.php:900
-#: controllers/addons_controller.php:87
-#: controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3171,7 +4863,7 @@ msgstr "Notícia"
 msgid "error_preview_notfound"
 msgstr "Pré-visualização não encontrada!"
 
-#: views/addons/display.thtml:373
+#: views/addons/display.thtml:397
 #: views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Tem de seleccionar uma avaliação"
@@ -3229,8 +4921,8 @@ msgstr "Confirme primeiro a sua conta com o código que recebeu por correio elec
 msgid "error_username_or_pw_wrong"
 msgstr "Nome de utilizador ou senha errados!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versão não encontrada!"
 
@@ -3243,13 +4935,14 @@ msgstr "Senha errada introduzida!"
 msgid "feature_learnmore"
 msgstr "Saber mais"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Saber mais sobre %1$s"
 
-#: views/elements/addon_listitem.thtml:132
+#. %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
@@ -3263,6 +4956,40 @@ msgstr[1] "%1$s comentários"
 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
+msgid "file_browser_link_addon"
+msgstr "Voltar ao extra"
+
+#. 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 "Expandir tudo"
+
+#. 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 "Retroceder para o comentário"
+
+#. 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 :: Explorador de ficheiro :: %2$s Extras"
+
+#. 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Todos os direitos reservados."
@@ -3295,7 +5022,7 @@ msgstr "Outros Idiomas:"
 msgid "footer_privacy_policy"
 msgstr "Política de privacidade"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Guardar"
 
@@ -3303,7 +5030,7 @@ msgstr "Guardar"
 msgid "general_addontype_dict"
 msgstr "Dicionário"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Dicionários"
@@ -3312,7 +5039,7 @@ msgstr "Dicionários"
 msgid "general_addontype_extension"
 msgstr "Extensão"
 
-# 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensões"
@@ -3321,7 +5048,7 @@ msgstr "Extensões"
 msgid "general_addontype_lpaddon"
 msgstr "Pacote de Idioma (Extra)"
 
-# 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Pacotes de Idioma (Extras)"
@@ -3330,7 +5057,7 @@ msgstr "Pacotes de Idioma (Extras)"
 msgid "general_addontype_lpapp"
 msgstr "Pacote de Idioma (Aplicação)"
 
-# 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Pacotes de Idioma (Aplicações)"
@@ -3339,7 +5066,7 @@ msgstr "Pacotes de Idioma (Aplicações)"
 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
@@ -3348,7 +5075,7 @@ msgstr "Plugins"
 msgid "general_addontype_search"
 msgstr "Motor de Pesquisa"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Motores de Pesquisa"
@@ -3357,11 +5084,12 @@ msgstr "Motores de Pesquisa"
 msgid "general_addontype_theme"
 msgstr "Tema"
 
-# 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Temas"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111
 #: views/elements/header.thtml:122
 #, php-format
@@ -3394,12 +5122,12 @@ msgstr "Extras"
 
 #: views/elements/developers/sidebar.thtml:72
 #: views/elements/developers/myaddons.thtml:72
-#: views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Entrar"
 
-#: views/elements/header.thtml:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Sair"
 
@@ -3407,32 +5135,35 @@ msgstr "Sair"
 msgid "header_navlink_myaccount"
 msgstr "Minha Conta"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Registar"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81
+#: 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é-visualizar imagem do %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/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$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 "Adicionar ao %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/install.thtml:146
 #: views/elements/install.thtml:164
 #: views/elements/install.thtml:197
@@ -3441,6 +5172,7 @@ msgstr "Adicionar ao %s %s"
 msgid "install_button_title"
 msgstr "Adicionar %1$s a %2$s"
 
+#. %1$s is the add-on name
 #: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3465,7 +5197,7 @@ msgstr "Transferir Pacote de Idioma"
 #: views/elements/addon_categories.thtml:54
 #: views/addons/dictionaries.thtml:59
 #: controllers/components/amo.php:701
-#: controllers/addons_controller.php:894
+#: controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dicionários & Pacotes de Idioma"
 
@@ -3524,7 +5256,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3560,7 +5296,7 @@ msgstr "Temas"
 msgid "other_apps_tooltip"
 msgstr "Procure extras para outras aplicações"
 
-# In a user list: user 1, user 2, "others"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "outros"
@@ -3573,35 +5309,34 @@ msgstr "Versões da aplicação"
 msgid "page_title_credits"
 msgstr "Créditos"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Extras experimentais"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
 msgstr "Perguntas frequentes"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "FAQ personalize o seu Firefox "
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Política dos extras"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Política de privacidade da Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Guia sobre comentários"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Sistema avaliação Sandbox"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Ajuda sobre submissões"
 
@@ -3618,11 +5353,14 @@ msgstr "Versões Válidas da Aplicação"
 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: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:92
 msgid "pages_appversions_required_files_link"
 msgstr "aqui"
@@ -3631,7 +5369,6 @@ msgstr "aqui"
 msgid "pages_appversions_versions"
 msgstr "Versões"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Voltar à pagina anterior"
 
@@ -3643,7 +5380,7 @@ msgstr "Página de Informação do Sandbox"
 msgid "pagination_next_page"
 msgstr "seguinte"
 
-# %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"
@@ -3665,14 +5402,14 @@ msgstr "Escreva a sua resposta aqui:"
 msgid "recaptcha_enter_whatyouhear"
 msgstr "Escreva o que ouve."
 
-# %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 "Se for difícil de ouvir, pode <a href=\"%1$s\">ouvir algo diferente</a> ou <a href=\"%2$s\">mudar novamente para texto</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
 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>."
@@ -3685,7 +5422,7 @@ msgstr "Você é humano?"
 msgid "recaptcha_whatsthis"
 msgstr "O que é isto?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Erro ao marcar este comentário"
 
@@ -3712,7 +5449,7 @@ msgstr "Spam ou caso contrário conteúdo não revisto"
 
 #: views/reviews/display.thtml:95
 #: views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Obrigado;este avaliação foi marcada para aprovação do editor."
 
@@ -3724,11 +5461,12 @@ msgstr "Reportar esta avaliação"
 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
+#. %1 is the URL of the support section, %2 for the review guidelines
 #: 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:54
 #: views/reviews/display.thtml:54
 #: views/reviews/review_added.thtml:47
@@ -3736,15 +5474,15 @@ msgstr "<p>Tenha isto em mente:</p><ul><li>Escreva como se tivesse a dizer a um
 msgid "reviews_header"
 msgstr "Comentários para %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Extras"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Novos Extras"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Extras actualizados"
 
@@ -3782,6 +5520,7 @@ msgstr "Todos os Motores de Pesquisa"
 msgid "search_landing_browse_search_engines"
 msgstr "Explorar Motores de Pesquisa"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3801,11 +5540,13 @@ msgstr "Procurar Extras"
 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:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Procurar resultados para: %s"
 
+#: views/elements/header.thtml:154
 #: views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Ferramentas do Admin"
@@ -3815,6 +5556,7 @@ msgstr "Ferramentas do Admin"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Ferramentas do Desenvolvedor"
 
+#: views/elements/header.thtml:148
 #: views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Ferramentas do Editor"
@@ -3823,6 +5565,7 @@ msgstr "Ferramentas do Editor"
 msgid "sidebar_navlink_welcome"
 msgstr "Bem-Vindo"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3862,6 +5605,7 @@ msgstr "Tema"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Extras actualizados"
 
+#. %1$s is a number
 #: views/helpers/localization.php:65
 #: views/developers/editversion.thtml:58
 #: views/developers/versions_edit.thtml:94
@@ -3875,7 +5619,7 @@ msgstr "%1$s&nbsp;KB"
 msgid "stars_not_yet_rated"
 msgstr "Ainda sem avaliação"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3893,28 +5637,36 @@ msgstr "Ferramentas do Developer"
 msgid "statistics_addon_switch"
 msgstr "Mudar Extra"
 
+#. This is a date format.
+#. http://php.net/strftime
 #: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:167
+#: views/statistics/addon.thtml:181
 msgid "statistics_date_shortmonth"
 msgstr "%b. %e"
 
+#. This is a date format.
+#. http://php.net/strftime
 #: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:138
+#: views/statistics/addon.thtml:152
 msgid "statistics_date_shortmonthwithyear"
 msgstr "%b. %e, %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:147
-#: views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161
+#: views/statistics/addon.thtml:172
 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3956,7 +5708,7 @@ msgstr "Quadro de Estatísticas"
 msgid "statistics_index_view_button"
 msgstr "Ver Estatísticas"
 
-#: views/statistics/addon.thtml:210
+#: views/statistics/addon.thtml:224
 #: controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Ver esta tabela no formato CSV"
@@ -3973,7 +5725,7 @@ msgstr "Remover esta parcela"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Agrupar por: Dia"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Agrupar por: Mês"
 
@@ -3981,103 +5733,107 @@ msgstr "Agrupar por: Mês"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Agrupar por: Semana"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Comparar por: Semana"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s encontrados no intervalo"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Adicionar parcela"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Adicionar outra parcela a este gráfico"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Esconder contador total"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Mostrar contador total"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Mostrar o contador total neste gráfico"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Ver Dados (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Ocultar %s Eventos"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Mostrar %s Eventos"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Ocultar Eventos do Firefox"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Mostrar os Eventos do Firefox"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Colapsar Gráfico"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expandir Gráfico"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Redimensionar Gráfico"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Utilizadores Activos Diários"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplicação"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personalizar"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Transferências"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistema Operativo"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Estado do Extra"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Sumário"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Versão do Extra"
 
@@ -4101,11 +5857,11 @@ msgstr "Desconhecido"
 msgid "statistics_longnames_version"
 msgstr "Versão do Extra"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr "Ainda não existem dados suficientes para este gráfico. Tente mais tarde."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr "Ainda não temos nenhuns dados para o seu extra. Tente mais tarde daqui a alguns dias."
 
@@ -4113,11 +5869,11 @@ msgstr "Ainda não temos nenhuns dados para o seu extra. Tente mais tarde daqui
 msgid "statistics_notice_data_updating"
 msgstr "As estatísticas do extra estão a ser actualizadas. Dados recentes podem estar incompletos pois os nossos scripts para actualizar a informação. Tente daqui a alguns minutos."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "O Painel de Estatísticas de momento está desactivado. Tente mais tarde."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "O JavaScript é necessário para ver o gráfico das estatísticas."
 
@@ -4132,36 +5888,36 @@ msgstr "As suas definições foram actualizadas!"
 msgid "statistics_pagetitle"
 msgstr "Estatísticas"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Utilizadores Diários activos"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Transferências Diárias"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Aumentar"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Aumentar um mês"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Diminuir"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Diminuir um mês"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Sumário de estatísticas Diário para %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Fonte RSS para os dados do sumário"
 
@@ -4198,23 +5954,23 @@ msgstr "Público"
 msgid "statistics_settings_access_public_description"
 msgstr "Todos podem ver as estatísticas deste extra"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Mudar definições"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Por favor trate esta informação como confidencial."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Este painel actualmente é <b>privado</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Estepainel actualmente é <b>público</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Bloqueado"
 
@@ -4231,7 +5987,7 @@ msgstr "Guardar Definições"
 msgid "statistics_settings_title"
 msgstr "Definições do Painel de estatisticas para %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Desbloqueado"
 
@@ -4256,7 +6012,7 @@ msgid "statistics_shortnames_version"
 msgstr "Ver."
 
 #: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:190
+#: views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Média de Transferências Diárias"
 
@@ -4265,45 +6021,45 @@ msgid "statistics_summary_downloads_heading"
 msgstr "Transferências"
 
 #: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:157
+#: views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Última contagem do Dia"
 
 #: views/statistics/rss/summary.thtml:43
-#: views/statistics/addon.thtml:197
+#: views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Transferências nos últimos 7 dias"
 
 #: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:137
+#: views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Transferências Totais"
 
 #: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:138
+#: 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:149
-#: views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163
+#: views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Ainda sem dados"
 
 #: views/statistics/rss/summary.thtml:70
-#: views/statistics/addon.thtml:193
+#: views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Média de Utilizadores Activos Diáriamente"
 
 #: views/statistics/rss/summary.thtml:52
-#: views/statistics/addon.thtml:163
+#: views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Alterações desde a última contagem"
 
 #: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:167
+#: views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s em %2$s"
@@ -4313,19 +6069,19 @@ msgid "statistics_summary_updatepings_heading"
 msgstr "Utilizadores Activos Diáriamente"
 
 #: views/statistics/rss/summary.thtml:46
-#: views/statistics/addon.thtml:143
+#: views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Utilizadores Activos Diáriamente"
 
 #: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:147
+#: views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Em %1$s"
 
 #: views/statistics/addon.thtml:65
 #: controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Estatisticas"
@@ -4352,7 +6108,7 @@ msgstr "Alterar senha"
 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
+#. %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 "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>."
@@ -4369,12 +6125,12 @@ msgstr "Confirmar Senha"
 msgid "user_del_deletenow"
 msgstr "Eliminar agora a minha conta de utilizador"
 
-# %1 is the URL of the user's info page
+#. %1 is the URL of the user's info page
 #: 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "Se tiver perguntas, por favor contacte %1$s para assistência."
@@ -4387,7 +6143,7 @@ msgstr "Tem de seleccionar a caixa \"Eu compreendo...\" antes de eliminar a sua
 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
+#. %1 is a link to the amo-admins mailing list
 #: 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."
@@ -4396,7 +6152,7 @@ msgstr "Ocorreu um erro desconhecido ao eliminar a sua conta. por favor contacte
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirmar eliminação da conta"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Eliminar a conta de utilizador %1$s"
@@ -4417,7 +6173,7 @@ msgstr "Ao clicar \"eliminar\" a sua conta irá ser <strong>permanentemente elim
 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
+#. %1 is a link to the amo-editors mailing list
 #: 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."
@@ -4430,7 +6186,7 @@ msgstr "Eu compreendo que este passo não pode ser anulado."
 msgid "user_deleted_nickname"
 msgstr "Eliminar utilizador"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58
 #: views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
@@ -4440,9 +6196,9 @@ msgstr "Uma mensagem de correio electrónico foi enviada para %1$s para confirma
 msgid "user_edit_delete_user"
 msgstr "Eliminar conta de utilizador"
 
-# 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4459,7 +6215,7 @@ msgstr ""
 "Obrigado por se juntar aos Extras do %2$s\n"
 "-- A equipa dos Extras do %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4481,8 +6237,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Obrigado por se juntar aos Extras do %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
 #, php-format
 msgid "user_email_pwreset"
@@ -4507,7 +6263,7 @@ msgstr "Re-inicie a sua senha dos Extras %s"
 msgid "user_emailchange_error"
 msgstr "Erro!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513
 #: controllers/users_controller.php:514
 #, php-format
@@ -4519,7 +6275,7 @@ msgstr "Por favor confirme a alteração do seu endereço de correio electrónic
 msgid "user_emailchange_success"
 msgstr "Successo!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4691,13 +6447,13 @@ msgstr "Enviar ligação para reiniciar senha"
 msgid "user_register_amo_link"
 msgstr "%s Extras"
 
-# %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 "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
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4711,13 +6467,13 @@ msgstr "re-enviar a mensagem de confirmação"
 msgid "user_register_congratulations"
 msgstr "Parabéns! A sua conta de utilizador foi criada com sucesso."
 
-# %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 "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
+#. %1 is the link to the Mozilla Add-ons front page
 #: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
@@ -4780,7 +6536,7 @@ msgstr "Alcunha"
 msgid "users_info_pagetitle"
 msgstr "Info do utilizador para %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Comentário de %s"
@@ -4790,15 +6546,15 @@ msgstr "Comentário de %s"
 msgid "users_login_pagetitle"
 msgstr "Início de sessão do utilizador"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
 msgstr "O extra que está à procura está actualmente no sandbox.  Se já tiver uma conta em Mozilla Add-ons, por favor entre, ou <a href=\"%1$s\">saiba mais sobre o sandbox.</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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4814,3 +6570,32 @@ msgstr "Reiniciar Senha do Utilizador"
 msgid "users_register_pagetitle"
 msgstr "Registo de Novo Utilizador"
 
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "A versão mais recente compatível com"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "search_form_submit"
+#~ msgstr "Pesquisar"
diff --git a/site/app/locale/ro/LC_MESSAGES/messages.po b/site/app/locale/ro/LC_MESSAGES/messages.po
index af92bb5..68f44e4 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-02-11 12:52+0200\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"
@@ -11,12 +11,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
-"X-Generator: Narro 0.9.3 on http://tradu.softwareliber.ro\n"
+"X-Generator: Narro 0.9.4 on http://tradu.softwareliber.ro\n"
 
 #: 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 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
@@ -45,38 +49,34 @@ msgstr "Public"
 msgid "a_header_sandbox"
 msgstr "Cutia cu nisip"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Adăugat %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Actualizat în %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versiunea %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "descărcări în total"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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
+#. %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"
@@ -94,22 +94,22 @@ msgstr "per pagină"
 msgid "addon_list_sortby"
 msgstr "Sortează după:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "recomandat"
 
-# %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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s nu este disponibil pentru %2$s."
 
-# %1 is the addon name
+#. %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
@@ -118,7 +118,7 @@ msgstr "%1$s nu este disponibil pentru %2$s."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "ÃŽnapoi la %1$s..."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -137,6 +137,7 @@ msgstr "Recenzie:"
 msgid "addon_review_add_submit"
 msgstr "Trimite recenzia"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -170,32 +171,36 @@ msgstr "Da"
 msgid "addon_review_delete_header"
 msgstr "Ștergere recenzie"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Recenzia a fost ștearsă cu succes."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Editare recenzie pentru %s"
 
-# %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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 ""
+"Eroare la marcarea recenziei: Notele pentru recenzii sunt limitate la minim "
+"10 și maxim 100 de caractere; numărul de caractere din nota dumneavoastră "
+"este %1$s."
 
-# Removing an extra comma
+#. Removing an extra comma
 #: 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: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.
+#. %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"
@@ -205,17 +210,18 @@ msgstr[0] ""
 msgstr[1] ""
 "Vedeți și %1$s recenzii anterioare făcută de %2$s pentru acest supliment."
 msgstr[2] ""
+"Vedeți și %1$s recenzii anterioare făcută de %2$s pentru acest supliment."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Recenzii pentru %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -229,13 +235,13 @@ msgstr "Răspunsul dezvoltatorului: "
 msgid "addon_review_saved_successfully"
 msgstr "Recenzia dumneavoastră a fost salvată cu succes. Mulțumim!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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
+#. %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
@@ -258,11 +264,13 @@ msgstr "Suplimentul precedent"
 msgid "addon_version_permalink"
 msgstr "Legătură permanentă la această versiune"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "Cea mai recentă versiune compatibilă cu"
+#. %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 ""
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Du-te"
 
@@ -270,20 +278,20 @@ msgstr "Du-te"
 msgid "addons_author_tooltip"
 msgstr "Vezi profilul autorului"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 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:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "Răsfoiți %1$s teme :: Suplimente %2$s"
 
@@ -291,7 +299,7 @@ msgstr "Răsfoiți %1$s teme :: Suplimente %2$s"
 msgid "addons_display_add_review"
 msgstr "Scrieți o recenzie"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Mai multe detalii"
 
@@ -299,11 +307,11 @@ msgstr "Mai multe detalii"
 msgid "addons_display_categories"
 msgstr "Categorii"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "recenzie detaliată"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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"
@@ -312,66 +320,70 @@ msgstr "Nu-mi place"
 msgid "addons_display_edit_review"
 msgstr "Editați-vă recenzia"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Acest supliment are o politică de confidențialitate."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Comentariile dezvoltatorului"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Pagina suplimentului"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Recenzii"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Suport"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "ÃŽmi place"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Descriere lungă"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Mai multe imagini"
 
-# %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:421
-#, fuzzy
+#. %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] "Alte suplimente create de %1$s"
-msgstr[1] "Other add-ons by these authors"
-
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+msgstr[1] "Alte suplimente de acești autori"
+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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -384,7 +396,9 @@ 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:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -393,11 +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ă."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -410,66 +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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Apreciere"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "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:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Salvează"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Toate recenziile (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Vezi toate versiunile"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Istoria completă a versiunilor"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Arată sursa"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Arată statisticile"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Ce părere aveți?"
 
@@ -479,21 +494,22 @@ msgstr "Funcționează cu:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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/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
+#: 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:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -509,7 +525,9 @@ msgstr "Cea mai nouă:"
 msgid "addons_home_other_applications"
 msgstr "Alte aplicații"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -519,21 +537,21 @@ msgstr "Alte aplicații"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
-#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425 controllers/search_controller.php:178
+#: controllers/addons_controller.php:153 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:343 controllers/addons_controller.php:516
+#: controllers/addons_controller.php:659 controllers/addons_controller.php:803
+#: controllers/addons_controller.php:818 controllers/addons_controller.php:885
+#: controllers/addons_controller.php:905 controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305 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
@@ -578,6 +596,10 @@ msgstr "Vezi toate suplimentele actualizate recent"
 #: 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 "
+"Mozilla Sunbird, deschideți fereastra Suplimente din meniul Unelte.</"
+"li><li>Clic pe butonul Instalare, localizați/selectați fișierul descărcat și "
+"apoi apăsați „OK�.</li></ol>"
 
 #: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
@@ -588,8 +610,8 @@ 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>"
 
@@ -624,6 +646,7 @@ msgstr "pentru Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "pentru Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -644,12 +667,13 @@ msgstr ""
 "multimedia. Plugin-urile sunt ușor diferite de extensii, care modifică sau "
 "adaugă la o funcționalitate existentă deja."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugin-uri des folosite pentru %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Plugin-uri"
 
@@ -660,6 +684,7 @@ msgstr "Plugin-uri"
 msgid "addons_plugins_support_documentation"
 msgstr "Suport prin documentație: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -667,25 +692,25 @@ msgstr ""
 "%s necesită acordul dumneavoastră pentru licența de folosire (EULA) înainte "
 "ca instalarea să poată continua:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Avanpremiere pentru %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Suplimente recomandate"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Suplimente recomandate"
 
@@ -693,7 +718,7 @@ msgstr "Suplimente recomandate"
 msgid "addons_searchengines_additional_resources"
 msgstr "Resurse adiționale"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Centrul dezvoltatorilor Mozilla"
@@ -711,35 +736,35 @@ msgstr ""
 "dezactivat.  Vă rugăm activați JavaScript înainte de a încerca să instalați "
 "oricare dintre plugin-urile pentru căutare de mai jos."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %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 "Învățați să %1$s la %2$s."
 
-# link path to search plugins instructions, relative to devmo
+#. 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 "/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:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "faceți voi unul"
 
-# %1 is the link to mycroft.mozdev.org
+#. %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 "Puteți găsi mai multe motoare de căutare la %1$s"
 
-# link text to mycroft.mozdev.org
+#. 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:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Motoare de căutare"
 
@@ -749,11 +774,35 @@ msgstr ""
 "Mulțumiri speciale proiectului Mycroft pentru munca lor la motoarele de "
 "căutare Firefox."
 
+#: views/addons/display.thtml:104
+msgid "addons_share_button_text"
+msgstr "Împărtășește"
+
+#: controllers/addons_controller.php:89
+msgid "addons_share_label_delicious"
+msgstr "Adaugă la Delicious"
+
+#: controllers/addons_controller.php:77
+msgid "addons_share_label_digg"
+msgstr "Evaluează pe Digg!"
+
+#: controllers/addons_controller.php:83
+msgid "addons_share_label_facebook"
+msgstr "Postează în Facebook"
+
+#: controllers/addons_controller.php:101
+msgid "addons_share_label_friendfeed"
+msgstr "Împărtășește pe FriendFeed"
+
+#: controllers/addons_controller.php:95
+msgid "addons_share_label_myspace"
+msgstr "Postează în MySpace"
+
 #: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
 msgstr "Dezactivat"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Versiune incompletă"
 
@@ -791,11 +840,12 @@ msgstr ""
 "Aceste versiuni sunt afișate pentru referință și pentru a fi testate. Ar "
 "trebui să folosiți întotdeauna ultima versiune a unui supliment."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Istoria versiunilor și a modificărilor"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Istoricul versiunilor %1$s"
@@ -808,6 +858,7 @@ msgstr "Adăugare grup"
 msgid "admin_group_delete_pagetitle"
 msgstr "Ștergere grup"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -933,16 +984,20 @@ msgstr "Ignoră verificarea versiunii"
 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: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: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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -955,23 +1010,23 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Actualizați Firefox</a> pentru a folosi "
 "acest supliment"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Suplimente după nume"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Cele mai noi suplimente"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Suplimente populare"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Suplimente după evaluare"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Suplimente actualizate recent"
 
@@ -1003,7 +1058,7 @@ msgstr "Întâi ultimele actualizate"
 msgid "category_extra_mostpopular"
 msgstr "Întâi cele mai populare"
 
-# %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"
@@ -1013,11 +1068,19 @@ msgstr "Toate de tipul %1$s"
 msgid "collection_not_found"
 msgstr "Colecție negăsită!"
 
+#. %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"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
@@ -1032,118 +1095,141 @@ msgstr "Înapoi la pagina principală"
 
 #: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
-msgstr ""
+msgstr "Raport de compatibilitate al suplimentului"
 
 #: views/compatibility/dashboard.thtml:49
 #: views/compatibility/dashboard.thtml:114
 #: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
-msgstr ""
+msgstr "Informații pentru dezvoltatorii de suplimente"
 
 #: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
-msgstr ""
+msgstr "Ajustare parametru maxVersion fără încărcare"
 
 #: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
-msgstr ""
+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: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:118
 msgid "compatibility_developers_mdclogo_alt"
-msgstr ""
+msgstr "Sigla Mozilla Developer Center"
 
 #: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
-msgstr ""
+msgstr "Nu aveți nici un supliment găzduit de Mozilla Add-ons."
 
 #: views/compatibility/dashboard.thtml:137
 #: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
-msgstr ""
+msgstr "Rezultatele verificării stării suplimentelor"
 
 #: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
-msgstr ""
+msgstr "Se obține starea suplimentelor găzduite..."
 
+#. %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 ""
+msgstr "%1$s utilizează %2$s (%3$s&#37; din total)"
 
 #: 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."
 
 #: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
-msgstr ""
+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: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 "
+"compatibile cu ultimele versiuni de %3$s."
 
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
-msgstr ""
+msgstr "Versiuni alfa"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
-msgstr ""
+msgstr "Suplimente compatibile cu o versiune alfa de %1$s"
 
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
-msgstr ""
+msgstr "Versiuni beta"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: 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"
 
 #: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
-msgstr ""
+msgstr "Ultima versiune"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
-msgstr ""
+msgstr "Suplimente compatibile cu cele mai recente compilări de %1$s"
 
 #: 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:81
 msgid "compatibility_report_legend_other_description"
-msgstr ""
+msgstr "Suplimente incompatibile cu orice versiune de %1$s"
 
 #: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
-msgstr ""
+msgstr "Raport de compatibilitate al suplimentului"
 
 #: views/compatibility/dashboard.thtml:50
 #: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
-msgstr ""
+msgstr "Informații pentru utilizatorii de suplimente"
 
 #: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
-msgstr ""
+msgstr "Arată raportul de compatibilitate"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Pentru informații despre contribuție, vedeți %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "pagina de wiki"
 
 #: 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:101
 msgid "credits_section_developers"
@@ -1177,26 +1263,31 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: views/pages/credits.thtml:135
+msgid "credits_software_timeplot"
+msgstr ""
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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)
+#. 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, %k:%M"
@@ -1222,24 +1313,48 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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:1321
+msgid "devcp_add_previews_save_error"
+msgstr ""
+
+#. %1$s is the preview ID number, %2$s is the filename.
+#: controllers/developers_controller.php:1316
+msgid "devcp_add_previews_success_replace"
+msgstr ""
+
+#. %s is the filename.
+#: controllers/developers_controller.php:1318
+msgid "devcp_add_previews_success_upload"
+msgstr ""
+
 #: 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."
+"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"
@@ -1277,36 +1392,36 @@ msgstr "Pasul 5: Succes"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ajutor pentru trimiterea suplimentelor"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Supliment dezactivat cu succes"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Editare supliment"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Supliment activat cu succes"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Descriere supliment"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: 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:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Nume supliment"
 
@@ -1315,40 +1430,216 @@ msgstr "Nume supliment"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Titlu avanpremieră"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: 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:2185
-#: controllers/developers_controller.php:2473
+#: 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:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Email pentru suport"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL pentru suport"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Note asupra versiunii"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Nominalizare supliment"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Supliment nominalizat cu succes!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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 ""
+
+#: views/developers/addon_status.thtml:136
+msgid "devcp_addon_status_action_complete"
+msgstr ""
+
+#: views/developers/addon_status.thtml:137
+msgid "devcp_addon_status_action_complete_description"
+msgstr ""
+
+#: views/developers/addon_status.thtml:182
+msgid "devcp_addon_status_action_deactivate"
+msgstr ""
+
+#: views/developers/addon_status.thtml:183
+msgid "devcp_addon_status_action_deactivate_description"
+msgstr ""
+
+#: views/developers/addon_status.thtml:144
+msgid "devcp_addon_status_action_move"
+msgstr ""
+
+#: views/developers/addon_status.thtml:145
+msgid "devcp_addon_status_action_move_description"
+msgstr ""
+
+#: views/developers/addon_status.thtml:140
+msgid "devcp_addon_status_action_nominate"
+msgstr ""
+
+#: views/developers/addon_status.thtml:141
+msgid "devcp_addon_status_action_nominate_description"
+msgstr ""
+
+#: views/developers/addon_status.thtml:148
+msgid "devcp_addon_status_action_public"
+msgstr ""
+
+#: views/developers/addon_status.thtml:149
+msgid "devcp_addon_status_action_public_description"
+msgstr ""
+
+#: views/developers/addon_status.thtml:170
+msgid "devcp_addon_status_active"
+msgstr ""
+
+#: views/developers/addon_status.thtml:111
+msgid "devcp_addon_status_completion_disabled"
+msgstr ""
+
+#: views/developers/addon_status.thtml:108
+msgid "devcp_addon_status_completion_enabled"
+msgstr ""
+
+#: views/developers/addon_status.thtml:102
+msgid "devcp_addon_status_criteria_category"
+msgstr ""
+
+#: views/developers/addon_status.thtml:101
+msgid "devcp_addon_status_criteria_description"
+msgstr ""
+
+#: views/developers/addon_status.thtml:99
+msgid "devcp_addon_status_criteria_name"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#. %s is the status in a span, e.g. "<span>_('Public')</span>".
+#: views/developers/addon_status.thtml:58
+msgid "devcp_addon_status_header"
+msgstr ""
+
+#: views/developers/addon_status.thtml:153
+msgid "devcp_addon_status_header_actions"
+msgstr ""
+
+#: 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 ""
+
+#: views/developers/addon_status.thtml:165
+msgid "devcp_addon_status_header_inactive"
+msgstr ""
+
+#: views/developers/addon_status.thtml:117
+msgid "devcp_addon_status_header_nomination"
+msgstr ""
+
+#: views/developers/addon_status.thtml:191
+msgid "devcp_addon_status_header_trusted"
+msgstr ""
+
+#: views/developers/addon_status.thtml:166
+msgid "devcp_addon_status_inactive"
+msgstr ""
+
+#: views/developers/addon_status.thtml:129
+msgid "devcp_addon_status_nominate_disabled"
+msgstr ""
+
+#: views/developers/addon_status.thtml:126
+msgid "devcp_addon_status_nominate_enabled"
+msgstr ""
+
+#: views/developers/addon_status.thtml:64
+msgid "devcp_addon_status_public"
+msgstr "Public"
+
+#: views/developers/addon_status.thtml:63
+msgid "devcp_addon_status_sandbox"
+msgstr "Cutia cu nisip"
+
+#. %s is an email address.
+#: views/developers/addon_status.thtml:89
+msgid "devcp_addon_status_switch_disabled"
+msgstr ""
+
+#: views/developers/addon_status.thtml:67
+msgid "devcp_addon_status_switch_incomplete"
+msgstr ""
+
+#. %s is a number, perhaps 42.
+#: views/developers/addon_status.thtml:77
+msgid "devcp_addon_status_switch_nominated"
+msgstr ""
+
+#. %s is an email address.
+#: views/developers/addon_status.thtml:81
+msgid "devcp_addon_status_switch_pending"
+msgstr ""
+
+#: views/developers/addon_status.thtml:85
+msgid "devcp_addon_status_switch_public"
+msgstr ""
+
+#: views/developers/addon_status.thtml:71
+#: views/developers/addon_status.thtml:75
+msgid "devcp_addon_status_switch_sandbox"
+msgstr ""
+
+#. %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 ""
+
+#: 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"
@@ -1371,7 +1662,7 @@ msgstr ""
 "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
+#. %1 is the link to the sandbox information page
 #: views/developers/add_step5.thtml:63
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1382,14 +1673,14 @@ msgstr ""
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "aici"
 
-# %1 is the "nominate" link
+#. %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."
+"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"
@@ -1405,16 +1696,16 @@ msgstr ""
 "Pentur că suplimentul dumneavoastră este unul de încredere, această versiune "
 "a fost automat aprobată pentru zona publică."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Trimitere supliment"
 
-#: controllers/developers_controller.php:2375
+#: controllers/developers_controller.php:2460
 msgid "devcp_addon_updated_successfully"
 msgstr "Supliment actualizat cu succes"
 
-# %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"
@@ -1426,7 +1717,7 @@ msgstr ""
 msgid "devcp_addon_upload_preview_link"
 msgstr "încărcați o avanpremieră"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1455,10 +1746,82 @@ msgstr "ÃŽnainte"
 msgid "devcp_change_addontype"
 msgstr "Schimbă titlul suplimentului:"
 
-#: controllers/developers_controller.php:1402
+#: 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"
+
+#. %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 ""
+
+#: views/developers/dashboard.thtml:67
+msgid "devcp_dashboard_change_status"
+msgstr "Schimbă starea"
+
+#. %s is the addons email address.
+#: views/developers/dashboard.thtml:99
+msgid "devcp_dashboard_disabled_questions"
+msgstr ""
+
+#. %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 ""
+
+#: views/developers/dashboard.thtml:43
+msgid "devcp_dashboard_header_main"
+msgstr ""
+
+#: views/developers/dashboard.thtml:110
+msgid "devcp_dashboard_header_welcome"
+msgstr ""
+
+#: views/developers/dashboard.thtml:68
+msgid "devcp_dashboard_inactive"
+msgstr "Inactiv"
+
+#. %s is a date in the _('date') format
+#: views/developers/dashboard.thtml:65
+msgid "devcp_dashboard_last_edited"
+msgstr ""
+
+#: views/developers/dashboard.thtml:111
+msgid "devcp_dashboard_learn"
+msgstr ""
+
+#: views/developers/dashboard.thtml:112
+msgid "devcp_dashboard_start"
+msgstr ""
+
+#: views/developers/dashboard.thtml:82
+msgid "devcp_dashboard_versions"
+msgstr ""
+
+#: views/developers/dashboard.thtml:91
+msgid "devcp_dashboard_versions_new"
+msgstr ""
+
+#. %s is the preview ID number.
+#: controllers/developers_controller.php:1342
+msgid "devcp_delete_previews_error"
+msgstr ""
+
+#. %s is the preview ID number.
+#: controllers/developers_controller.php:1340
+msgid "devcp_delete_previews_success"
+msgstr ""
+
+#: controllers/developers_controller.php:1032
+msgid "devcp_delete_version_priv_error"
+msgstr ""
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Adaugă avanpremieră"
@@ -1551,6 +1914,7 @@ msgstr "Dezvoltatorul nu oferă o adresă web pentru suport."
 msgid "devcp_details_trusted"
 msgstr "De încredere"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1580,6 +1944,7 @@ msgstr ""
 "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"
@@ -1600,14 +1965,55 @@ msgstr ""
 "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 ""
+
+#: views/developers/discuss.thtml:57
+msgid "devcp_discuss_allreplies_header"
+msgstr ""
+
+#. 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 ""
+
+#. %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 ""
+
+#. %1 is the add-on name
+#: views/developers/discuss.thtml:43
+msgid "devcp_discuss_pagetitle"
+msgstr ""
+
+#. submit button text
+#: views/developers/discuss.thtml:79
+msgid "devcp_discuss_submit_reply"
+msgstr "Trimite răspuns"
+
+#: views/developers/discuss.thtml:72
+msgid "devcp_discuss_success_message"
+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
+msgid "devcp_discuss_writtenby"
+msgstr ""
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
-msgstr "Adaugă autor"
+msgstr "Adaugă un autor"
 
 #: views/developers/edit.thtml:69
 msgid "devcp_edit_author_email"
@@ -1617,10 +2023,220 @@ msgstr "Adresa de email a autorului"
 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 ""
+
+#: views/developers/addon_edit_authors.thtml:94
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Adaugă un autor"
+
+#: views/developers/addon_edit_authors.thtml:81
+msgid "devcp_edit_authors_add_email"
+msgstr ""
+
+#: views/developers/addon_edit_authors.thtml:96
+msgid "devcp_edit_authors_add_loading"
+msgstr ""
+
+#: views/developers/addon_edit_authors.thtml:69
+msgid "devcp_edit_authors_click_save"
+msgstr ""
+
+#: views/developers/addon_edit_authors.thtml:57
+msgid "devcp_edit_authors_header_current"
+msgstr ""
+
+#: views/developers/addon_edit_authors.thtml:49
+msgid "devcp_edit_authors_header_manage"
+msgstr ""
+
+#: views/developers/addon_edit_authors.thtml:91
+msgid "devcp_edit_authors_label_add_listed"
+msgstr ""
+
+#: views/developers/addon_edit_authors.thtml:87
+msgid "devcp_edit_authors_label_developer"
+msgstr ""
+
+#: views/developers/addon_edit_authors.thtml:86
+msgid "devcp_edit_authors_label_owner"
+msgstr ""
+
+#: views/developers/addon_edit_authors.thtml:88
+msgid "devcp_edit_authors_label_viewer"
+msgstr ""
+
+#. 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:84
+msgid "devcp_edit_authors_select_role"
+msgstr ""
+
+#. 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
+msgid "devcp_edit_authors_th_listed"
+msgstr ""
+
+#. Column name in a table.
+#: views/developers/addon_edit_authors.thtml:62
+msgid "devcp_edit_authors_th_role"
+msgstr "Rol"
+
+#: views/developers/addon_edit_authors.thtml:75
+msgid "devcp_edit_authors_update_author"
+msgstr ""
+
+#: views/developers/addon_edit_categories.thtml:99
+msgid "devcp_edit_categories_button_update"
+msgstr ""
+
+#: views/developers/addon_edit_categories.thtml:88
+msgid "devcp_edit_categories_does_not_fit"
+msgstr ""
+
+#. %s is the application name (Firefox, Thunderbird).
+#: views/developers/addon_edit_categories.thtml:61
+msgid "devcp_edit_categories_header_application"
+msgstr ""
+
+#: views/developers/addon_edit_categories.thtml:49
+msgid "devcp_edit_categories_header_manage"
+msgstr ""
+
+#: views/developers/addon_edit_categories.thtml:91
+msgid "devcp_edit_categories_hover"
+msgstr ""
+
+#. %s is the category number (1, 2, 3).
+#: views/developers/addon_edit_categories.thtml:67
+msgid "devcp_edit_categories_label_category_num"
+msgstr ""
+
+#: views/developers/addon_edit_categories.thtml:94
+#: views/developers/addon_edit_categories.thtml:103
+msgid "devcp_edit_categories_none_available"
+msgstr ""
+
+#: views/developers/addon_edit_categories.thtml:86
+msgid "devcp_edit_categories_other"
+msgstr ""
+
+#. %s is the application name (Firefox, Thunderbird).
+#: views/developers/addon_edit_categories.thtml:63
+msgid "devcp_edit_categories_select_application_categories"
+msgstr ""
+
+#: views/developers/addon_edit.thtml:47
+msgid "devcp_edit_dd_manage_authors"
+msgstr ""
+
+#: views/developers/addon_edit.thtml:49
+msgid "devcp_edit_dd_manage_categories"
+msgstr ""
+
+#: views/developers/addon_edit.thtml:51
+msgid "devcp_edit_dd_manage_description"
+msgstr ""
+
+#: views/developers/addon_edit.thtml:53
+msgid "devcp_edit_dd_manage_properties"
+msgstr ""
+
+#: views/developers/addon_edit_descriptions.thtml:115
+msgid "devcp_edit_description_button_update"
+msgstr ""
+
+#: views/developers/addon_edit_descriptions.thtml:114
+msgid "devcp_edit_description_correct_error"
+msgstr ""
+
+#: views/developers/addon_edit_descriptions.thtml:50
+msgid "devcp_edit_descriptions_header"
+msgstr ""
+
+#: views/developers/addon_edit_descriptions.thtml:93
+msgid "devcp_edit_descriptions_transbox_comments_description"
+msgstr ""
+
+#: views/developers/addon_edit_descriptions.thtml:92
+msgid "devcp_edit_descriptions_transbox_comments_name"
+msgstr "Comentariile dezvoltatorului"
+
+#: views/developers/addon_edit_descriptions.thtml:85
+msgid "devcp_edit_descriptions_transbox_description_description"
+msgstr ""
+
+#: views/developers/addon_edit_descriptions.thtml:84
+msgid "devcp_edit_descriptions_transbox_description_name"
+msgstr "Descriere supliment"
+
+#: views/developers/addon_edit_descriptions.thtml:102
+msgid "devcp_edit_descriptions_transbox_eula_description"
+msgstr ""
+
+#: 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:111
+msgid "devcp_edit_descriptions_transbox_privacy_description"
+msgstr ""
+
+#: 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:77
+msgid "devcp_edit_descriptions_transbox_summary_description"
+msgstr ""
+
+#: views/developers/addon_edit_descriptions.thtml:76
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Descriere sumară pentru supliment"
+
+#: views/developers/addon_edit.thtml:46
+msgid "devcp_edit_dt_manage_authors"
+msgstr ""
+
+#: views/developers/addon_edit.thtml:48
+msgid "devcp_edit_dt_manage_categories"
+msgstr ""
+
+#: views/developers/addon_edit.thtml:50
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr ""
+
+#: views/developers/addon_edit.thtml:52
+msgid "devcp_edit_dt_manage_properties"
+msgstr ""
+
 #: 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"
@@ -1686,6 +2302,150 @@ msgstr "Localizarea țintă"
 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:197
+msgid "devcp_edit_properties_change_guid"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:108
+msgid "devcp_edit_properties_current_icon"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:84
+msgid "devcp_edit_properties_default_locale"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:166
+msgid "devcp_edit_properties_flags"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:173
+msgid "devcp_edit_properties_guid"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:52
+msgid "devcp_edit_properties_header"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:185
+msgid "devcp_edit_properties_header_addon_type"
+msgstr "Tip de supliment"
+
+#: views/developers/addon_edit_properties.thtml:180
+msgid "devcp_edit_properties_header_admin_settings"
+msgstr "Setări administrative"
+
+#: views/developers/addon_edit_properties.thtml:83
+msgid "devcp_edit_properties_header_default_locale"
+msgstr "Limba implicită"
+
+#: views/developers/addon_edit_properties.thtml:165
+msgid "devcp_edit_properties_header_flags"
+msgstr ""
+
+#: 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:103
+msgid "devcp_edit_properties_header_icon"
+msgstr ""
+
+#: 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:181
+msgid "devcp_edit_properties_header_trusted"
+msgstr ""
+
+#: 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:105
+msgid "devcp_edit_properties_icon"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:170
+msgid "devcp_edit_properties_label_binary"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:184
+msgid "devcp_edit_properties_label_not_trusted"
+msgstr "Necreditat"
+
+#: views/developers/addon_edit_properties.thtml:183
+msgid "devcp_edit_properties_label_trusted"
+msgstr "De încredere"
+
+#: views/developers/addon_edit_properties.thtml:109
+msgid "devcp_edit_properties_new_icon"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:117
+msgid "devcp_edit_properties_remove_icon"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:135
+msgid "devcp_edit_properties_transbox_homepage_description"
+msgstr ""
+
+#: 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:78
+msgid "devcp_edit_properties_transbox_name_description"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:77
+msgid "devcp_edit_properties_transbox_name_name"
+msgstr "Nume supliment"
+
+#: views/developers/addon_edit_properties.thtml:144
+msgid "devcp_edit_properties_transbox_supportemail_description"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:143
+msgid "devcp_edit_properties_transbox_supportemail_name"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:153
+msgid "devcp_edit_properties_transbox_supporturl_description"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:152
+msgid "devcp_edit_properties_transbox_supporturl_name"
+msgstr ""
+
+#: 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:118
+msgid "devcp_edit_properties_undelete"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:160
+msgid "devcp_edit_properties_view_source"
+msgstr ""
+
+#: views/developers/addon_edit_properties.thtml:161
+msgid "devcp_edit_properties_view_source_allow"
+msgstr ""
+
+#: 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ă"
@@ -1696,11 +2456,55 @@ 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"
+
+#: views/elements/developers/editbox.thtml:47
+msgid "devcp_editbox_categories"
+msgstr "Categorii"
+
+#: views/elements/developers/editbox.thtml:52
+msgid "devcp_editbox_change_status"
+msgstr "Schimbă starea"
+
+#: views/elements/developers/editbox.thtml:48
+msgid "devcp_editbox_descriptions"
+msgstr ""
+
+#: views/elements/developers/editbox.thtml:43
+msgid "devcp_editbox_edit_addon"
+msgstr "Editează suplimentul"
+
+#: views/elements/developers/editbox.thtml:57
+msgid "devcp_editbox_new_version"
+msgstr "Versiune nouă"
+
+#: views/elements/developers/editbox.thtml:49
+msgid "devcp_editbox_properties"
+msgstr "Proprietăți"
+
+#: views/elements/developers/editbox.thtml:60
+msgid "devcp_editbox_screenshots"
+msgstr ""
+
+#: views/elements/developers/editbox.thtml:53
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistici - Tablou de bord"
+
+#: views/elements/developers/editbox.thtml:54
+msgid "devcp_editbox_versions"
+msgstr ""
+
+#: views/elements/developers/editbox.thtml:42
+msgid "devcp_editbox_view_listing"
+msgstr ""
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Suplimente excepționale"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1710,7 +2514,7 @@ msgstr[0] "O recenzie moderată"
 msgstr[1] "Recenzii moderate (%s)"
 msgstr[2] "Recenzii moderate (%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
 #, php-format
@@ -1720,7 +2524,7 @@ msgstr[0] "Un supliment nominalizat"
 msgstr[1] "Suplimente nominalizate (%s)"
 msgstr[2] "Suplimente nominalizate (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1734,8 +2538,8 @@ msgstr[2] "Actualizări în așteptare (%s)"
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "Fișierele bifate vor fi șterse."
 
-# %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"
@@ -1761,51 +2565,64 @@ msgstr "Note către recenzent"
 msgid "devcp_editversion_submit_update"
 msgstr "Actualizează"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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>"
+"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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Consultați %s pentru referință."
 
+#. 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 "această pagină"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, php-format
+msgid "devcp_error_file_exists"
+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:355
 #, php-format
 msgid "devcp_error_file_extension"
@@ -1813,7 +2630,7 @@ 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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Nu se potrivesc toate GUID-urile fișierelor"
 
@@ -1842,6 +2659,8 @@ msgstr "Depășește mărimea maximă admisă pentru încărcări"
 msgid "devcp_error_http_nofile"
 msgstr "Niciun fișier încărcat"
 
+#. %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"
@@ -1849,15 +2668,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:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Lipsește install.rdf."
 
@@ -1865,21 +2685,26 @@ 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:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 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.
 #: controllers/components/developers.php:569
 #: controllers/components/developers.php:581
 #, php-format
 msgid "devcp_error_invalid_appversion"
 msgstr "%s nu este o versiune validă pentru %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "ID-ul acestui supliment este invalid: %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"
@@ -1897,6 +2722,7 @@ msgid "devcp_error_invalid_version_spaces"
 msgstr ""
 "Versiunea acestui supliment este invalidă: versiunile nu pot conține spații."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1906,6 +2732,7 @@ msgstr "A apărut următoarea eroare la analiza install.rdf: %s"
 msgid "devcp_error_move_file"
 msgstr "Nu se poate muta fișierul"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1928,15 +2755,15 @@ 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:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "Trebuie să furnizați detaliile cerute pentru nominalizare."
 
-#: controllers/developers_controller.php:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Puteți nominaliza doar suplimente care se află în cutia cu nisip."
 
@@ -1948,6 +2775,8 @@ msgstr "Vă rugăm selectați cel puțin o categorie."
 msgid "devcp_error_one_user"
 msgstr "Trebuie să fie cel puțin un autor pentru acest supliment."
 
+#. %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"
@@ -1955,13 +2784,13 @@ 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:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Nu aveți permisiunea să actualizați acest supliment."
 
@@ -1977,7 +2806,7 @@ 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:409
+#: 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."
@@ -1988,7 +2817,7 @@ 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ă autor"
+msgstr "Adaugă un autor"
 
 #: views/developers/add_step2.thtml:84
 msgid "devcp_form_author_remove"
@@ -2033,7 +2862,7 @@ msgstr "Fișier supliment 3"
 
 #: views/developers/add_step1.thtml:59
 msgid "devcp_form_label_addontype"
-msgstr "Tip supliment"
+msgstr "Tip de supliment"
 
 #: views/developers/add_step2.thtml:145
 msgid "devcp_form_label_allow_viewsource"
@@ -2199,7 +3028,7 @@ msgstr "Suplimentele mele"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Câmpuri localizate"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2231,7 +3060,7 @@ msgstr "Înapoi la pagina principală"
 #: views/elements/developers/sidebar.thtml:63
 #: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
-msgstr "Statistici - Tabolul de bord"
+msgstr "Statistici - Tablou de bord"
 
 #: views/elements/developers/sidebar.thtml:62
 #: views/elements/developers/myaddons.thtml:62
@@ -2243,33 +3072,58 @@ msgstr "Trimite supliment"
 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:232
+msgid "devcp_new_addon_error"
+msgstr ""
+
+#: views/developers/addon_status_nominate.thtml:62
+msgid "devcp_nominate_cancel"
+msgstr ""
+
 #: views/developers/nominate.thtml:53
 msgid "devcp_nominate_link_returnto_details"
 msgstr "ÃŽnapoi la detaliile suplimentului"
 
-# %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 "Nominalizează %s"
 
-# %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 "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:49
+msgid "devcp_notice_changes_error"
+msgstr ""
+
+#: 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
+msgid "devcp_notice_changes_saved"
+msgstr ""
+
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
 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)
+#. %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"
@@ -2284,9 +3138,13 @@ msgstr ""
 "Dacă faceți această avanpremieră cea implicită, o altă avanpremieră își va "
 "pierde proprietatea de a fi implicită."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: views/developers/addon_edit_authors.thtml:69
+msgid "devcp_notice_unsaved_changes"
+msgstr ""
+
+#: 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
@@ -2315,21 +3173,68 @@ msgstr "Editează avanpremieră"
 msgid "devcp_preview_updated_successfully"
 msgstr "Avanpremieră actualizată cu succes."
 
+#: views/developers/previews.thtml:121
+msgid "devcp_previews_a_another"
+msgstr ""
+
+#: views/developers/previews.thtml:97
+msgid "devcp_previews_a_delete"
+msgstr "Șterge avanpriemiera"
+
+#: views/developers/previews.thtml:96
+msgid "devcp_previews_a_replace"
+msgstr ""
+
+#: views/developers/previews.thtml:127
+msgid "devcp_previews_a_update"
+msgstr ""
+
+#: 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:117
+msgid "devcp_previews_add_select"
+msgstr ""
+
+#: 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:103
+msgid "devcp_previews_click_update"
+msgstr ""
+
+#. %s is href=... and should stay in the <a> tag.
+#: views/developers/previews.thtml:108
+msgid "devcp_previews_error_message"
+msgstr ""
+
 #: views/previews/add.thtml:45
 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:79
+msgid "devcp_previews_header_caption"
+msgstr "Titlu avanpremieră"
+
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "Editează avanpremieră"
 
+#: views/developers/previews.thtml:94
+msgid "devcp_previews_label_default"
+msgstr ""
+
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
 msgstr "Fișier avanpremieră"
@@ -2338,6 +3243,26 @@ msgstr "Fișier avanpremieră"
 msgid "devcp_previews_label_makedefault"
 msgstr "Această imagine de avanpremieră este cea implicită"
 
+#: views/developers/previews.thtml:101
+msgid "devcp_previews_label_new"
+msgstr ""
+
+#: views/developers/previews.thtml:119
+msgid "devcp_previews_label_upload"
+msgstr ""
+
+#: views/developers/previews.thtml:49
+msgid "devcp_previews_notice_error"
+msgstr ""
+
+#: views/developers/previews.thtml:46
+msgid "devcp_previews_notice_success"
+msgstr ""
+
+#: views/developers/previews.thtml:58
+msgid "devcp_previews_p_screenshots"
+msgstr ""
+
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
 msgstr "Șterge avanpriemiera"
@@ -2354,45 +3279,121 @@ msgstr "Editează avanpremieră"
 msgid "devcp_previews_submit_upload"
 msgstr "Încarcă o avanpremieră"
 
+#: views/developers/previews.thtml:77
+msgid "devcp_previews_thumbnail"
+msgstr "Miniatură"
+
+#. %s is the add-on name.
+#: views/developers/previews.thtml:43
+msgid "devcp_previews_title"
+msgstr ""
+
 #: views/developers/add_step2.thtml:64
 msgid "devcp_question_addontype_incorrect"
 msgstr "Incorect?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Sigur doriți să ștergeți acest fișier?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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 "
 "de a continua."
 
+#: views/elements/developers/rolecheck.thtml:42
+msgid "devcp_rolecheck_no_privs"
+msgstr ""
+
+#: controllers/developers_controller.php:1243
+msgid "devcp_several_hours"
+msgstr ""
+
+#: views/elements/developers/sidebar.thtml:52
+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:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> utilizatori activi zilnic"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> descărcări în total"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> descărcări pe săptămână"
 
-#: controllers/developers_controller.php:1481
+#: views/developers/addon_status_confirm.thtml:59
+msgid "devcp_status_confirm_active"
+msgstr ""
+
+#: views/developers/addon_status_confirm.thtml:59
+msgid "devcp_status_confirm_active_sure"
+msgstr ""
+
+#: views/developers/addon_status_confirm.thtml:50
+msgid "devcp_status_confirm_header_sure"
+msgstr "Sigur doriți asta?"
+
+#: views/developers/addon_status_confirm.thtml:55
+msgid "devcp_status_confirm_inactive"
+msgstr ""
+
+#: views/developers/addon_status_confirm.thtml:55
+msgid "devcp_status_confirm_inactive_sure"
+msgstr ""
+
+#: views/developers/addon_status_confirm.thtml:74
+msgid "devcp_status_confirm_no"
+msgstr ""
+
+#: views/developers/addon_status_confirm.thtml:67
+msgid "devcp_status_confirm_public"
+msgstr ""
+
+#: views/developers/addon_status_confirm.thtml:67
+msgid "devcp_status_confirm_public_sure"
+msgstr ""
+
+#: views/developers/addon_status_confirm.thtml:63
+msgid "devcp_status_confirm_sandbox"
+msgstr ""
+
+#: views/developers/addon_status_confirm.thtml:63
+msgid "devcp_status_confirm_sandbox_sure"
+msgstr ""
+
+#: views/developers/addon_status_confirm.thtml:73
+msgid "devcp_status_confirm_yes"
+msgstr ""
+
+#: views/developers/addon_status_nominate.thtml:46
+msgid "devcp_status_nominate_error_notice"
+msgstr ""
+
+#: views/developers/addon_status_nominate.thtml:55
+msgid "devcp_status_nominate_header"
+msgstr ""
+
+#: controllers/developers_controller.php:1566
 msgid "devcp_submissions_disabled"
 msgstr ""
 "Trimiterea de suplimente este dezactivată. Vă rugăm încercați din nou mai "
@@ -2400,13 +3401,13 @@ msgstr ""
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Accept"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Nu accept"
 
@@ -2422,11 +3423,11 @@ msgstr "Dezactivat"
 msgid "devcp_summary_header_trusted"
 msgstr "De încredere"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Ultima versiune:"
 
-# %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"
@@ -2436,7 +3437,7 @@ msgstr "Nu aveți niciun supliment. Clic %s pentru a trimite unul."
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "aici"
 
-# %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"
@@ -2446,30 +3447,502 @@ msgstr "Vă rugăm %s pentru această temă."
 msgid "devcp_theme_upload_preview_link"
 msgstr "să încărcați o imagine de avanpremieră"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+msgid "devcp_title_edit_addon"
+msgstr ""
+
+#. title attribute for a javascript link that pops up a help dialog.
+#: views/elements/developers/translationbox.thtml:64
+msgid "devcp_transbox_a_title_help"
+msgstr ""
+
+#: 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/developers/translationbox.thtml:97
+msgid "devcp_transbox_chars_used"
+msgstr ""
+
+#: views/elements/developers/translationbox.thtml:132
+msgid "devcp_transbox_delete_sure"
+msgstr ""
+
+#. %s is a locale, like en-US.
+#: views/elements/developers/translationbox.thtml:143
+msgid "devcp_transbox_help_header_tabs"
+msgstr ""
+
+#: views/elements/developers/translationbox.thtml:145
+msgid "devcp_transbox_help_header_what"
+msgstr ""
+
+#: views/elements/developers/translationbox.thtml:147
+msgid "devcp_transbox_help_hide"
+msgstr ""
+
+#: views/elements/developers/translationbox.thtml:146
+msgid "devcp_transbox_help_if"
+msgstr ""
+
+#: views/elements/developers/translationbox.thtml:144
+msgid "devcp_transbox_help_transbox"
+msgstr ""
+
+#: views/elements/developers/translationbox.thtml:81
+msgid "devcp_transbox_img_add_trans"
+msgstr ""
+
+#: views/elements/developers/translationbox.thtml:82
+msgid "devcp_transbox_img_remove_trans"
+msgstr ""
+
+#: views/elements/developers/translationbox.thtml:123
+msgid "devcp_transbox_input_add_all"
+msgstr ""
+
+#: views/elements/developers/translationbox.thtml:122
+msgid "devcp_transbox_input_add_locale"
+msgstr ""
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+msgid "devcp_transbox_input_cancel"
+msgstr "Renunță"
+
+#: views/elements/developers/translationbox.thtml:134
+msgid "devcp_transbox_input_delete"
+msgstr ""
+
+#: views/elements/developers/translationbox.thtml:113
+msgid "devcp_transbox_select_locale"
+msgstr ""
+
+#. %1$s and %2$s are GUIDs.
+#: controllers/developers_controller.php:311
+msgid "devcp_update_addon_guid_error"
+msgstr ""
+
+#: 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: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:319
+msgid "devcp_update_addon_version_exists_error"
+msgstr ""
+
+#. %1$s and %2$s are version numbers.
+#: controllers/developers_controller.php:356
+msgid "devcp_update_addon_version_match_error"
+msgstr ""
+
+#: views/developers/uploader.thtml:68
+msgid "devcp_uploader_a_start"
+msgstr ""
+
+#: views/developers/uploader.thtml:103
+msgid "devcp_uploader_ajax_loading"
+msgstr ""
+
+#: views/developers/uploader.thtml:123
+msgid "devcp_uploader_button_edit"
+msgstr ""
+
+#: views/developers/uploader.thtml:124
+msgid "devcp_uploader_button_later"
+msgstr ""
+
+#: 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:122
+msgid "devcp_uploader_created_results"
+msgstr ""
+
+#: 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:141
+msgid "devcp_uploader_file_created"
+msgstr ""
+
+#: views/developers/uploader.thtml:120
+msgid "devcp_uploader_header_created"
+msgstr ""
+
+#: views/developers/uploader.thtml:107
+msgid "devcp_uploader_header_error"
+msgstr ""
+
+#: views/developers/uploader.thtml:139
+msgid "devcp_uploader_header_file_added"
+msgstr ""
+
+#: views/developers/uploader.thtml:66
+msgid "devcp_uploader_header_how"
+msgstr ""
+
+#. %s is the version number, e.g. 3.2.
+#: views/developers/uploader.thtml:129
+msgid "devcp_uploader_header_update_created"
+msgstr ""
+
+#: views/developers/uploader.thtml:83
+msgid "devcp_uploader_header_upload"
+msgstr ""
+
+#: views/developers/uploader.thtml:67
+msgid "devcp_uploader_how"
+msgstr ""
+
+#: views/developers/uploader.thtml:91
+msgid "devcp_uploader_label_platformtype"
+msgstr ""
+
+#: views/developers/uploader.thtml:90
+msgid "devcp_uploader_label_upload_field"
+msgstr ""
+
+#. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
+#: 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:132
+msgid "devcp_uploader_p_pending_version"
+msgstr ""
+
+#. %s is a status, e.g Public or Incomplete.
+#: 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: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:133
+msgid "devcp_uploader_p_update_version"
+msgstr ""
+
+#: views/developers/uploader.thtml:84
+msgid "devcp_uploader_p_upload"
+msgstr ""
+
+#: views/developers/uploader.thtml:91
+msgid "devcp_uploader_platformtype_all"
+msgstr "Toate"
+
+#: views/developers/uploader.thtml:92
+msgid "devcp_uploader_platformtype_specific"
+msgstr ""
+
+#. %1$s is the add-on name, %2$s is the version number.
+#: views/developers/uploader.thtml:57
+msgid "devcp_uploader_title_file"
+msgstr ""
+
+#: views/developers/uploader.thtml:50
+msgid "devcp_uploader_title_submit"
+msgstr ""
+
+#. %s is the add-on name.
+#: views/developers/uploader.thtml:54
+msgid "devcp_uploader_title_update"
+msgstr ""
+
+#. %s is a full <a> tag
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Vedeți %s pentru referință."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "această pagină"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: controllers/developers_controller.php:527
+msgid "devcp_verify_author_error"
+msgstr ""
+
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
 msgid "devcp_version_edit_pagetitle"
 msgstr "Modificare versiune"
 
-#: controllers/developers_controller.php:2572
+#: 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"
+msgstr "Renunță"
+
+#: views/developers/versions.thtml:79
+msgid "devcp_versions_a_delete"
+msgstr ""
+
+#: views/developers/versions.thtml:74
+msgid "devcp_versions_a_empty"
+msgstr ""
+
+#: views/developers/versions.thtml:71
+msgid "devcp_versions_a_remove"
+msgstr ""
+
+#: views/developers/versions.thtml:91
+msgid "devcp_versions_add"
+msgstr ""
+
+#: views/developers/versions_delete.thtml:58
+msgid "devcp_versions_delete_a_cancel"
+msgstr "Renunță"
+
+#: views/developers/versions_delete.thtml:56
+msgid "devcp_versions_delete_a_delete"
+msgstr ""
+
+#. Followed by a list of reviews and files that will be removed.
+#: views/developers/versions_delete.thtml:50
+msgid "devcp_versions_delete_also"
+msgstr ""
+
+#: views/developers/versions_delete.thtml:53
+msgid "devcp_versions_delete_files"
+msgid_plural "devcp_versions_delete_files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. %s is the version number.
+#: views/developers/versions_delete.thtml:48
+msgid "devcp_versions_delete_header"
+msgstr ""
+
+#: views/developers/versions_delete.thtml:52
+msgid "devcp_versions_delete_reviews"
+msgid_plural "devcp_versions_delete_reviews"
+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:101
+#: views/developers/versions_edit.thtml:154
+msgid "devcp_versions_edit_a_cancel"
+msgstr "Renunță"
+
+#: views/developers/versions_edit.thtml:100
+msgid "devcp_versions_edit_a_delete"
+msgstr "Șterge fișierul"
+
+#: views/developers/versions_edit.thtml:164
+msgid "devcp_versions_edit_a_new_app"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:153
+msgid "devcp_versions_edit_a_remove_app"
+msgstr ""
+
+#: 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:120
+msgid "devcp_versions_edit_adjust"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:152
+msgid "devcp_versions_edit_compat_sure"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:99
+msgid "devcp_versions_edit_delete_sure"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:186
+msgid "devcp_versions_edit_header_approval"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:119
+msgid "devcp_versions_edit_header_compat"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:73
+msgid "devcp_versions_edit_header_file"
+msgstr ""
+
+#. %s is the version number.
+#: views/developers/versions_edit.thtml:52
+msgid "devcp_versions_edit_header_manage"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:194
+msgid "devcp_versions_edit_header_notes"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:97
+msgid "devcp_versions_edit_img_delete"
+msgstr "Șterge fișierul"
+
+#. %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
+msgid "devcp_versions_edit_li_file"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:110
+msgid "devcp_versions_edit_no_files"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:195
+msgid "devcp_versions_edit_optional"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:150
+msgid "devcp_versions_edit_remove_compat"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:166
+msgid "devcp_versions_edit_select_app"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:77
+msgid "devcp_versions_edit_th_file"
+msgstr "Fișier"
+
+#: views/developers/versions_edit.thtml:78
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platformă"
+
+#: views/developers/versions_edit.thtml:79
+msgid "devcp_versions_edit_th_size"
+msgstr "Mărime"
+
+#: views/developers/versions_edit.thtml:80
+msgid "devcp_versions_edit_th_status"
+msgstr "Stare"
+
+#: views/developers/versions_edit.thtml:182
+msgid "devcp_versions_edit_transbox_releasenotes_description"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:181
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Note asupra ediției"
+
+#: views/developers/versions_edit.thtml:163
+msgid "devcp_versions_edit_unsaved_compat"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:112
+msgid "devcp_versions_edit_unsaved_files"
+msgstr ""
+
+#: views/developers/versions_edit.thtml:200
+msgid "devcp_versions_edit_update"
+msgstr ""
+
+#: views/developers/versions.thtml:49
+msgid "devcp_versions_header_manage"
+msgstr ""
+
+#: views/developers/versions.thtml:87
+msgid "devcp_versions_no_versions"
+msgstr ""
+
+#. %s is a version number, base 10.
+#: views/developers/versions.thtml:46
+msgid "devcp_versions_notice_success"
+msgstr ""
+
+#: views/developers/versions.thtml:73
+msgid "devcp_versions_p_remove"
+msgstr ""
+
+#: views/developers/versions.thtml:58
+msgid "devcp_versions_th_created"
+msgstr "Creat"
+
+#: views/developers/versions.thtml:57
+msgid "devcp_versions_th_status"
+msgstr "Stare"
+
+#: views/developers/versions.thtml:56
+msgid "devcp_versions_th_version"
+msgstr "Versiune"
+
 #: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Acest supliment este dezactivat"
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr ""
+
+#: controllers/components/editors.php:213
+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
+msgid "editor_review_error_no_action"
+msgstr ""
+
+#: controllers/components/editors.php:192
+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
+msgid "editor_review_error_no_comments"
+msgstr ""
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Vă rugăm selectați cel puțin un fișier pentru recenziat."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr ""
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filtrează"
@@ -2478,7 +3951,7 @@ msgstr "Filtrează"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtrează după tip/acțiune"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Jurnal de evenimente"
 
@@ -2530,6 +4003,7 @@ msgstr "Ascunde comentariile"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Arată comentariile"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2539,7 +4013,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Jurnalul recenziilor"
 
@@ -2563,24 +4037,24 @@ msgstr "Activitatea recentă a editorilor"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total recenzii"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Recenzie supliment"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Vă rugăm completați următoarele câmpuri:"
 
-#: controllers/editors_controller.php:461
+#: 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:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Nu sunt permise recenzii pentru suplimentele dumneavoastră."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Programe externe"
 
@@ -2592,39 +4066,39 @@ msgstr "Adaugă favorit"
 msgid "editors_featured_add_feature_submit"
 msgstr "Adaugă"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Favorit eliminat cu succes."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Suplimente excepționale"
 
@@ -2657,39 +4131,40 @@ 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
+#. %1 is the queue mode
 #: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 zi"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 oră"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minut"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Panoul de control al editorului"
 
-#: controllers/editors_controller.php:286
+#. %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 "numai %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Ediție preliminară"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2703,20 +4178,24 @@ msgstr "Curăță"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Acțiune de recenzent"
 
+#: views/editors/review.thtml:153
+msgid "editors_review_action_info"
+msgstr ""
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Trimite spre public"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Cere o supra-recenzie"
 
@@ -2724,44 +4203,48 @@ msgstr "Cere o supra-recenzie"
 msgid "editors_review_action_sandbox"
 msgstr "Reține în cutia cu nisip"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Comentarii recenzent"
 
-#: views/editors/review.thtml:167
+#: views/editors/review.thtml:176
+msgid "editors_review_details_info_request"
+msgstr ""
+
+#: 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:170
+#: 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:159
+#: 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:162
+#: 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:174
+#: 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:128
 msgid "editors_review_file_diff_link"
-msgstr ""
+msgstr "Compară cu versiunea publică"
 
 #: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
@@ -2779,15 +4262,15 @@ msgstr "Categorii:"
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilitate:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Descriere"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Comentariile dezvoltatorului"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2795,85 +4278,109 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Fișiere:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Istoricul elementului"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Mesaj de nominalizare"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Avanpremiere"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
-msgstr "Politică de confidențialite"
+msgstr "Politică de confidențialitate"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Recenzie %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Note către recenzent"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Descriere sumară"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Note versiune"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Răspunde"
+
+#: views/elements/developers/editors_review_history_item.thtml:78
+msgid "editors_review_history_info_request"
+msgstr ""
+
+#: views/elements/developers/editors_review_history_item.thtml:62
+#: views/editors/reviewlog.thtml:77
 msgid "editors_review_history_nominated_adminreview"
 msgstr "Recenzie administrator"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Nominalizare acordată/Public"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Nominalizare respinsă/Cutia cu nisip"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Nu s-au găsit recenzii anterioare."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Recenzie administrator"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Aprobat/Public"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Respins/Cutia cu nisip"
 
-#: views/editors/review.thtml:198
+#. 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] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Aplicații:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "sau alegeți un răspuns salvat:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Comentarii:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sisteme de operare:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Sus"
 
@@ -2881,7 +4388,7 @@ msgstr "Sus"
 msgid "editors_review_next_link"
 msgstr "înainte &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Nu s-a găsit nicio avanpremieră."
 
@@ -2889,41 +4396,45 @@ msgstr "Nu s-a găsit nicio avanpremieră."
 msgid "editors_review_previous_link"
 msgstr "&laquo; înapoi"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %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 ""
+msgstr "<strong># %1$s</strong> din %2$s care sunt în coadă"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Procesează acțiunea"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Acțiune"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comentarii"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Dată"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Recenzent"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versiune/Fișier"
 
-#: controllers/editors_controller.php:411
+#: views/editors/review.thtml:213
+msgid "editors_review_update_notify_once"
+msgstr ""
+
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Recenzie procesată cu succes."
 
@@ -2947,7 +4458,7 @@ msgstr "Acțiune"
 msgid "editors_reviews_in_reply_to"
 msgstr "Răspuns pentru:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Recenziile au fost procesate cu succes!"
 
@@ -2959,23 +4470,23 @@ msgstr "Nu sunt recenzii de făcut."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Procesează recenzii"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Sait specific"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Nou"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Actualizat"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Aplicație testată"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sisteme de operare testate"
 
@@ -3016,17 +4527,20 @@ msgstr "Platforme"
 msgid "editors_th_submissiontypes"
 msgstr "Tipuri de trimiteri"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s zile"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ore"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minute"
@@ -3035,8 +4549,8 @@ msgstr "%s minute"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Acces interzis"
 
@@ -3044,12 +4558,13 @@ msgstr "Acces interzis"
 msgid "error_access_denied_message"
 msgstr "Nu sunteți autorizat(ă) să vedeți această pagină."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3057,20 +4572,19 @@ msgstr "Nu sunteți autorizat(ă) să vedeți această pagină."
 #: 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:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: 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/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219 controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Supliment negăsit"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Suplimentul nu poate fi văzut aici."
 
@@ -3078,13 +4592,13 @@ msgstr "Suplimentul nu poate fi văzut aici."
 msgid "error_addon_selfreview"
 msgstr "Nu puteți recenzia propriul supliment."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Niciun supliment în această categorie!"
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr ""
+msgstr "Nu s-a găsit fluxul suplimentelor."
 
 #: views/users/register.thtml:60 views/users/edit.thtml:176
 #: views/developers/add_step2.thtml:117 controllers/api_controller.php:907
@@ -3100,24 +4614,25 @@ msgstr "Aceasta nu este o adresă vaildă de email."
 msgid "error_field_required"
 msgstr "Acest câmp nu poate fi lăsat necompletat."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Fișier negăsit!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Eroare în fișier: nu·există %s."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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 ""
@@ -3132,19 +4647,19 @@ msgstr "Captcha invalid, vă rugăm încercați din nou!"
 #: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
-"Acest URL are un for_mat 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."
 
-#: 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
+#. %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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206 controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3162,7 +4677,7 @@ msgstr "Avertisment"
 msgid "error_preview_notfound"
 msgstr "Avanpremieră negăsită!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Trebuie să selectați o evaluare."
 
@@ -3208,15 +4723,15 @@ 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:68
 msgid "error_username_or_pw_wrong"
 msgstr "Ați greșit utilizatorul sau parola!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Nu s-a găsit versiunea!"
 
@@ -3228,13 +4743,14 @@ msgstr "Ați introdus o parolă greșită!"
 msgid "feature_learnmore"
 msgstr "Continuare"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Află mai multe despre %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3247,6 +4763,40 @@ msgstr[2] "%1$s de recenzii"
 msgid "feature_view_more_from_category"
 msgstr "Mai multe din"
 
+#. 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 ""
+
+#. 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 "Extinde tot"
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Toate drepturile rezervate."
@@ -3264,8 +4814,8 @@ 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
 msgid "footer_lang_form_lang_submit_go"
@@ -3283,7 +4833,7 @@ msgstr "Alte limbi:"
 msgid "footer_privacy_policy"
 msgstr "Politică de confidențialitate"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Salvează"
 
@@ -3291,7 +4841,7 @@ msgstr "Salvează"
 msgid "general_addontype_dict"
 msgstr "Dicționar"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Dicționare"
@@ -3300,7 +4850,7 @@ msgstr "Dicționare"
 msgid "general_addontype_extension"
 msgstr "Extensie"
 
-# 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensii"
@@ -3309,7 +4859,7 @@ msgstr "Extensii"
 msgid "general_addontype_lpaddon"
 msgstr "Pachet de limbă (Supliment)"
 
-# 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Pachete de limbă (Supliment)"
@@ -3318,7 +4868,7 @@ msgstr "Pachete de limbă (Supliment)"
 msgid "general_addontype_lpapp"
 msgstr "Pachet de limbă (Aplicație)"
 
-# 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Pachete de limbă (Aplicație)"
@@ -3327,16 +4877,16 @@ msgstr "Pachete de limbă (Aplicație)"
 msgid "general_addontype_plugin"
 msgstr "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:114
 msgid "general_addontype_plugin_plural"
-msgstr "Plugin-uri"
+msgstr "Module"
 
 #: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Motor de căutare"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Motoare de căutare"
@@ -3345,11 +4895,12 @@ msgstr "Motoare de căutare"
 msgid "general_addontype_theme"
 msgstr "Temă"
 
-# 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Teme"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3380,12 +4931,12 @@ msgid "header_navlink_addons"
 msgstr "Suplimente"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Ieșire"
 
@@ -3393,37 +4944,41 @@ msgstr "Ieșire"
 msgid "header_navlink_myaccount"
 msgstr "Contul meu"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "ÃŽnregistrare"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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.
+#. %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 "<a href=\"%1$s\">Autentificați-vă</a> pentru a instala acest supliment"
 
+#. %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 "Adaugă la %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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3446,7 +5001,7 @@ msgid "langtools_download_langpack"
 msgstr "Descarcă pachetul de limbă"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dicționare și pachete de limbă"
 
@@ -3535,49 +5090,44 @@ msgstr "Teme"
 msgid "other_apps_tooltip"
 msgstr "Găsește suplimente pentru alte aplicații"
 
-# In a user list: user 1, user 2, "others"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "alții"
 
 #: controllers/pages_controller.php:90
 msgid "page_title_appversions"
-msgstr ""
+msgstr "Versiuni de aplicație"
 
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Merite"
 
-#: controllers/pages_controller.php:94
-msgid "page_title_experimental_addons"
-msgstr ""
-
-#: controllers/pages_controller.php:113
-#, fuzzy
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
+msgstr ""
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
-msgstr ""
+msgstr "Întrebări frecvente pentru „Fashion your Firefox�"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
-msgstr ""
+msgstr "Politica suplimentelor"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
-msgstr ""
+msgstr "Politica de confidențialitate Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Ghid pentru recenzii"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Sistemul de recenzie prin cutia cu nisip"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Ajutor pentru trimiterea suplimentelor"
 
@@ -3596,6 +5146,7 @@ msgstr ""
 "fișierinstall.rdf cu cel puțin una din aplicațiile suportate de mai jos. "
 "Numai versiunile afișate mai jos sunt permise pentru aceste aplicații."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3603,6 +5154,8 @@ msgstr ""
 "Dacă aplicația suportată de supliment nu necesită un fișier install.rdf, "
 "totuși trebuie să includeți unul cu proprietățile specificate în %s."
 
+#. 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 "aici"
@@ -3611,10 +5164,6 @@ msgstr "aici"
 msgid "pages_appversions_versions"
 msgstr "Versiuni"
 
-#: views/pages/experimental_addons.thtml:56
-msgid "pages_experimental_addons_backbutton"
-msgstr "Înapoi la pagina precedentă"
-
 #: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Pagina cu informații despre cutia cu nisip"
@@ -3623,7 +5172,7 @@ 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
+#. %1 is page number, %2 is total page count
 #: views/helpers/pagination.php:199
 #, php-format
 msgid "pagination_page_number_title"
@@ -3645,19 +5194,23 @@ msgstr "Introduceți răspunsul dumneavoastră aici:"
 
 #: views/elements/recaptcha.thtml:74
 msgid "recaptcha_enter_whatyouhear"
-msgstr ""
+msgstr "Vă rugăm să tastați ceea ce auziți."
 
-# %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 ""
+"Dacă este dificil de înțeles, puteți să <a href=\"%1$s\">ascultați altceva</"
+"a> sau să <a href=\"%2$s\">comutați înapoi la text</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
 msgid "recaptcha_hardtoread_text"
 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:100
 msgid "recaptcha_label"
@@ -3667,13 +5220,13 @@ msgstr "Sunteți om?"
 msgid "recaptcha_whatsthis"
 msgstr "Ce e asta?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Eroare la marcarea acestei recenzii!"
 
 #: models/reviews_moderation_flag.php:69
 msgid "review_flag_reason_bug_support"
-msgstr ""
+msgstr "Raport de defect sau cerere de asistență amplasate greșit"
 
 #: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
@@ -3681,18 +5234,18 @@ msgstr "Raportează această recenzie (alegeți un motiv)"
 
 #: models/reviews_moderation_flag.php:67
 msgid "review_flag_reason_language"
-msgstr ""
+msgstr "Limbaj necorespunzător"
 
 #: models/reviews_moderation_flag.php:71
 msgid "review_flag_reason_other"
-msgstr ""
+msgstr "Altele (vă rugăm să specificați)"
 
 #: models/reviews_moderation_flag.php:65
 msgid "review_flag_reason_spam"
 msgstr "Spam sau alt conținut care nu e o recenzie"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr ""
 "Vă mulțumim; recenzia a fost marcată pentru aprobare de către un editor."
@@ -3707,15 +5260,15 @@ msgstr ""
 "Este această recenzie nepotrivită, inexactă sau spam? Clic aici pentru a o "
 "marca pentru a fi recenziată de către un editor."
 
-# %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: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 "
@@ -3724,22 +5277,22 @@ msgstr ""
 "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 addon name
+#. %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 "Recenzii pentru %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Suplimente excepționale"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Cele mai noi suplimente"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Suplimente actualizate"
 
@@ -3778,6 +5331,7 @@ msgstr "Toate motoarele de căutare"
 msgid "search_landing_browse_search_engines"
 msgstr "Răsfoiți motoarele de căutare"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3798,12 +5352,13 @@ msgstr "Căutare suplimente"
 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:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Rezultatele căutării după: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Unelte pentru admin"
 
@@ -3811,7 +5366,7 @@ msgstr "Unelte pentru admin"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Unelte pentru dezvoltatori"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Unelte pentru editori"
 
@@ -3819,6 +5374,7 @@ msgstr "Unelte pentru editori"
 msgid "sidebar_navlink_welcome"
 msgstr "Bun venit"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3856,6 +5412,7 @@ msgstr "O temă"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Suplimente actualizate"
 
+#. %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
@@ -3867,7 +5424,7 @@ msgstr "%1$s KO"
 msgid "stars_not_yet_rated"
 msgstr "Neevaluat încă"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3885,24 +5442,32 @@ msgstr "Unelte pentru dezvoltatori"
 msgid "statistics_addon_switch"
 msgstr "Schimbă suplimentul"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "Bun venit, %s"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "%b. %e, %Y"
+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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 msgid "statistics_date_weekdayshortmonth"
-msgstr "%A, %b. %e"
+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 "S-a creat %1$s"
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3944,7 +5509,7 @@ msgstr "Statistici - Tablou de bord"
 msgid "statistics_index_view_button"
 msgstr "Afișează statisticile"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Vezi acest tabel în format CSV"
 
@@ -3960,7 +5525,7 @@ msgstr "Șterge acest grafic"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Grupare după: zi"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Grupare după: lună"
 
@@ -3968,103 +5533,107 @@ msgstr "Grupare după: lună"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Grupare după: săptămână"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr ""
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s găsite în plajă"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Adaugă grafic"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Adaugă un alt grafic"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Ascunde totalul"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Arată totalul"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Desenează totalul pe acest grafic"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Afișează datele (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Ascunde evenimentele %s"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Arată evenimentele %s"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Arată datele de lansare pe grafic"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Ascunde evenimentele Firefox"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Arată evenimentele Firefox"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Pliază graficul"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expandează graficul"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Redimensionează graficul"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Utilizatori activi zilnic"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplicație"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personalizat"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Descărcări"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistem de operare"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Stare supliment"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Sumar"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Versiune supliment"
 
@@ -4088,13 +5657,13 @@ msgstr "Necunoscut"
 msgid "statistics_longnames_version"
 msgstr "Versiune supliment"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "Nu sunt date suficiente pentru a afișa acest grafic. Vă rugăm să încercați "
 "mai târziu."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr "Nu s-au adunat încă date pentru supliment. Reveniți în câteva zile."
 
@@ -4105,13 +5674,13 @@ msgstr ""
 "putea fi incomplete datorită faptului că scripturile noastre lucrează la "
 "actualizarea acestor informații. Vă rugăm să reveniți în câteva minute."
 
-#: views/statistics/addon.thtml:122
+#: 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:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "E nevoie de JavaScript pentru a vedea statisticile."
 
@@ -4126,42 +5695,42 @@ msgstr "Setările dumneavoastră au fost actualizate!"
 msgid "statistics_pagetitle"
 msgstr "Statistici - Tablou de bord"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Utilizatori activi zilnic"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Descărcări zilnice"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Mărește"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Mărește cu o lună"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Micșorează"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Micșorează cu o lună"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Sumar zilnic al statisticilor pentru %1$s"
 
-#: views/statistics/addon.thtml:200
+#: 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, %B %e, %Y"
+msgstr "%A, %e %B %Y"
 
 #: views/statistics/rss/summary.thtml:75
 #, php-format
@@ -4195,23 +5764,23 @@ msgstr "Public"
 msgid "statistics_settings_access_public_description"
 msgstr "Oricine poate vedea statisticile acestui supliment"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Schimbă setările"
 
-#: views/statistics/addon.thtml:241
+#: 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:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Acest tablou de bord este acum <b>privat</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Acest tablou de bord este acum <b>public</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Blocat"
 
@@ -4228,7 +5797,7 @@ msgstr "Salvează setările"
 msgid "statistics_settings_title"
 msgstr "Statistici - Setările tabloului de bord pentru %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Deblocat"
 
@@ -4252,7 +5821,7 @@ msgstr "Nec"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Descărcări în medie pe zi"
 
@@ -4260,37 +5829,37 @@ msgstr "Descărcări în medie pe zi"
 msgid "statistics_summary_downloads_heading"
 msgstr "Descărcări"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Numărătoarea din ultima zi"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Descărcări în ultimele 7 zile"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Descărcări în total"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Din %1$s"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Încă nu sunt date"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Media utilizatorilor activi zilnic"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Schimbare de la numărătoarea precedentă"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s în %2$s"
@@ -4299,17 +5868,17 @@ msgstr "%1$s în %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Utilizatori activi zilnic"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Utilizatori activi zilnic"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "ÃŽn %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Statistici pentru %1$s"
@@ -4334,10 +5903,12 @@ msgstr "Schimbare parolă"
 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
+#. %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 ""
+"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:95
 msgid "user_del_community_sad"
@@ -4351,49 +5922,60 @@ msgstr "Confirmați parola"
 msgid "user_del_deletenow"
 msgstr "Șterge contul meu acum"
 
-# %1 is the URL of the user's info page
+#. %1 is the URL of the user's info page
 #: 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="
+"\"%1$s\">autor al vreunui supliment</a>. Pentru a vă șterge contul, vă rugăm "
+"să desemnați o altă persoană din grupul dumneavoastră de dezvoltatori să vă "
+"înlăture din lista de autori a suplimentelor dumneavoastră, după care veți "
+"putea să vă ștergeți contul."
 
-# %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: 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:74
 msgid "user_del_error_checkbox"
-msgstr ""
+msgstr "Trebuie să bifați căsuța „Înțeleg că...� înainte de a vă șterge contul."
 
 #: views/users/delete.thtml:78
 msgid "user_del_error_password"
-msgstr ""
+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
+#. %1 is a link to the amo-admins mailing list
 #: 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:103
 msgid "user_del_header_confirm_deletion"
-msgstr ""
+msgstr "Confirmați ștergerea contului"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
-msgstr ""
+msgstr "Ștergere cont de utilizator %1$s"
 
 #: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
-msgstr ""
+msgstr "La revedere!"
 
 #: views/users/delete.thtml:108
 msgid "user_del_nologin"
-msgstr ""
+msgstr "De acum nu vă veți mai putea autentifica în Mozilla Add-ons."
 
 #: 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:109
 msgid "user_del_reviews_anonymized"
@@ -4401,10 +5983,13 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: 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:123
 msgid "user_del_understand_permanent"
@@ -4414,7 +5999,7 @@ msgstr "Înțeleg că acest pas nu are cale de întoarcere."
 msgid "user_deleted_nickname"
 msgstr "Utilizator șters"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4427,9 +6012,9 @@ msgstr ""
 msgid "user_edit_delete_user"
 msgstr "Șterge contul de utilizator"
 
-# 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4450,14 +6035,13 @@ msgstr ""
 "Vă mulțumim pentru înscrierea pe Suplimente %2$s\n"
 "-- Echipa Suplimente %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: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 "
@@ -4476,8 +6060,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Vă mulțumim pentru înscrierea pe Suplimente %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
 #, php-format
 msgid "user_email_pwreset"
@@ -4504,7 +6088,7 @@ msgstr "Resetați-vă parola dumneavoastră pe Suplimente %s"
 msgid "user_emailchange_error"
 msgstr "Eroare!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4515,13 +6099,13 @@ msgstr ""
 msgid "user_emailchange_success"
 msgstr "Succes!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: 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."
+"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/pwreset.thtml:77 views/users/register.thtml:68
 #: views/users/edit.thtml:160
@@ -4631,8 +6215,8 @@ msgstr "Actualmente nu sunt notificări disponibile pentru a fi configurate."
 #: 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:143
@@ -4687,23 +6271,23 @@ msgstr "Trimite legătura de resetare a parolei"
 msgid "user_register_amo_link"
 msgstr "Suplimente %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 ""
 "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
+#. %1 is the user's email address
 #: 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"
@@ -4713,7 +6297,7 @@ msgstr "retrimite mesajul de confirmare"
 msgid "user_register_congratulations"
 msgstr "Felicitări! Contul dumneavoastră a fost creat cu succes."
 
-# %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"
@@ -4723,7 +6307,7 @@ msgstr ""
 "„corespondență nesolicitată�. Dacă aveți nevoie, vă putem %1$s pe adresa de "
 "email menționată mai sus."
 
-# %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4747,7 +6331,7 @@ msgstr "Verificat cu succes!"
 
 #: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
-msgstr ""
+msgstr "Ștergere cont de utilizator"
 
 #: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
@@ -4783,7 +6367,7 @@ msgstr "Pseudonim"
 msgid "users_info_pagetitle"
 msgstr "Info utilizator pentru %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Recenzii făcute de %s"
@@ -4792,8 +6376,8 @@ msgstr "Recenzii făcute de %s"
 msgid "users_login_pagetitle"
 msgstr "Autentificare utilizator"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4802,8 +6386,8 @@ msgstr ""
 "aveți deja un cont pe Suplimente Mozilla, vă rugăm autentificați-vă, sau "
 "<a·href=\"%1$s\">aflați mai multe despre cutia cu nisip.</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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4819,3 +6403,402 @@ msgstr "Resetare parolă utilizator"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "ÃŽnregistrare utilizator nou"
+
+#, fuzzy
+#~ msgid "addon_recommended"
+#~ msgstr "This add-on is recommended by Mozilla"
+
+# %1 is the user, %2 is the (localized) date, %3 is the rating
+#, fuzzy
+#~ msgid "addon_reviewed_by_u_on_d_rated_x"
+#~ msgstr "by %1$s on %2$s (rated %3$s)"
+
+#, fuzzy
+#~ msgid "addons_breadcrumb_EULA"
+#~ msgstr "EULA"
+
+#, fuzzy
+#~ msgid "addons_breadcrumb_privacy_policy"
+#~ msgstr "Privacy Policy"
+
+#, fuzzy
+#~ msgid "addons_browse_all_addons"
+#~ msgstr "All %1$s"
+
+#, fuzzy
+#~ msgid "addons_browse_all_addons_title"
+#~ msgstr "Browse all %1$s"
+
+#~ msgid "addons_display_a_discuss"
+#~ msgstr "Discuții despre %s"
+
+#, fuzzy
+#~ msgid "addons_display_collapse"
+#~ msgstr "collapse"
+
+#, fuzzy
+#~ msgid "addons_display_developer_home_page"
+#~ msgstr "Developer Home Page"
+
+#, fuzzy
+#~ msgid "addons_display_expand"
+#~ msgstr "expand"
+
+#~ msgid "addons_display_header_discussions"
+#~ msgstr "Discuții"
+
+#, fuzzy
+#~ msgid "breadcrumb_addon_previews"
+#~ msgstr "Previews"
+
+#, fuzzy
+#~ msgid "breadcrumb_addon_versions"
+#~ msgstr "Version History"
+
+#~ msgid "devcp_actionbar_link_disable"
+#~ msgstr "Dezactivează suplimentul"
+
+#~ msgid "devcp_actionbar_link_enable"
+#~ msgstr "Activează suplimentul"
+
+#~ msgid "devcp_actionbar_link_nominate"
+#~ msgstr "Nominalizează suplimentul"
+
+#~ msgid "devcp_actionbar_link_viewpublic"
+#~ msgstr "Vezi pagina publică"
+
+#~ msgid "devcp_statsbar_rating"
+#~ msgstr "Evaluare <em>%1$.2f</em> / %2$d"
+
+#~ msgid "editors_reviews_action_approve"
+#~ msgstr "Aprobă"
+
+#~ msgid "editors_reviews_action_delete"
+#~ msgstr "Șterge"
+
+#~ msgid "forum_about_settings"
+#~ msgstr "Despre setări"
+
+#~ msgid "forum_about_settings_notes"
+#~ msgstr "Note despre setări"
+
+#~ msgid "forum_add_your_comments"
+#~ msgstr "Adaugă comentariu"
+
+#~ msgid "forum_administrative_options"
+#~ msgstr "Opțiuni administrative"
+
+#~ msgid "forum_administrative_settings"
+#~ msgstr "Setări administrative"
+
+#~ msgid "forum_all"
+#~ msgstr "Toate"
+
+#~ msgid "forum_back_to_discussions"
+#~ msgstr "Înapoi la discuții"
+
+#~ msgid "forum_cancel"
+#~ msgstr "Anulează"
+
+#~ msgid "forum_categories"
+#~ msgstr "Categorii de forum"
+
+#~ msgid "forum_category_description"
+#~ msgstr "Descriere"
+
+#~ msgid "forum_category_description_notes"
+#~ msgstr "Note asupra descrierii"
+
+#~ msgid "forum_category_management"
+#~ msgstr "Gestionare categorie"
+
+#~ msgid "forum_category_name"
+#~ msgstr "Nume"
+
+#~ msgid "forum_category_name_notes"
+#~ msgstr "Note asupra numelui"
+
+#~ msgid "forum_category_removed"
+#~ msgstr "Categorie eliminată"
+
+#~ msgid "forum_category_reorder_notes"
+#~ msgstr "Reordonează categoriile"
+
+#~ msgid "forum_category_saved"
+#~ msgstr "Categorie salvată"
+
+#~ msgid "forum_check"
+#~ msgstr "Verifică"
+
+# %1 is the username, %2 is date and time
+#~ msgid "forum_comment_by_name_on_date"
+#~ msgstr "Comentariu scris în %2$s de %1$s"
+
+#~ msgid "forum_confirm_hide_comment"
+#~ msgstr "Sigur doriți să ascundeți acest comentariu?"
+
+#~ msgid "forum_confirm_show_comment"
+#~ msgstr "Sigur doriți să arătați acest comentariu?"
+
+#~ msgid "forum_create_a_new_role"
+#~ msgstr "Creează un rol nou"
+
+#~ msgid "forum_create_new_category"
+#~ msgstr "Creează o categorie nouă"
+
+#~ msgid "forum_current_category"
+#~ msgstr "Categoria curentă"
+
+#~ msgid "forum_define_new_category"
+#~ msgstr "Creează categorie nouă"
+
+#~ msgid "forum_define_new_role"
+#~ msgstr "Adaugă rol nou"
+
+#~ msgid "forum_edit"
+#~ msgstr "Editare"
+
+#~ msgid "forum_edit_comment"
+#~ msgstr "Editează comentariul"
+
+#~ msgid "forum_edit_your_comments"
+#~ msgstr "Editați comentariile dumneavoastră"
+
+#~ msgid "forum_edit_your_discussion_topic"
+#~ msgstr "Editează subiectul"
+
+#~ msgid "forum_enter_your_comments"
+#~ msgstr "Introduceți comentariul dumneavoastră"
+
+#~ msgid "forum_enter_your_discussion_topic"
+#~ msgstr "Subiect de discuție"
+
+#~ msgid "forum_error_title"
+#~ msgstr "Eroare"
+
+#~ msgid "forum_get_category_to_edit"
+#~ msgstr "Selectați categoria de editat"
+
+#~ msgid "forum_hide_comment"
+#~ msgstr "Ascunde comentariul"
+
+#~ msgid "forum_improper_format"
+#~ msgstr "Format impropriu"
+
+# %1 is the username, %2 is date and time
+#~ msgid "forum_last_comment_by_name_on_date"
+#~ msgstr "Ultimul comentariu scris în %2$s de %1$s"
+
+#~ msgid "forum_modify_category_definition"
+#~ msgstr "Modifică definiția categoriei"
+
+#~ msgid "forum_modify_role_definition"
+#~ msgstr "Editează rolul"
+
+#~ msgid "forum_new_category_saved"
+#~ msgstr "Categoria nouă a fost salvată"
+
+#~ msgid "forum_new_role_saved"
+#~ msgstr "Rolul nou a fost creat"
+
+#~ msgid "forum_no_discussions_found"
+#~ msgstr "Nicio discuție găsită."
+
+#~ msgid "forum_none"
+#~ msgstr "Niciunul"
+
+#~ msgid "forum_not_signed_in"
+#~ msgstr "Nu sunteți autentificat(ă)"
+
+#~ msgid "forum_one_day_ago"
+#~ msgstr "acum 1 zi"
+
+#~ msgid "forum_one_hour_ago"
+#~ msgstr "acum 1 oră"
+
+#~ msgid "forum_one_minute_ago"
+#~ msgstr "acum 1 minut"
+
+#~ msgid "forum_one_second_ago"
+#~ msgstr "acum 1 secundă"
+
+# Page list's current position (no total) (ie. "1 to 15").
+# %1 is first record no., %2 is last record no.
+#~ msgid "forum_page_details"
+#~ msgstr "de la %1$s până la %2$s"
+
+# Page list's current position (ie. "1 to 15 of 56").
+# %1 is first record no., %2 is last record no., %3 is total no. of records
+#~ msgid "forum_page_details_full"
+#~ msgstr "de la %1$s până la %2$s din %3$s"
+
+#~ msgid "forum_permission_error"
+#~ msgstr "Permisiune refuzată"
+
+#~ msgid "forum_remove"
+#~ msgstr "Șterge forumul"
+
+#~ msgid "forum_replacement_category"
+#~ msgstr "Categorie de înlocuire"
+
+#~ msgid "forum_replacement_category_notes"
+#~ msgstr "Note asupra categoriei de înlocuire"
+
+#~ msgid "forum_replacement_role"
+#~ msgstr "Rol de înlocuire"
+
+#~ msgid "forum_replacement_role_notes"
+#~ msgstr "Note asupra rolului de înlocuire"
+
+#~ msgid "forum_replies"
+#~ msgid_plural "forum_replies"
+#~ msgstr[0] "Un răspuns"
+#~ msgstr[1] "%1$s răspunsuri"
+#~ msgstr[2] "%1$s de răspunsuri"
+
+#~ msgid "forum_required"
+#~ msgstr "Câmp necesar"
+
+# %1 is input name
+#~ msgid "forum_required_input"
+#~ msgstr "%1$s este un câmp necesar"
+
+#~ msgid "forum_role_abilities"
+#~ msgstr "Abilități"
+
+#~ msgid "forum_role_abilities_notes"
+#~ msgstr "Note asupra abilităților"
+
+#~ msgid "forum_role_category_notes"
+#~ msgstr "Note asupra categoriei"
+
+#~ msgid "forum_role_icon"
+#~ msgstr "Iconiță"
+
+#~ msgid "forum_role_icon_notes"
+#~ msgstr "Note asupra iconiței"
+
+#~ msgid "forum_role_management"
+#~ msgstr "Gestionare roluri"
+
+#~ msgid "forum_role_name"
+#~ msgstr "Nume"
+
+#~ msgid "forum_role_name_notes"
+#~ msgstr "Note asupra numelui"
+
+#~ msgid "forum_role_removed"
+#~ msgstr "Rolul a fost eliminat."
+
+#~ msgid "forum_role_reorder_notes"
+#~ msgstr "Note asupra reordonării rolurilor"
+
+#~ msgid "forum_role_saved"
+#~ msgstr "Rol salvat"
+
+#~ msgid "forum_role_tagline"
+#~ msgstr "Descriere succintă"
+
+#~ msgid "forum_role_tagline_notes"
+#~ msgstr "Note asupra descrierii succinte"
+
+#~ msgid "forum_roles"
+#~ msgstr "Roluri"
+
+#~ msgid "forum_roles_in_category"
+#~ msgstr "Roluri în categorie"
+
+#~ msgid "forum_save_your_changes"
+#~ msgstr "Salvează schimbările"
+
+#~ msgid "forum_search"
+#~ msgstr "Caută în discuții"
+
+#~ msgid "forum_select_category_to_remove"
+#~ msgstr "Selectați categoria de eliminat"
+
+#~ msgid "forum_select_replacement_category"
+#~ msgstr "Selectați categoria de înlocuire"
+
+#~ msgid "forum_select_replacement_role"
+#~ msgstr "Selectați rolul de înlocuire"
+
+#~ msgid "forum_select_role_to_edit"
+#~ msgstr "Selectați rolul de editat"
+
+#~ msgid "forum_select_role_to_remove"
+#~ msgstr "Selectați rolul de eliminat"
+
+#~ msgid "forum_show_comment"
+#~ msgstr "Arată comentariul"
+
+#~ msgid "forum_start_a_new_discussion"
+#~ msgstr "Începe o nouă discuție"
+
+#~ msgid "forum_start_your_discussion"
+#~ msgstr "Începe discuția"
+
+# %1 is username
+#~ msgid "forum_started_by"
+#~ msgstr "Începută de %1$s"
+
+# %1 is input name, %2 is character length
+#~ msgid "forum_too_many_characters"
+#~ msgstr "%1$s are %2$s caractere în plus față de câte sunt permise"
+
+#~ msgid "forum_top_of_page"
+#~ msgstr "Partea de sus a paginii"
+
+#~ msgid "forum_wait"
+#~ msgstr "Așteptați"
+
+# %1 is day count
+#~ msgid "forum_x_days_ago"
+#~ msgstr "acum %1$s zile"
+
+# %1 is hour count
+#~ msgid "forum_x_hours_ago"
+#~ msgstr "acum %1$s ore"
+
+# %1 is minute count
+#~ msgid "forum_x_minutes_ago"
+#~ msgstr "acum %1$s minute"
+
+# %1 is second count
+#~ msgid "forum_x_seconds_ago"
+#~ msgstr "acum %1$s secunde"
+
+#, fuzzy
+#~ msgid "header_navlink_browse"
+#~ msgstr "Browse"
+
+#, fuzzy
+#~ msgid "langtools_link_jumpto_dicts"
+#~ msgstr "Dictionaries & Language Packs"
+
+#~ msgid "recaptcha_enter_numbers"
+#~ msgstr ""
+#~ "Vă rugăm să introduceți mai jos <strong>numerele</strong> pe care le "
+#~ "auziți."
+
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to a text captcha
+#~ msgid "recaptcha_hardtohear"
+#~ msgstr ""
+#~ "Dacă sunt prea greu de înțeles, puteți <a href=\"%1$s\">încerca alte "
+#~ "numere</a> sau <a href=\"%2$s\">să reveniți la text</a>."
+
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to an audio captcha
+#~ msgid "recaptcha_hardtoread"
+#~ msgstr ""
+#~ "Dacă e prea greu de citit, puteți <a href=\"%1$s\">încerca alte cuvinte</"
+#~ "a> sau <a href=\"%2$s\">să ascultați două numere</a>."
+
+#, fuzzy
+#~ msgid "rss_newestaddons_description"
+#~ msgstr "The most recent %s Add-ons"
+
+#, fuzzy
+#~ msgid "search_form_submit"
+#~ msgstr "Search"
diff --git a/site/app/locale/ru/LC_MESSAGES/messages.po b/site/app/locale/ru/LC_MESSAGES/messages.po
index 38cf139..4058b05 100644
--- a/site/app/locale/ru/LC_MESSAGES/messages.po
+++ b/site/app/locale/ru/LC_MESSAGES/messages.po
@@ -24,6 +24,10 @@ msgstr ""
 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 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
@@ -52,38 +56,35 @@ msgstr "Публичные"
 msgid "a_header_sandbox"
 msgstr "«Пе�очница»"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Добавлено %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Обновлено %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Вер�и� %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "загрузок в�его"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
@@ -101,22 +102,24 @@ msgstr "на �траницу"
 msgid "addon_list_sortby"
 msgstr "Сортировать по:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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: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: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
@@ -126,6 +129,7 @@ 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -144,6 +148,7 @@ msgstr "Отзыв:"
 msgid "addon_review_add_submit"
 msgstr "Отправить ваш отзыв"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -177,22 +182,25 @@ msgstr "Да"
 msgid "addon_review_delete_header"
 msgstr "Удалить отзыв"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Отзыв у�пешно удалён."
 
+#. %s is the name of the add-on
 #: 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:534
+#. %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 �имвола(ов)."
 
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr "Примечание: перед публикацией ваш отзыв будет проверен рецензентом."
@@ -202,6 +210,7 @@ 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:135
 #, php-format
 msgid "addon_review_others_by_user"
@@ -211,15 +220,17 @@ msgstr[1] "Про�мотреть %1$s предыдущих отзыва о до
 msgstr[2] "Про�мотреть %1$s предыдущих отзывов о дополнении, о�тавленных %2$s."
 
 # %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -233,13 +244,14 @@ msgstr "Ответ разработчика:"
 msgid "addon_review_saved_successfully"
 msgstr "Ваш отзыв у�пешно добавлен. Спа�ибо!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, php-format
@@ -262,11 +274,16 @@ msgstr "Предыдущее дополнение"
 msgid "addon_version_permalink"
 msgstr "По�то�нна� ��ылка на �ту вер�ию"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-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:118
+#, fuzzy
+msgid "addon_versions_getlatestversion"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Перейти"
 
@@ -275,19 +292,23 @@ msgid "addons_author_tooltip"
 msgstr "Про�мотреть профиль автора"
 
 # %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
@@ -296,7 +317,7 @@ msgstr "Browse %1$s Themes :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "Добавить отзыв"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Дополнительные детали"
 
@@ -304,11 +325,11 @@ msgstr "Дополнительные детали"
 msgid "addons_display_categories"
 msgstr "Категории"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "подробный отзыв"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "�е нравит��"
@@ -317,93 +338,103 @@ msgstr "�е нравит��"
 msgid "addons_display_edit_review"
 msgstr "Редактировать ваш отзыв"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "У данного дополнени� е�ть �об�твенна� политика конфиденциально�ти."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Комментарии разработчика"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Домашн�� �траница"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Отзывы"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Поддержка"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "�равит��"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Подробное опи�ание"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 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:421
+#. %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
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Другие дополнени� �озданные %1$s"
 msgstr[1] "Other add-ons by these authors"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
 "Поддержка �того дополнени� о�уще�твл�ет�� разработчиком по адре�у "
 "�лектронной почты %s."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "Поддержка �того дополнени� о�уще�твл�ет�� разработчиком по адре�у %s или %s."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Поддержка �того дополнени� о�уще�твл�ет�� разработчиком по адре�у %s."
 
-#: views/addons/display.thtml:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Оценить"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Пожалуй�та не о�тавл�йте в отзывах �ообщени� об ошибках. Мы не �ообщаем ваш "
@@ -411,50 +442,53 @@ msgstr ""
 "� вами, чтобы помочь решить вашу проблему."
 
 # %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "Дл� получени� �ведений о том, как получить помощь по работе � �тим "
 "дополнением, обратите�ь в <a href=\"%1$s\">раздел поддержки</a>."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Сохранить"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Про�мотреть в�е отзывы (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Отобразить в�е вер�ии"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Полна� и�тори� вер�ий"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Про�мотреть и�ходный тек�т"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Про�мотреть �тати�тику"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Что вы думаете?"
 
@@ -464,7 +498,7 @@ msgstr "Совме�тимо�ть:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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 "автор"
@@ -475,10 +509,11 @@ msgstr "автор"
 msgid "addons_home_feature_head"
 msgstr "Мы рекомендуем"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -493,7 +528,9 @@ msgstr "�овейшие:"
 msgid "addons_home_other_applications"
 msgstr "Другие приложени�"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -503,19 +540,20 @@ msgstr "Другие приложени�"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -612,6 +650,7 @@ msgstr "дл� Mac OS X"
 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"
@@ -632,12 +671,13 @@ msgstr ""
 "мультимедиа файлов. Плагины �легка отличают�� от ра�ширений, которые "
 "измен�ют или ра�шир�ют �уще�твующую функционально�ть."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Попул�рные плагины дл� %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Плагины"
 
@@ -648,6 +688,7 @@ msgstr "Плагины"
 msgid "addons_plugins_support_documentation"
 msgstr "Документаци�:"
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -656,24 +697,25 @@ msgstr ""
 "конечного пользовател�:"
 
 # %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Иллю�трации дл� %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 msgid "addons_recommended_introduction"
 msgstr ""
 "Среди громадного количе�тва до�тупных дополнений найдёт�� что-нибудь "
 "полезное дл� каждого. Дл� начала, мы �обрали зде�ь �пи�ок некоторых �амых "
 "попул�рных дополнений. Удачи!"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Рекомендуемые дополнени�"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Рекомендуемые дополнени�"
 
@@ -682,6 +724,7 @@ msgid "addons_searchengines_additional_resources"
 msgstr "Дополнительные ре�ур�ы"
 
 # link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Центр разработки Mozilla"
@@ -701,33 +744,39 @@ msgstr ""
 
 # %1 is "make your own" link
 # %2 is MDC link
+#. %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 "Вы можете прочитать о том как %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: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: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: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:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Пои�ковые плагины"
 
@@ -741,7 +790,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Отключено"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "�еполна� вер�и�"
 
@@ -779,11 +828,12 @@ msgstr ""
 "Эти вер�ии отображают�� только дл� �ведени� и в цел�х те�тировани�. Вам "
 "�ледует в�егда и�пользовать по�леднюю вер�ию дополнени�."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "И�тори� вер�ий �о �пи�ком изменений"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "И�тори� вер�ий %1$s"
@@ -796,6 +846,7 @@ msgstr "Добавить группу"
 msgid "admin_group_delete_pagetitle"
 msgstr "Удалить группу"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -921,16 +972,20 @@ msgstr "Игнорировать проверку вер�ии"
 msgid "app_compat_older_firefox_only"
 msgstr "Это ра�ширение работает �о �тарыми вер�и�ми Firefox"
 
+#. %1$s and %2$s are URLs
 #: 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: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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -943,23 +998,23 @@ msgstr ""
 "Дл� и�пользовани� �того дополнени� <a href=\"http://getfirefox.com"
 "\">Обновите Firefox</a>"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Сортировать дополнени� по имени"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "�овейшие дополнени�"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Попул�рные дополнени�"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Сортировать дополнени� по рейтингу"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "�едавно обновлённые дополнени�"
 
@@ -992,6 +1047,7 @@ msgid "category_extra_mostpopular"
 msgstr "По попул�рно�ти"
 
 # %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"
@@ -1001,11 +1057,19 @@ msgstr "Про�мотреть в�ю категорию %1$s"
 msgid "collection_not_found"
 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"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
@@ -1038,6 +1102,8 @@ msgstr "Изменить maxVersion без загрузки"
 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:130
 msgid "compatibility_developers_login_first"
 msgstr ""
@@ -1061,6 +1127,10 @@ msgstr "Результаты проверки Ñ�татуÑ�а дополнениÐ
 msgid "compatibility_developers_retrieving"
 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:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s пользователей (%3$s&#37; от общего кол-ва)"
@@ -1076,6 +1146,8 @@ msgstr ""
 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:69
 msgid "compatibility_report_intro"
 msgstr ""
@@ -1087,6 +1159,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "�льфа-вер�ии"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Дополнени�, �овме�тимые � альфа-вер�ией %1$s"
@@ -1095,6 +1168,7 @@ msgstr "ДополнениÑ�, Ñ�овмеÑ�тимые Ñ� альфа-верÑ�иеÐ
 msgid "compatibility_report_legend_beta"
 msgstr "Бета-вер�ии"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "Дополнени�, �овме�тимые � бета-вер�ией или релиз-кандидатом %1$s"
@@ -1103,6 +1177,7 @@ msgstr "Дополнени�, �овме�тимые � бета-вер�ией
 msgid "compatibility_report_legend_latest"
 msgstr "По�ледн�� вер�и�"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Дополнени�, �овме�тимые � по�ледними �борками %1$s"
@@ -1111,6 +1186,7 @@ msgstr "ДополнениÑ�, Ñ�овмеÑ�тимые Ñ� поÑ�ледними Ñ�Ð
 msgid "compatibility_report_legend_other"
 msgstr "Другие вер�ии"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Дополнени�, не �овме�тимые ни � какой вер�ией %1$s"
@@ -1128,14 +1204,15 @@ msgstr "ИнформациÑ� длÑ� пользователей дополненÐ
 msgid "compatibility_view_report"
 msgstr "Про�мотр отчёта о �овме�тимо�ти"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr ""
 "Дл� получени� дополнительной информации отно�ительно �одей�тви�, пожалуй�та "
 "�м. нашу %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "�траничку Wiki"
 
@@ -1177,18 +1254,27 @@ msgstr ""
 "у�лови�х <a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative "
 "Commons Attribution 2.5 License</a>."
 
+#: 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>."
+
 # 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/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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
@@ -1196,7 +1282,10 @@ msgid "date"
 msgstr "%e %B %Y"
 
 # date and time format string (strftime)
+#. 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"
@@ -1222,14 +1311,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1277,36 +1394,36 @@ msgstr "Шаг 5: Завершение"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Помощь по публикации"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Дополнение у�пешно заблокировано"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Изменить дополнение"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Дополнение у�пешно разблокировано"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Опи�ание дополнени�"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "Лицензионное �оглашение (EULA)"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Домашн�� �траница дополнени�"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "�азвание дополнени�"
 
@@ -1315,40 +1432,300 @@ msgstr "�азвание дополнени�"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Подпи�ь к иллю�трации"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Политика конфиденциально�ти"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Кратка� информаци� о дополнении"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "�дре� �л. почты поддержки"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL поддержки"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Примечани� к вер�ии"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "�оминировать дополнение"
 
-#: controllers/developers_controller.php:2729
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1372,6 +1749,7 @@ msgstr ""
 "�лектронной почте."
 
 # %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"
@@ -1384,6 +1762,7 @@ 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"
@@ -1406,16 +1785,17 @@ msgstr ""
 "По�кольку вашему дополнению довер�ют, �та вер�и� была автоматиче�ки одобрена "
 "дл� общедо�тупной ча�ти �айта."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Публикаци� дополнени�"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1426,6 +1806,7 @@ 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"
@@ -1454,10 +1835,102 @@ msgstr "Далее"
 msgid "devcp_change_addontype"
 msgstr "Изменить тип дополнени�:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "Комментарии разработчика обновлены."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Добавить иллю�трацию"
@@ -1550,6 +2023,7 @@ msgstr "Разработчик не указал url поддержки."
 msgid "devcp_details_trusted"
 msgstr "Довер�ть"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1580,6 +2054,7 @@ msgstr ""
 "дополнение будет удалено, хот� вы �можете в дальнейшем вернуть�� �юда и при "
 "желании �нова его включить."
 
+#. %s is the name of an add-on
 #: views/developers/disable.thtml:55
 #, php-format
 msgid "devcp_disable_disable_title"
@@ -1600,11 +2075,65 @@ 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 "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Добавить автора"
@@ -1617,10 +2146,297 @@ msgstr "�дре�а �л. почты авторов"
 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 "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+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 "�вторы"
@@ -1686,6 +2502,206 @@ msgstr "Указанна� локаль"
 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: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 "Обновить"
@@ -1696,11 +2712,67 @@ 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 "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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+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
 #, php-format
@@ -1711,6 +2783,7 @@ msgstr[1] "Модерируемых рецензий (%s)"
 msgstr[2] "Модерируемых рецензий (%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
 #, php-format
@@ -1721,6 +2794,7 @@ msgstr[1] "�оминированных дополнений (%s)"
 msgstr[2] "�оминированных дополнений (%s)"
 
 # %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1736,6 +2810,8 @@ 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"
@@ -1761,29 +2837,30 @@ msgstr "Заметки рецензенту"
 msgid "devcp_editversion_submit_update"
 msgstr "Обновить"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: controllers/developers_controller.php:1992
 msgid "devcp_error_addonname_not_unique"
 msgstr ""
 "Такое дополнение уже �уще�твует в базе данных. Удо�товерьте�ь, что:<br /"
@@ -1791,19 +2868,33 @@ msgstr ""
 "неверный 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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Дл� получени� �правочной информации по�етите %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 "�ту �траницу"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+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"
@@ -1811,7 +2902,7 @@ msgstr ""
 "Указанное ра�ширение файла (%s) недопу�тимо дл� данного типа дополнени�. "
 "Пожалуй�та, и�пользуйте одно из �ледующих: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "�е в�е GUIDы в файле подход�т"
 
@@ -1840,6 +2931,8 @@ msgstr "Размер дополнениÑ� превышает макÑ�имальÐ
 msgid "devcp_error_http_nofile"
 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:401
 #, php-format
 msgid "devcp_error_icon_extension"
@@ -1847,14 +2940,15 @@ msgstr ""
 "Указанное ра�ширение файла (%s) недопу�тимо дл� значка. Пожалуй�та, "
 "и�пользуйте одно из �ледующих: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "От�ут�твует файл install.rdf."
 
@@ -1862,21 +2956,26 @@ msgstr "От�ут�твует файл install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "В install.rdf обнаружены �ледующие ошибки:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Выберите правильный тип дополнени�."
 
+#. %$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 "Вер�и� %s не �вл�ет�� дей�твительной дл� %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "Дл� данного дополнени� указан недей�твительный ID: %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"
@@ -1897,6 +2996,7 @@ msgstr ""
 "Указана недопу�тима� вер�и� дополнени�: в вер�ии не могут �одержать�� "
 "пробелы."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1906,6 +3006,7 @@ msgstr "Во врем� обработки файла install.rdf произош
 msgid "devcp_error_move_file"
 msgstr "�евозможно переме�тить файл."
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1928,15 +3029,15 @@ msgstr "Ð’ файле install.rdf не найдено ID длÑ� данного Ð
 msgid "devcp_error_no_platform"
 msgstr "Платформа не выбрана."
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "Дл� номинации вы должны вве�ти требуемые данные."
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "�евозможно номинировать предварительный выпу�к."
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Вы можете номинировать только дополнени� наход�щие�� в «пе�очнице»."
 
@@ -1948,6 +3049,8 @@ msgstr "Пожалуй�та, выберите хот� бы одну катег
 msgid "devcp_error_one_user"
 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"
@@ -1955,13 +3058,13 @@ msgstr ""
 "Указанное ра�ширение файла (%s) недопу�тимо дл� иллю�траций. Пожалуй�та, "
 "и�пользуйте одно из �ледующих: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
 msgid "devcp_error_saving"
 msgstr "При попытке �охранени� ваших данных произошла ошибка."
 
-#: controllers/developers_controller.php:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Вы не имеете прав дл� обновлени� �того дополнени�."
 
@@ -1977,7 +3080,7 @@ msgstr ""
 "Дополнени� не могут и�пользовать внешнюю ��ылку дл� updateURL. Пожалуй�та, "
 "удалите данную ��ылку из файла install.rdf и повторите попытку �нова."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Пожалуй�та, загрузите файл."
@@ -2198,6 +3301,7 @@ 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"
@@ -2241,11 +3345,26 @@ msgstr "Публикаци� дополнени�"
 msgid "devcp_myaddons_title"
 msgstr "Ин�трументы разработчика"
 
+#. %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 "Вернуть�� к �ведени�м о дополнении"
 
 # %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
@@ -2253,11 +3372,33 @@ msgid "devcp_nominate_submit_nominate"
 msgstr "�оминировать %s"
 
 # %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: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 ""
@@ -2268,6 +3409,10 @@ msgstr ""
 # %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"
@@ -2283,9 +3428,14 @@ msgstr ""
 "�азначение �той иллю�трации �тату�а «по умолчанию» приведёт к удалению �того "
 "�тату�а у текущей назначенной по умолчанию иллю�трации."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2314,6 +3464,60 @@ msgstr "Изменить иллю�трацию"
 msgid "devcp_preview_updated_successfully"
 msgstr "Иллю�траци� у�пешно обновлена."
 
+#: 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 ""
@@ -2325,10 +3529,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Добавить иллю�трацию"
 
+#: 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 "Изменить иллю�трацию"
 
+#: 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 "Файл иллю�трации"
@@ -2337,6 +3551,34 @@ msgstr "Файл иллю�трации"
 msgid "devcp_previews_label_makedefault"
 msgstr "Сделать �ту иллю�трацию изображением по умолчанию"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Удалить иллю�трацию"
@@ -2353,45 +3595,160 @@ msgstr "Изменить иллю�трацию"
 msgid "devcp_previews_submit_upload"
 msgstr "Загрузить иллю�трацию"
 
+#: 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 "�е �оответ�твует?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Вы уверены, что хотите удалить �тот файл?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
+
+#: 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 "Пропу�тить обновление текущей информации о дополнении"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> активных ежедневных пользователей"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> из общего кол-ва загрузок"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> из еженедельного кол-ва загрузок"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "В на�то�щее врем� публикаци� дополнений заблокирована. Попробуйте вернуть�� "
@@ -2399,13 +3756,13 @@ msgstr ""
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Прин�ть"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Отклонить"
 
@@ -2421,11 +3778,12 @@ msgstr "Заблокировано"
 msgid "devcp_summary_header_trusted"
 msgstr "Довер�ть"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2436,6 +3794,7 @@ 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"
@@ -2445,30 +3804,674 @@ msgstr "Убедите�ь, что %s дл� вашей темы."
 msgid "devcp_theme_upload_preview_link"
 msgstr "загрузили иллю�трацию"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Дл� получени� �правочной информации по�етите %s."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "�ту �траницу"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Изменить вер�ию"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Вер�и� обновлена у�пешно."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Дополнение заблокировано"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Фильтр"
@@ -2477,7 +4480,7 @@ msgstr "Фильтр"
 msgid "editorcp_logs_filter_by"
 msgstr "Фильтр по типу/дей�твию"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Журнал �обытий"
 
@@ -2529,6 +4532,7 @@ msgstr "Скрыть комментарии"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Показать комментарии"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2538,7 +4542,7 @@ msgstr "Про�мотреть запи�и между %s и %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Отзывы за данный период не найдены."
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Журнал рецензий"
 
@@ -2562,24 +4566,24 @@ msgstr "По�ледние дей�тви� редактора"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "В�его отзывов"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Рецензирование дополнени�"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Заполните �ледующие пол�:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Выберите по крайней мере один файл дл� рецензировани�."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Саморецензирование недопу�тимо."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Дополнительное программное обе�печение"
 
@@ -2591,39 +4595,39 @@ msgstr "Добавить избранное"
 msgid "editors_featured_add_feature_submit"
 msgstr "Добавить"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Избранное у�пешно добавлено."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "�е удало�ь удалить избранное."
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Избранное у�пешно удалено."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Избранные дополнени�"
 
@@ -2657,38 +4661,41 @@ msgstr ""
 "Эти фильтры будут дей�твовать до конца �еан�а или пока не будут удалены."
 
 # %1 is the queue mode
+#. %1 is the queue mode
 #: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "В на�то�щее врем� нет дополнений данного типа дл� рецензировани�."
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 день"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 ча�"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 минута"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Панель управлени� рецензента"
 
-#: controllers/editors_controller.php:286
+#. %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 "Только дл� %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Предварительный выпу�к"
 
 # %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2702,21 +4709,26 @@ msgstr "Очи�тить"
 msgid "editors_queue_submit_filter"
 msgstr "Фильтр"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "В на�то�щее врем� в�е очереди рецензий заблокированы. Попробуйте вернуть�� и "
 "проверить позднее."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Рецензировать"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Поме�тить в общий до�туп"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Запро� �уперрецензии"
 
@@ -2724,32 +4736,40 @@ msgstr "Запро� �уперрецензии"
 msgid "editors_review_action_sandbox"
 msgstr "Вернуть в «пе�очницу»"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Про�мотреть комментарии"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "Отметить дополнение и его предыдущие вер�ии и файлы как общедо�тупные. "
 "Будущие вер�ии будут попадать в «пе�очницу», пока они не будут "
 "отрецензированы редактором."
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "О�тавить дополнение в «пе�очнице»."
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Одобрить данную вер�ию дополнени� из «пе�очницы» дл� размещени� в общем "
 "до�тупе."
 
-#: views/editors/review.thtml:162
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "О�тавить данную вер�ию общедо�тупного дополнени� в «пе�очнице»."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Е�ли у ва� е�ть опа�ени� на�чет безопа�но�ти �того дополнени�, проблем � "
@@ -2777,15 +4797,15 @@ msgstr "Категории:"
 msgid "editors_review_header_compatibility"
 msgstr "Совме�тимо �:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Опи�ание"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Комментарии разработчика"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "Лицензионное �оглашение конечного пользовател� (EULA)"
 
@@ -2793,85 +4813,112 @@ msgstr "Лицензионное Ñ�оглашение конечного полÑ
 msgid "editors_review_header_files"
 msgstr "Файлы:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "И�тори� �ообщений"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Сообщение о номинации"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Иллю�трации"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Рецензирование %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Заметки рецензенту"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "�ннотаци�"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Примечани� к вер�ии"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "Рецензи� админи�тратора"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "�оминаци� одобрена/В общий до�туп"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "�оминаци� отклонена/В «пе�очницу»"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "�е найдено ни одной предыдущей рецензии."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Рецензи� админи�тратора"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Одобрить/В общий до�туп"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Отклонить/В «пе�очницу»"
 
-#: views/editors/review.thtml:198
+#. 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 "Приложени�:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "или выберите ответ из �тандартных:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Комментарии:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Операционные �и�темы:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "�аверх"
 
@@ -2879,7 +4926,7 @@ msgstr "�аверх"
 msgid "editors_review_next_link"
 msgstr "�лед. &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Рецензии не найдены."
 
@@ -2887,41 +4934,49 @@ msgstr "Рецензии не найдены."
 msgid "editors_review_previous_link"
 msgstr "&laquo; пред."
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s-й</strong> из %2$s в очереди"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Ход дей�тви�"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Дей�твие"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Комментарии"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Дата"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Рецензент"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Вер�и�/Файл"
 
-#: controllers/editors_controller.php:411
+#: 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 "Рецензи� у�пешно обработана."
 
@@ -2945,7 +5000,7 @@ msgstr "Дей�твие"
 msgid "editors_reviews_in_reply_to"
 msgstr "В ответ на:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Рецензии у�пешно обработаны!"
 
@@ -2957,23 +5012,31 @@ msgstr "В на�то�щее врем� нет рецензий дл� моде
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Обработать рецензии"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Дл� определённого �айта"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "�овое"
 
-#: controllers/editors_controller.php:229
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Обновлено"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Проверенные приложени�"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Проверенные операционные �и�темы"
 
@@ -3014,17 +5077,20 @@ msgstr "Платформы"
 msgid "editors_th_submissiontypes"
 msgstr "Типы публикации"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s дн�(ей)"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ча�а(ов)"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s минут(ы)"
@@ -3033,8 +5099,8 @@ msgstr "%s минут(ы)"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "В до�тупе отказано"
 
@@ -3042,12 +5108,13 @@ msgstr "В до�тупе отказано"
 msgid "error_access_denied_message"
 msgstr "У ва� недо�таточно прав дл� про�мотра �той �траницы."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3057,18 +5124,19 @@ msgstr "У ва� недо�таточно прав дл� про�мотра �
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Дополнение не найдено!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Дополнение нельз� про�мотреть через интерфей� �МО."
 
@@ -3076,7 +5144,7 @@ msgstr "Дополнение нельз� про�мотреть через ин
 msgid "error_addon_selfreview"
 msgstr "Вы не можете дать отзыв на �воё �об�твенное дополнение."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "В �той категории дополнени� от�ут�твуют!"
 
@@ -3098,24 +5166,25 @@ msgstr "Это неправильный адре� �лектронной поч
 msgid "error_field_required"
 msgstr "Это поле не может быть пу�тым."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Файл не найден!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Ошибка: файл %s не �уще�твует."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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 "В �той форме имеют�� ошибки. И�правьте их и повторите попытку."
@@ -3132,16 +5201,18 @@ 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3159,7 +5230,7 @@ msgstr "Предупреждение"
 msgid "error_preview_notfound"
 msgstr "Иллю�траци� не найдена!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Вы должны выбрать рейтинг."
 
@@ -3213,8 +5284,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "�еверный логин или пароль!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Вер�и� не найдена!"
 
@@ -3227,12 +5298,14 @@ msgid "feature_learnmore"
 msgstr "Узнать больше"
 
 # %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Узнать больше о %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3245,6 +5318,45 @@ msgstr[2] "%1$s отзывов"
 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "В�е права защищены."
@@ -3281,7 +5393,7 @@ msgstr "Другие �зыки:"
 msgid "footer_privacy_policy"
 msgstr "Политика конфиденциально�ти"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Сохранить"
 
@@ -3290,6 +5402,7 @@ 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Словари"
@@ -3299,6 +5412,7 @@ 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Ра�ширени�"
@@ -3308,6 +5422,7 @@ 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Локализации (Дополнений)"
@@ -3317,6 +5432,7 @@ 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Локализации (Приложений)"
@@ -3326,6 +5442,7 @@ 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Плагины"
@@ -3335,6 +5452,7 @@ 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:111
 msgid "general_addontype_search_plural"
 msgstr "Пои�ковые движки"
@@ -3344,10 +5462,12 @@ 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Темы"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3378,12 +5498,12 @@ msgid "header_navlink_addons"
 msgstr "Дополнени�"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Выйти"
 
@@ -3391,14 +5511,15 @@ msgstr "Выйти"
 msgid "header_navlink_myaccount"
 msgstr "Мо� учётна� запи�ь"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Реги�траци�"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
@@ -3406,24 +5527,30 @@ 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/install.thtml:229
 msgid "install_a_login_to_install"
 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/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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3446,7 +5573,7 @@ msgid "langtools_download_langpack"
 msgstr "Загрузить локализацию"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Словари и локализации"
 
@@ -3502,7 +5629,7 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3536,6 +5663,7 @@ 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:214
 msgid "other_users"
 msgstr "другие"
@@ -3548,36 +5676,45 @@ msgstr "Вер�ии приложени�"
 msgid "page_title_credits"
 msgstr "Благодарно�ти"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Эк�периментальные дополнени�"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "FAQ �айта «Прокачай �вой Firefox»"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Политика дополнений"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Политика приватно�ти Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Чем �ледует руковод�твовать�� при �о�тавлении рецензии"
 
-#: controllers/pages_controller.php:109
+# %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 ""
+"Дополнение, которое вы ищете, находит�� в данный момент в «пе�очнице». Е�ли у "
+"ва� уже е�ть учётна� запи�ь на Mozilla Add-ons, пожалуй�та войдите в �и�тему "
+"или <a href=\"%1$s\">почитайте больше о «пе�очнице»</a>."
+
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Си�тема рецензировани� «пе�очницы»"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Помощь при отправке"
 
@@ -3596,6 +5733,7 @@ msgstr ""
 "rdf. Причём в �том файле должна при�ут�твовать запи�ь хот� бы об одном из "
 "приложений, перечи�ленных ниже. Допу�кают�� только перечи�ленные вер�ии."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3604,6 +5742,8 @@ 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:92
 msgid "pages_appversions_required_files_link"
 msgstr "зде�ь"
@@ -3612,7 +5752,6 @@ msgstr "зде�ь"
 msgid "pages_appversions_versions"
 msgstr "Вер�ии"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Вернуть�� на предыдущую �траницу"
 
@@ -3625,6 +5764,7 @@ 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"
@@ -3650,6 +5790,8 @@ 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 ""
@@ -3658,6 +5800,8 @@ msgstr ""
 
 # %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
 msgid "recaptcha_hardtoread_text"
 msgstr ""
@@ -3673,7 +5817,7 @@ msgstr "Вы человек?"
 msgid "recaptcha_whatsthis"
 msgstr "Что �то?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Ошибка при пометке �того отзыва!"
 
@@ -3700,7 +5844,7 @@ msgid "review_flag_reason_spam"
 msgstr "Спам или другое не�оответ�твующее �одержимое"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Спа�ибо; �тот отзыв помечен и будет ра��мотрен редактором."
 
@@ -3715,6 +5859,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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3735,21 +5880,22 @@ msgstr ""
 "пользователей о дополнени�х, пожалуй�та прочтите <a href=\"%2$s\">Советы по "
 "о�тавлению отзывов</a>.</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 "Отзывы о %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Попул�рные дополнени�"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "�овейшие дополнени�"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Обновлённые дополнени�"
 
@@ -3774,6 +5920,11 @@ msgstr "Пои�к дополнений"
 msgid "search_form_tooltip"
 msgstr "Щёлкните, чтобы вве�ти запро� на пои�к"
 
+#~ msgid "addons_display_sandbox_pref_warning"
+#~ msgstr ""
+#~ "Дополнение, которое вы ищете, находит�� в «пе�очнице», котора� не включена "
+#~ "в ваших на�тройках."
+
 #: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "�реди"
@@ -3786,6 +5937,7 @@ msgstr "В�е пои�ковые плагины"
 msgid "search_landing_browse_search_engines"
 msgstr "Обзор пои�ковых плагинов"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3806,12 +5958,13 @@ msgstr "Пои�к дополнений"
 msgid "search_rss_description"
 msgstr "Выдача результатов пои�ка"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Результаты пои�ка: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Ин�трументы дл� админи�трировани�"
 
@@ -3819,7 +5972,7 @@ msgstr "Ин�трументы дл� админи�трировани�"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Ин�трументы разработчика"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Ин�трументы дл� редактировани�"
 
@@ -3827,6 +5980,7 @@ msgstr "Ин�трументы дл� редактировани�"
 msgid "sidebar_navlink_welcome"
 msgstr "Добро пожаловать"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3864,6 +6018,7 @@ msgstr "Тему"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Обновлённые дополнени�"
 
+#. %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
@@ -3876,6 +6031,7 @@ 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3893,24 +6049,32 @@ msgstr "Ин�трументы разработчика"
 msgid "statistics_addon_switch"
 msgstr "Сменить дополнение"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "%d.%m."
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "%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:147 views/statistics/addon.thtml:158
+#: 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3952,7 +6116,7 @@ msgstr "Панель �тати�тики"
 msgid "statistics_index_view_button"
 msgstr "Про�мотреть �тати�тику"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
@@ -3970,7 +6134,7 @@ msgstr "Удалить �ту диаграмму"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
@@ -3980,103 +6144,108 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "В диапазоне найдено %s штук"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Добавить график"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Добавить ещё один график к �той диаграмме"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Скрыть общее кол-во"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Показать общее кол-во"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "�ане�ти общее кол-во на �ту диаграмму"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Про�мотр данных (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Получить файл � разделёнными зап�тыми данными (CSV)"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Скрыть %s �обытий"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Показать %s �обытий"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "�ане�ти даты релизов дополнени� на графики"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Скрыть �обыти� Firefox"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Показать �обыти� Firefox"
 
-#: controllers/statistics_controller.php:241
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "�ане�ти даты релизов Firefox на графики"
 
-#: controllers/statistics_controller.php:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Свернуть диаграмму"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Развернуть диаграмму"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Изменить размер диаграммы"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "�ктивных ежедневных пользователей"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Приложение"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "�а�троить"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Загрузки"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Операционна� �и�тема"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Стату� дополнени�"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Сводка"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Вер�и� дополнени�"
 
@@ -4100,13 +6269,13 @@ msgstr "�еизве�тно"
 msgid "statistics_longnames_version"
 msgstr "Вер�и� дополнени�"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "Дл� отображени� �той диаграммы пока ещё не хватает данных. Пожалуй�та "
 "верните�ь попозже. "
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "У на� пока нет никаких данных дл� вашего дополнени�. Пожалуй�та верните�ь "
@@ -4119,12 +6288,12 @@ msgstr ""
 "данные могут быть неполны, так как наши �крипты обновл�ют �ту информацию. "
 "Пожалуй�та верните�ь через не�колько минут. "
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr ""
 "Панель �тати�тики в данное врем� отключена. Пожалуй�та верните�ь попозже. "
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "Дл� про�мотра диаграмм панели �тати�тики требует�� JavaScript."
 
@@ -4139,36 +6308,36 @@ msgstr "Ваши на�тройки были обновлены!"
 msgid "statistics_pagetitle"
 msgstr "Панель �тати�тики"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "�ктивных пользователей в день"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Загрузок в день"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Скрыть"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Скрыть один ме��ц"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Показать"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Показать ещё один ме��ц"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Ежедневна� �водка �тати�тики дл� %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "RSS-канал �водки данных"
 
@@ -4208,23 +6377,23 @@ msgstr "Публичный"
 msgid "statistics_settings_access_public_description"
 msgstr "Любой может про�матривать �тати�тику �того дополнени�"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Изменить на�тройки"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Пожалуй�та обращайте�ь � �той информацией как � конфиденциальной."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Эта панель в данный момент <b>приватна�</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Эта панель в данный момент <b>публична�</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Заблокированы"
 
@@ -4241,7 +6410,7 @@ msgstr "Сохранить на�тройки"
 msgid "statistics_settings_title"
 msgstr "�а�тройки панели �тати�тики дл� %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "�езаблокированы"
 
@@ -4265,7 +6434,7 @@ msgstr "�еизв."
 msgid "statistics_shortnames_version"
 msgstr "Вер."
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Среднее кол-во загрузок за день"
 
@@ -4273,37 +6442,37 @@ msgstr "Среднее кол-во загрузок за день"
 msgid "statistics_summary_downloads_heading"
 msgstr "Загрузки"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Данных ещё нет"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s в %2$s"
@@ -4312,17 +6481,17 @@ msgstr "%1$s в %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "�ктивных пользователей в день"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: 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:147
+#: 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:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Стати�тика %1$s"
@@ -4348,6 +6517,7 @@ 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:49
 msgid "user_del_account_deleted"
 msgstr ""
@@ -4368,6 +6538,7 @@ 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:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4377,6 +6548,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:69
 msgid "user_del_error_addons_more_questions"
 msgstr "Е�ли у ва� имеют�� дополнительные вопро�ы, обратите�ь в %1$s."
@@ -4391,6 +6563,7 @@ 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:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4403,6 +6576,7 @@ 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:93
 msgid "user_del_header_delete_account"
 msgstr "Удаление учётной запи�и %1$s"
@@ -4428,6 +6602,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:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4444,6 +6619,7 @@ msgid "user_deleted_nickname"
 msgstr "Удалённый пользователь"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4459,6 +6635,9 @@ 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4479,6 +6658,7 @@ msgstr ""
 "-- �дмини�траци� %2$s Add-ons"
 
 # %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4505,6 +6685,8 @@ msgstr "Благодарим за реги�трацию на %s Add-ons"
 
 # 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
 #, php-format
 msgid "user_email_pwreset"
@@ -4532,6 +6714,7 @@ msgid "user_emailchange_error"
 msgstr "Ошибка!"
 
 # %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4544,6 +6727,7 @@ msgid "user_emailchange_success"
 msgstr "У�пех!"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4715,6 +6899,7 @@ 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"
@@ -4724,6 +6909,7 @@ msgstr ""
 "активировать её, пройд� по ��ылке, указанной в пи�ьме."
 
 # %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4741,6 +6927,7 @@ msgid "user_register_congratulations"
 msgstr "Поздравл�ем! Ваша учётна� запи�ь у�пешно �оздана."
 
 # %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"
@@ -4750,6 +6937,7 @@ 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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4810,6 +6998,7 @@ msgid "users_info_pagetitle"
 msgstr "Информаци� о пользователе %1$s"
 
 # %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Отзывы от %s"
@@ -4820,6 +7009,8 @@ 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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4830,6 +7021,8 @@ msgstr ""
 
 # %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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4846,6 +7039,36 @@ msgstr "Сбро� парол� пользовател�"
 msgid "users_register_pagetitle"
 msgstr "Реги�траци� нового пользовател�"
 
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Сама� по�ледн�� вер�и� �овме�тима �"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "this page"
+#~ msgstr "�та �траница"
+
 # %1 is the app name, %2 is the platform in parentheses
 #~ msgid "a_addto_app"
 #~ msgstr "Добавить в %s %s"
diff --git a/site/app/locale/sk/LC_MESSAGES/messages.po b/site/app/locale/sk/LC_MESSAGES/messages.po
index 04affd0..5e935ba 100644
--- a/site/app/locale/sk/LC_MESSAGES/messages.po
+++ b/site/app/locale/sk/LC_MESSAGES/messages.po
@@ -7,8 +7,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-02-14 10:28+0100\n"
-"Last-Translator: wladow\n"
+"PO-Revision-Date: 2009-03-19 13:49+0100\n"
+"Last-Translator: wladow <info@wladow.sk>\n"
 "Language-Team: SLOVAK <l10n@mozilla.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,10 @@ msgstr ""
 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 parenthesis are included in the string. :(
 #: views/elements/install.thtml:69
 #: views/elements/install.thtml:185
 #: views/elements/install.thtml:199
@@ -58,44 +62,41 @@ msgstr "Verejné"
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "Pridané %s"
-
-#: views/elements/addon_listitem.thtml:145
+#. %s is a date in the _('date') format
+#: views/elements/addon_listitem.thtml:138
 #: views/elements/feature.thtml:111
-#: views/addons/display.thtml:103
+#: 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/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Verzia %s"
 
-#: views/elements/addon_listitem.thtml:136
+#: views/elements/addon_listitem.thtml:129
 #: views/elements/feature.thtml:103
-#: views/addons/display.thtml:115
+#: views/addons/display.thtml:139
 #: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "prevzatí"
 
-#: views/addons/display.thtml:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "prevzatí spolu"
 
-#: views/elements/addon_listitem.thtml:136
+#: views/elements/addon_listitem.thtml:129
 #: views/elements/feature.thtml:103
-#: views/addons/display.thtml:114
-#: views/addons/display.thtml:118
+#: 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:118
 #: views/addons/browse.thtml:75
 #, php-format
@@ -114,7 +115,7 @@ msgstr "na stránku"
 msgid "addon_list_sortby"
 msgstr "Zoradiť podľa:"
 
-#: views/elements/addon_listitem.thtml:69
+#: views/elements/addon_listitem.thtml:68
 #: views/elements/feature.thtml:89
 #: views/addons/display.thtml:51
 #: views/addons/browse_thumbs.thtml:67
@@ -122,17 +123,19 @@ msgstr "Zoradiť podľa:"
 msgid "addon_listitem_flag_experimental"
 msgstr "experimentálne"
 
-#: views/elements/addon_listitem.thtml:72
+#: 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: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:108
 #: views/addons/previews.thtml:60
 #: views/addons/versions.thtml:113
@@ -142,15 +145,16 @@ msgstr "Doplnok %1$s nie je pre platformu %2$s k dispozícii"
 #: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
-msgstr "Späť na %1$s..."
+msgstr "Späť na %1$s…"
 
 # %1 is the addon name
+#. %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 "Späť na recenzie..."
+msgstr "Späť na recenzie…"
 
 #: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
@@ -164,6 +168,7 @@ msgstr "Recenzia:"
 msgid "addon_review_add_submit"
 msgstr "Odoslať recenziu"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -198,20 +203,23 @@ msgstr "�no"
 msgid "addon_review_delete_header"
 msgstr "Odstrániť recenziu"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Recenzia úspešne odstránená."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Upraviť recenziu doplnku %s"
 
 # %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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."
 
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr "Nezabudnite: pred publikovaním na verejnej stránke bude recenzia moderovaná editorom."
@@ -221,6 +229,7 @@ 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:135
 #, php-format
 msgid "addon_review_others_by_user"
@@ -230,15 +239,17 @@ msgstr[1] "Pozrite si �alšie %1$s recenzie používateľa %2$s k tomuto doplnk
 msgstr[2] "Pozrite si �alších %1$s recenzií používateľa %2$s k tomuto doplnku."
 
 # %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -252,8 +263,8 @@ msgstr "Odpove� vývojára:"
 msgid "addon_review_saved_successfully"
 msgstr "Recenzia úspešne uložená. Ďakujeme!"
 
-#: views/addons/display.thtml:285
-#: views/addons/display.thtml:288
+#: views/addons/display.thtml:309
+#: views/addons/display.thtml:312
 #: views/reviews/display.thtml:72
 #: views/reviews/display.thtml:75
 #, php-format
@@ -261,6 +272,7 @@ 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:77
@@ -287,12 +299,15 @@ msgstr "Predchádzajúci doplnok"
 msgid "addon_version_permalink"
 msgstr "Permanentný odkaz na túto verziu"
 
-#: views/addons/versions.thtml:123
-#: views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "Posledná verzia je kompatibilná s aplikáciou"
+# %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:118
+msgid "addon_versions_getlatestversion"
+msgstr "Posledná verzia kompatibilná s %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Prejsť"
 
@@ -302,18 +317,22 @@ msgid "addons_author_tooltip"
 msgstr "Zobraziť profil autora"
 
 # %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "Prehľadávať všetky témy :: Doplnky pre %1$s"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Prehľadávať %s"
 
 # %1 is the name of the theme category (eg. Modern)
 # %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "Prehľadávať témy z kategórie %1$s :: Doplnky pre %2$s"
 
@@ -321,7 +340,7 @@ msgstr "Prehľadávať témy z kategórie %1$s :: Doplnky pre %2$s"
 msgid "addons_display_add_review"
 msgstr "Pridať recenziu"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Ďalšie podrobnosti"
 
@@ -329,11 +348,11 @@ msgstr "Ďalšie podrobnosti"
 msgid "addons_display_categories"
 msgstr "Kategórie"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "podrobná recenzia"
 
-#: views/addons/display.thtml:368
+#: views/addons/display.thtml:392
 #: views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
@@ -343,145 +362,160 @@ msgstr "Nepá�i sa"
 msgid "addons_display_edit_review"
 msgstr "Upraviť recenziu"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Doplnok obsahuje zásady ochrany súkromia"
 
-#: views/addons/display.thtml:367
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Komentáre vývojára"
 
-#: views/addons/display.thtml:208
-#: views/addons/display.thtml:211
+#: views/addons/display.thtml:232
+#: views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Domovská stránka"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Recenzie"
 
-#: views/addons/display.thtml:225
-#: views/addons/display.thtml:228
+#: views/addons/display.thtml:249
+#: views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Podpora"
 
-#: views/addons/display.thtml:369
+#: views/addons/display.thtml:393
 #: views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Pá�i sa"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Dlhý popis"
 
-#: views/addons/display.thtml:371
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Ďalšie 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:421
+#. %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] "Ďalšie doplnky od %1$s"
 msgstr[1] "Ďalšie doplnky od týchto autorov"
-
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+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:147
+#: controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Podporu pre tento doplnok poskytuje autor na e-mailovej adrese %s."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr "Podporu pre tento doplnok poskytuje autor na adresách %s alebo %s."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Hodnotenie"
 
-#: views/addons/display.thtml:370
+#: 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:387
-#: views/addons/display.thtml:390
+#: 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."
 
 # %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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
-#: views/addons/display.thtml:396
-#: views/addons/display.thtml:400
+#. %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 "Informácie o asistencii k tomuto doplnku nájdete v <a href=\"%1$s\">sekcii podpory</a>."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Uložiť"
 
-#: views/addons/display.thtml:415
+#: 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
-#: views/addons/display.thtml:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Zobraziť všetky recenzie (%1$s)"
 
-#: views/addons/display.thtml:195
-#: views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Úplná história verzií"
 
-#: views/addons/display.thtml:335
+#: views/addons/display.thtml:359
 #: views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Zobraziť zdroj"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Zobraziť štatistiku"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Čo si myslíte?"
 
@@ -491,7 +525,7 @@ msgstr "Ur�ené pre:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129
+#: views/elements/addon_listitem.thtml:122
 #: views/elements/feature.thtml:95
 #: views/addons/policy.thtml:62
 #: views/addons/display.thtml:68
@@ -507,13 +541,13 @@ msgid "addons_home_feature_head"
 msgstr "Odporú�ame"
 
 #: controllers/search_controller.php:211
-#: controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254
-#: controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528
-#: controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897
-#: controllers/addons_controller.php:953
+#: controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383
+#: controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657
+#: controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, 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."
@@ -526,7 +560,9 @@ msgstr "Najnovšie:"
 msgid "addons_home_other_applications"
 msgstr "Ďalšie programy"
 
-#: controllers/developers_controller.php:64
+#. %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:610
@@ -541,25 +577,26 @@ msgstr "Ďalšie programy"
 #: controllers/users_controller.php:698
 #: controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
-#: controllers/reviews_controller.php:345
-#: controllers/reviews_controller.php:424
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
 #: controllers/search_controller.php:178
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214
-#: controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530
-#: controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689
-#: controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776
-#: controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58
-#: controllers/pages_controller.php:123
+#: controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283
+#: controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516
+#: controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803
+#: controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885
+#: controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -617,7 +654,7 @@ msgstr "Ako nainštalovať do Sunbirdu"
 
 #: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
-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>"
+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/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
@@ -655,6 +692,7 @@ msgstr "pre Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "pre Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -668,13 +706,14 @@ msgstr "Hľadáte zásuvný modul, ktorý tu nie je uvedený?"
 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é."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Najpoužívanejšie zásuvné moduly pre %1$s"
 
 #: controllers/components/amo.php:724
-#: controllers/addons_controller.php:776
+#: controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Zásuvné moduly"
 
@@ -688,28 +727,30 @@ msgstr "Zásuvné moduly"
 msgid "addons_plugins_support_documentation"
 msgstr "Dokumentácia podpory: "
 
+#. %s is the name of the add-on
 #: 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:"
 
 # %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Ukážky %s"
 
 #: views/addons/recommended.thtml:50
-#: controllers/addons_controller.php:1018
+#: controllers/addons_controller.php:1147
 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!"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Odporú�ané doplnky"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Odporú�ané doplnky"
 
@@ -719,6 +760,7 @@ msgid "addons_searchengines_additional_resources"
 msgstr "Ďalšie zdroje"
 
 # link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153
 #: views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
@@ -734,6 +776,8 @@ msgstr "Na inštaláciu vyhľadávacích modulov je potrebný JavaScript, ale zd
 
 # %1 is "make your own" link
 # %2 is MDC link
+#. %1 is "make your own" link
+#. %2 is MDC link
 #: views/addons/searchengines.thtml:150
 #: views/addons/searchengines.thtml:167
 #, php-format
@@ -741,18 +785,21 @@ 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: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: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:148
 #: views/addons/searchengines.thtml:166
 #, php-format
@@ -760,13 +807,14 @@ 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:149
 #: views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755
-#: controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884
+#: controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Vyhľadávacie moduly"
 
@@ -781,6 +829,7 @@ msgid "addons_status_disabled"
 msgstr "zakázaný"
 
 #: controllers/components/amo.php:191
+#: controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "nekompletná verzia"
 
@@ -789,16 +838,19 @@ msgstr "nekompletná verzia"
 msgid "addons_status_nominated"
 msgstr "v sandboxe, nominovaný na uverejnenie"
 
+#: views/pages/js_constants.js.thtml:70
 #: 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:68
 #: controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "uverejnený"
 
+#: views/pages/js_constants.js.thtml:69
 #: controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
@@ -822,11 +874,12 @@ 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."
 
 #: views/addons/versions.thtml:50
-#: controllers/addons_controller.php:1184
+#: controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "História verzií s denníkmi zmien"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "História verzií %1$s"
@@ -839,6 +892,7 @@ msgstr "Pridať skupinu"
 msgid "admin_group_delete_pagetitle"
 msgstr "Odstrániť skupinu"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -967,14 +1021,18 @@ msgstr "Ignorovať kontrolu verzie"
 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: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>."
 
+#. %1$s is a URL
 #: 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:64
 msgid "app_compat_unreleased_version"
 msgstr "Tento doplnok vyžaduje zatiaľ neuvoľnený <a href=\"%1$s\">Firefox %2$s</a>"
@@ -983,23 +1041,23 @@ msgstr "Tento doplnok vyžaduje zatiaľ neuvoľnený <a href=\"%1$s\">Firefox %2
 msgid "app_compat_update_firefox"
 msgstr "Aby ste mohli používať tento doplnok, musíte <a href=\"http://getfirefox.com\">aktualizovať Firefox</a>"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Doplnky podľa názvu"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Najnovšie doplnky"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Populárne doplnky"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Doplnky podľa hodnotenia"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Naposledy aktualizované doplnky"
 
@@ -1033,6 +1091,7 @@ msgid "category_extra_mostpopular"
 msgstr "Najprv najobľúbenejšie"
 
 # %1 is the category name
+#. %1$s is the category name
 #: views/addons/searchengines.thtml:135
 #: views/addons/category_landing.thtml:51
 #, php-format
@@ -1043,18 +1102,26 @@ msgstr "Zobraziť všetky %1$s"
 msgid "collection_not_found"
 msgstr "Kolekcia nebola nájdená!"
 
+#. %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"
+
 #: 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: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."
 
 #: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
-msgstr "Na�ítavajú sa údaje..."
+msgstr "Na�ítavajú sa údaje…"
 
 #: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
@@ -1079,6 +1146,8 @@ msgstr "Zvýšiť hodnotu maxVersion bez odoslania novej verzie"
 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: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."
@@ -1098,8 +1167,12 @@ msgstr "Výsledky kontroly stavu doplnku"
 
 #: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
-msgstr "Zisťuje sa stav vašich doplnkov..."
+msgstr "Zisťuje sa stav vašich doplnkov…"
 
+#. %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 používateľov v aplikácii %2$s (%3$s&#37; zo všetkých)"
@@ -1112,6 +1185,8 @@ msgstr "Doplnky uvedené nižšie tvoria podľa údajov Mozilly 95% všetkých p
 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: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."
@@ -1120,6 +1195,7 @@ msgstr "Z %1$s doplnkov, ktoré podľa údajov Mozilly tvoria 95&#37; všetkých
 msgid "compatibility_report_legend_alpha"
 msgstr "Verzie alpha"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Doplnky kompatibilné s verziou alpha aplikácie %1$s"
@@ -1128,6 +1204,7 @@ msgstr "Doplnky kompatibilné s verziou alpha aplikácie %1$s"
 msgid "compatibility_report_legend_beta"
 msgstr "Verzia beta"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "Doplnky kompatibilné s verziou beta/RC aplikácie %1$s"
@@ -1136,6 +1213,7 @@ msgstr "Doplnky kompatibilné s verziou beta/RC aplikácie %1$s"
 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:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Doplnky kompatibilné s najnovšou verziou aplikácie %1$s"
@@ -1144,6 +1222,7 @@ msgstr "Doplnky kompatibilné s najnovšou verziou aplikácie %1$s"
 msgid "compatibility_report_legend_other"
 msgstr "Iné verzie"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Doplnok nie je kompatibilný zo žiadnou verziou aplikácie %1$s"
@@ -1162,12 +1241,13 @@ msgstr "Informácie pre používateľov doplnkov"
 msgid "compatibility_view_report"
 msgstr "Zobraziť správu o kompatibilite"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: 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:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "stránke Wiki"
 
@@ -1203,12 +1283,17 @@ msgstr "Softvér a obrázky"
 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>."
 
+#: 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>."
+
 # 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/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147
+#: views/elements/addon_listitem.thtml:140
 #: views/elements/feature.thtml:112
 #: views/users/info.thtml:70
 #: views/editors/reviews_queue.thtml:57
@@ -1218,9 +1303,9 @@ msgstr "Niektoré použité ikony pochádzajú zo <a href=\"http://www.famfamfam
 #: 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:286
-#: views/addons/display.thtml:290
+#: 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
@@ -1232,7 +1317,11 @@ msgid "date"
 msgstr "%e. %B %Y"
 
 # date and time format string (strftime)
+#. 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"
@@ -1258,14 +1347,38 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+msgid "devcp_add_previews_success_upload"
+msgstr "Súbor %s bol úspešne odoslaný. Môžete zadať jeho popis."
+
 #: controllers/components/developers.php:1163
 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"
@@ -1307,36 +1420,36 @@ msgstr "5. krok: Úspešné"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Pomocník k odoslaniu"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Doplnok úspešne zakázaný"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Upraviť doplnok"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Doplnok úspešne povolený"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Popis doplnku"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "Licen�ná zmluva"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: 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:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Názov doplnku"
 
@@ -1345,40 +1458,218 @@ msgstr "Názov doplnku"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Nadpis ukážky"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: 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:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Súhrn doplnku"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "E-mail na podporu"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "Adresa URL na podporu"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: 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:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Nominovať doplnok"
 
-#: controllers/developers_controller.php:2729
+#: 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: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í."
+
+#: views/developers/addon_status.thtml:136
+msgid "devcp_addon_status_action_complete"
+msgstr "Dokon�iť doplnok"
+
+#: 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:182
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Nastaviť ako neaktívne"
+
+#: 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í."
+
+#: views/developers/addon_status.thtml:144
+msgid "devcp_addon_status_action_move"
+msgstr "Presunúť do Sandboxu"
+
+#: 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:140
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominovať na verejný"
+
+#: views/developers/addon_status.thtml:141
+msgid "devcp_addon_status_action_nominate_description"
+msgstr "Nominovať doplnok na uverejnenie"
+
+#: views/developers/addon_status.thtml:148
+msgid "devcp_addon_status_action_public"
+msgstr "Uverejniť"
+
+#: views/developers/addon_status.thtml:149
+msgid "devcp_addon_status_action_public_description"
+msgstr "Nastaví váš doplnok ako verejný."
+
+#: 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."
+
+#: 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á."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+msgid "devcp_addon_status_criteria_category"
+msgstr "Zvoľte aspoň jednu kategóriu"
+
+#: views/developers/addon_status.thtml:101
+msgid "devcp_addon_status_criteria_description"
+msgstr "Vyžadovaný popis doplnku"
+
+#: views/developers/addon_status.thtml:99
+msgid "devcp_addon_status_criteria_name"
+msgstr "Vyžadovaný názov doplnku"
+
+#: views/developers/addon_status.thtml:121
+msgid "devcp_addon_status_criteria_prerelease"
+msgstr "Doplnok nie je ozna�ený ako pred-vydanie."
+
+#: views/developers/addon_status.thtml:119
+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"
+
+#. %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 doplnku: %s"
+
+#: views/developers/addon_status.thtml:153
+msgid "devcp_addon_status_header_actions"
+msgstr "Dostupné akcie"
+
+#: views/developers/addon_status.thtml:169
+msgid "devcp_addon_status_header_active"
+msgstr "Stav aktivovania: <span class=\"inactive-0\">aktívny</span>"
+
+#: views/developers/addon_status.thtml:97
+msgid "devcp_addon_status_header_criteria"
+msgstr "Kritéria pre dokon�enie doplnku"
+
+#: views/developers/addon_status.thtml:165
+msgid "devcp_addon_status_header_inactive"
+msgstr "Stav aktivovania: <span class=\"inactive-1\">neaktívny</span>"
+
+#: views/developers/addon_status.thtml:117
+msgid "devcp_addon_status_header_nomination"
+msgstr "Kritériá pre nomináciu doplnku na verejný"
+
+#: 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: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ávislo na svojom stave. Aktualizácie <b>nie sú</b> prostredníctvom aktualiza�nej služby poskytované."
+
+#: 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á."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:64
+msgid "devcp_addon_status_public"
+msgstr "Verejné"
+
+#: views/developers/addon_status.thtml:63
+msgid "devcp_addon_status_sandbox"
+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."
+
+#: 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>."
+
+#. %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)."
+
+#. %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."
+
+#: 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."
+
+#: 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."
+
+#. %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 doplnku %s"
+
+#: 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."
+
 # %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"
@@ -1397,6 +1688,7 @@ 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"
@@ -1407,6 +1699,7 @@ 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"
@@ -1424,16 +1717,17 @@ msgstr "Odoslanie doplnku bolo úspešne dokon�ené."
 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:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Odoslať doplnok"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1444,6 +1738,7 @@ 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"
@@ -1478,10 +1773,82 @@ msgstr "ÄŽalej"
 msgid "devcp_change_addontype"
 msgstr "Zmeniť typ doplnku:"
 
-#: controllers/developers_controller.php:1402
+#: 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"
+msgstr "aktívny"
+
+#. %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 doplnku: %1$s, stav doplnku: %2$s a %3$s"
+
+#: views/developers/dashboard.thtml:67
+msgid "devcp_dashboard_change_status"
+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."
+
+#. %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 doplnku: %s"
+
+#: views/developers/dashboard.thtml:43
+msgid "devcp_dashboard_header_main"
+msgstr "Ovládací panel vývojára"
+
+#: views/developers/dashboard.thtml:110
+msgid "devcp_dashboard_header_welcome"
+msgstr "Víta vás Ovládací panel vývojára"
+
+#: views/developers/dashboard.thtml:68
+msgid "devcp_dashboard_inactive"
+msgstr "neaktívny"
+
+#. %s is a date in the _('date') format
+#: views/developers/dashboard.thtml:65
+msgid "devcp_dashboard_last_edited"
+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."
+
+#: views/developers/dashboard.thtml:112
+msgid "devcp_dashboard_start"
+msgstr "Za�íname"
+
+#: views/developers/dashboard.thtml:82
+msgid "devcp_dashboard_versions"
+msgstr "Verzia a súbory"
+
+#: views/developers/dashboard.thtml:91
+msgid "devcp_dashboard_versions_new"
+msgstr "Odoslať novú verziu"
+
+#. %s is the preview ID number.
+#: 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:1340
+msgid "devcp_delete_previews_success"
+msgstr "Ukážka %s bola úspešne odstránená."
+
+#: controllers/developers_controller.php:1032
+msgid "devcp_delete_version_priv_error"
+msgstr "Nemáte oprávnenie na odstránenie súborov alebo verzií."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Pridať ukážku"
@@ -1574,6 +1941,7 @@ msgstr "Vývojár neposkytol žiadnu adresu URL na podporu"
 msgid "devcp_details_trusted"
 msgstr "Dôveryhodné"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84
 #: views/developers/versions.thtml:65
 #, php-format
@@ -1600,6 +1968,7 @@ msgstr "Naozaj chcete doplnok zakázať?"
 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"
@@ -1617,11 +1986,53 @@ msgstr "Naozaj chcete doplnok povoliť?"
 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�"
+
+#: views/developers/discuss.thtml:57
+msgid "devcp_discuss_allreplies_header"
+msgstr "Odpovede"
+
+#. 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 "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."
+
+#. %1 is the add-on name
+#: views/developers/discuss.thtml:43
+msgid "devcp_discuss_pagetitle"
+msgstr "Poskytnúť viac informácií pre recenziu doplnku %1$s"
+
+#. submit button text
+#: views/developers/discuss.thtml:79
+msgid "devcp_discuss_submit_reply"
+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."
+
+#. 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 "napísal %1$s dňa %2$s"
+
 #: views/developers/edit.thtml:65
 #: views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
@@ -1635,10 +2046,220 @@ msgstr "E-mailová adresa autora"
 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:94
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Pridať autora"
+
+#: 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:96
+msgid "devcp_edit_authors_add_loading"
+msgstr "Kontroluje sa e-mailová adresu ú�tu…"
+
+#: 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:57
+msgid "devcp_edit_authors_header_current"
+msgstr "Aktuálni autori"
+
+#: views/developers/addon_edit_authors.thtml:49
+msgid "devcp_edit_authors_header_manage"
+msgstr "Správa autorov doplnku"
+
+#: 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:87
+msgid "devcp_edit_authors_label_developer"
+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:86
+msgid "devcp_edit_authors_label_owner"
+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: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."
+
+#. 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:84
+msgid "devcp_edit_authors_select_role"
+msgstr "Zvoľte funkciu 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
+msgid "devcp_edit_authors_th_listed"
+msgstr "V zozname"
+
+#. Column name in a table.
+#: views/developers/addon_edit_authors.thtml:62
+msgid "devcp_edit_authors_th_role"
+msgstr "Funkcia"
+
+#: views/developers/addon_edit_authors.thtml:75
+msgid "devcp_edit_authors_update_author"
+msgstr "Aktualizovať autorov"
+
+#: views/developers/addon_edit_categories.thtml:99
+msgid "devcp_edit_categories_button_update"
+msgstr "Aktualizovať kategórie"
+
+#: views/developers/addon_edit_categories.thtml:88
+msgid "devcp_edit_categories_does_not_fit"
+msgstr "Môj doplnok nespadá ani do jednej z uvedených kategórií."
+
+#. %s is the application name (Firefox, Thunderbird).
+#: views/developers/addon_edit_categories.thtml:61
+msgid "devcp_edit_categories_header_application"
+msgstr "Kategórie pre %s"
+
+#: views/developers/addon_edit_categories.thtml:49
+msgid "devcp_edit_categories_header_manage"
+msgstr "Správa kategórií doplnku"
+
+#: views/developers/addon_edit_categories.thtml:91
+msgid "devcp_edit_categories_hover"
+msgstr "Presunutím myši na názov kategórie sa zobrazí jej popis."
+
+#. %s is the category number (1, 2, 3).
+#: views/developers/addon_edit_categories.thtml:67
+msgid "devcp_edit_categories_label_category_num"
+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."
+
+#: 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í."
+
+#. %s is the application name (Firefox, Thunderbird).
+#: views/developers/addon_edit_categories.thtml:63
+msgid "devcp_edit_categories_select_application_categories"
+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."
+
+#: views/developers/addon_edit.thtml:49
+msgid "devcp_edit_dd_manage_categories"
+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."
+
+#: 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."
+
+#: views/developers/addon_edit_descriptions.thtml:115
+msgid "devcp_edit_description_button_update"
+msgstr "Aktualizovať popisy"
+
+#: 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:50
+msgid "devcp_edit_descriptions_header"
+msgstr "Úprava popisov doplnku"
+
+#: 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�."
+
+#: 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: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."
+
+#: views/developers/addon_edit_descriptions.thtml:84
+msgid "devcp_edit_descriptions_transbox_description_name"
+msgstr "Popis doplnku"
+
+#: 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)."
+
+#: 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: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."
+
+#: 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: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>"
+
+#: views/developers/addon_edit_descriptions.thtml:76
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Súhrn doplnku"
+
+#: views/developers/addon_edit.thtml:46
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Správa autorov doplnku"
+
+#: views/developers/addon_edit.thtml:48
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Správa kategórií doplnku"
+
+#: views/developers/addon_edit.thtml:50
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Správa popisov doplnku"
+
+#: views/developers/addon_edit.thtml:52
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Správa vlastností doplnku"
+
 #: 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"
@@ -1693,7 +2314,7 @@ msgstr "Toto je vývojová verzia"
 #: views/developers/addon_edit_properties.thtml:168
 #: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
-msgstr "Tento doplnok je pre špecifickú stránku"
+msgstr "Tento doplnok je ur�ený pre špecifickú stránku"
 
 #: views/developers/addon_edit_properties.thtml:201
 #: views/developers/edit.thtml:119
@@ -1704,6 +2325,150 @@ msgstr "Cieľová lokalizácia"
 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: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:108
+msgid "devcp_edit_properties_current_icon"
+msgstr "Aktuálna ikona"
+
+#: 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."
+
+#: 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: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ť."
+
+#: views/developers/addon_edit_properties.thtml:52
+msgid "devcp_edit_properties_header"
+msgstr "Úprava vlastností doplnku"
+
+#: views/developers/addon_edit_properties.thtml:185
+msgid "devcp_edit_properties_header_addon_type"
+msgstr "Typ doplnku"
+
+#: views/developers/addon_edit_properties.thtml:180
+msgid "devcp_edit_properties_header_admin_settings"
+msgstr "Nastavenia administrátora"
+
+#: views/developers/addon_edit_properties.thtml:83
+msgid "devcp_edit_properties_header_default_locale"
+msgstr "Predvolený jazyk"
+
+#: views/developers/addon_edit_properties.thtml:165
+msgid "devcp_edit_properties_header_flags"
+msgstr "Ozna�enie doplnku"
+
+#: 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:103
+msgid "devcp_edit_properties_header_icon"
+msgstr "Ikona doplnku"
+
+#: 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:181
+msgid "devcp_edit_properties_header_trusted"
+msgstr "Dôveryhodný doplnok?"
+
+#: 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: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"
+
+#: 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:184
+msgid "devcp_edit_properties_label_not_trusted"
+msgstr "Nedôveryhodný"
+
+#: views/developers/addon_edit_properties.thtml:183
+msgid "devcp_edit_properties_label_trusted"
+msgstr "Dôveryhodný"
+
+#: views/developers/addon_edit_properties.thtml:109
+msgid "devcp_edit_properties_new_icon"
+msgstr "Nová ikona"
+
+#: views/developers/addon_edit_properties.thtml:117
+msgid "devcp_edit_properties_remove_icon"
+msgstr "Odstrániť ikonu"
+
+#: 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é."
+
+#: 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: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."
+
+#: views/developers/addon_edit_properties.thtml:77
+msgid "devcp_edit_properties_transbox_name_name"
+msgstr "Názov doplnku"
+
+#: 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é."
+
+#: 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: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é."
+
+#: views/developers/addon_edit_properties.thtml:152
+msgid "devcp_edit_properties_transbox_supporturl_name"
+msgstr "Technická podpora"
+
+#: 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: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: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ľ."
+
+#: 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: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ť"
@@ -1712,11 +2477,56 @@ msgstr "Aktualizovať"
 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"
+
+#: views/elements/developers/editbox.thtml:47
+msgid "devcp_editbox_categories"
+msgstr "Kategórie"
+
+#: views/elements/developers/editbox.thtml:52
+msgid "devcp_editbox_change_status"
+msgstr "Zmeniť stav"
+
+#: views/elements/developers/editbox.thtml:48
+msgid "devcp_editbox_descriptions"
+msgstr "Popisy"
+
+#: views/elements/developers/editbox.thtml:43
+msgid "devcp_editbox_edit_addon"
+msgstr "Upraviť doplnok"
+
+#: views/elements/developers/editbox.thtml:57
+msgid "devcp_editbox_new_version"
+msgstr "Nová verzia"
+
+#: views/elements/developers/editbox.thtml:49
+msgid "devcp_editbox_properties"
+msgstr "Vlastnosti"
+
+#: views/elements/developers/editbox.thtml:60
+msgid "devcp_editbox_screenshots"
+msgstr "Obrázky s ukážkami"
+
+#: views/elements/developers/editbox.thtml:53
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Å tatistika"
+
+#: views/elements/developers/editbox.thtml:54
+msgid "devcp_editbox_versions"
+msgstr "Verzie a súbory"
+
+#: views/elements/developers/editbox.thtml:42
+msgid "devcp_editbox_view_listing"
+msgstr "Zobraziť doplnok"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Odporú�ané doplnky"
 
 # %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1727,6 +2537,7 @@ msgstr[1] "Moderované recenzie (%s)"
 msgstr[2] "Moderované recenzie (%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
 #, php-format
@@ -1737,6 +2548,7 @@ msgstr[1] "Nominované doplnky (%s)"
 msgstr[2] "Nominované doplnky (%s)"
 
 # %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1752,6 +2564,8 @@ 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"
@@ -1777,51 +2591,64 @@ msgstr "Poznámky pre recenzenta"
 msgid "devcp_editversion_submit_update"
 msgstr "Aktualizovať"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Pozrite informácie na %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 "tejto stránke"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, php-format
+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."
+
+#. %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 (%s) nie je pre vybraný typ doplnku povolená. Použite jednu z nasledujúcich: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Nie všetky identifikátory GUID súborov súhlasia"
 
@@ -1850,18 +2677,21 @@ msgstr "Presahuje maximálnu veľkosť pre odoslanie"
 msgid "devcp_error_http_nofile"
 msgstr "Nie je odoslaný žiadny súbor"
 
+#. %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 "Táto prípona súboru (%s) nie je pre ikonu povolená. Použite jednu z nasledujúcich: %s."
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Chýba súbor install.rdf."
 
@@ -1869,21 +2699,26 @@ 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:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Vyberte platný typ doplnku."
 
+#. %$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 "%s nie platná verzia %s."
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "ID doplnku 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"
@@ -1897,6 +2732,7 @@ msgstr "Verzia tohto doplnku je neplatná: pozrite <a href=\"http://developer.mo
 msgid "devcp_error_invalid_version_spaces"
 msgstr "Verzia tohto doplnku je neplatná: verzie nemôžu obsahovať medzery."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1906,6 +2742,7 @@ msgstr "Po�as analýzy súboru install.rdf došlo k nasledujúcej chybe: %s"
 msgid "devcp_error_move_file"
 msgstr "Súbor nemožno presunúť"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1928,15 +2765,15 @@ 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:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "Pri nominácii musíte poskytnúť požadované podrobnosti."
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "Nemôžete nominovať vývojovú verziu doplnku."
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Nominovať môžete len doplnky, ktoré sú v Sandboxe."
 
@@ -1948,18 +2785,20 @@ msgstr "Vyberte aspoň jednu kategóriu."
 msgid "devcp_error_one_user"
 msgstr "Doplnok musí mať aspoň jedného 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 "Táto prípona súboru (%s) nie je pre ukážku povolená. Použite jednu z nasledujúcich: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Na aktualizáciu tohto doplnku nemáte povolenie."
 
@@ -1971,7 +2810,7 @@ msgstr "Doplnok nemôže používať updateKey. Odstráňte ho zo súboru instal
 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."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Odošlite súbor."
@@ -2189,11 +3028,65 @@ msgstr "Úspešné"
 msgid "devcp_index_header_myaddons"
 msgstr "Moje doplnky"
 
+#: views/pages/js_constants.js.thtml:79
+msgid "devcp_js_a_cancel"
+msgstr "Zrušiť"
+
+#: views/pages/js_constants.js.thtml:80
+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:71
+msgid "devcp_js_img_move_down"
+msgstr "Posunúť nadol"
+
+#. alt text for an up-arrow image.
+#: views/pages/js_constants.js.thtml:72
+msgid "devcp_js_img_move_up"
+msgstr "Posunúť nahor"
+
+#: views/pages/js_constants.js.thtml:81
+msgid "devcp_js_img_remove_compat"
+msgstr "Odstrániť kompatibilitu aplikácie"
+
+#: views/pages/js_constants.js.thtml:76
+msgid "devcp_js_input_list_author"
+msgstr "Zobraziť ako autora na verejne dostupných stránkach"
+
+#. <option> text in a <select> for Author role in an add-on.
+#: views/pages/js_constants.js.thtml:74
+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:73
+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:75
+msgid "devcp_js_option_viewer"
+msgstr "Divák"
+
+#: views/pages/js_constants.js.thtml:78
+msgid "devcp_js_remove_author"
+msgstr "Odstrániť autora"
+
+#: views/pages/js_constants.js.thtml:77
+msgid "devcp_js_sure_remove"
+msgstr "<strong>Naozaj</strong> chcete odstrániť tohto autora?"
+
+#: views/pages/js_constants.js.thtml:67
+msgid "devcp_js_upload_alert"
+msgstr "Musíte zvoliť súbor, ktorý chcete odoslať."
+
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Lokalizované polia"
 
 # %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2233,11 +3126,22 @@ msgstr "Odoslať doplnok"
 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: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>."
+
+#: 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
@@ -2245,11 +3149,27 @@ msgid "devcp_nominate_submit_nominate"
 msgstr "Nominovať %s"
 
 # %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: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 noli úspešne uložené."
+
+#: 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
+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."
+
 #: 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."
@@ -2258,6 +3178,10 @@ msgstr "Zrušenie predvolenia spôsobí, že predvolenou ukážkou sa automatick
 # %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
@@ -2269,9 +3193,13 @@ msgstr "Predvolený jazyk tohto doplnku (%1$s [%2$s]) je odlišný od aktuálne
 msgid "devcp_notice_makedefault"
 msgstr "Predvolenie ukážky zruší predvolenie aktuálnej ukážky."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: views/developers/addon_edit_authors.thtml:69
+msgid "devcp_notice_unsaved_changes"
+msgstr "Zmeny zatiaľ neboli uložené. "
+
+#: 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
@@ -2300,6 +3228,46 @@ msgstr "Upraviť ukážku"
 msgid "devcp_preview_updated_successfully"
 msgstr "Ukážka úspešne aktualizovaná."
 
+#: views/developers/previews.thtml:121
+msgid "devcp_previews_a_another"
+msgstr "Pridať �alšiu ukážku"
+
+#: views/developers/previews.thtml:97
+msgid "devcp_previews_a_delete"
+msgstr "Odstrániť ukážku"
+
+#: views/developers/previews.thtml:96
+msgid "devcp_previews_a_replace"
+msgstr "Nahradiť ukážku"
+
+#: views/developers/previews.thtml:127
+msgid "devcp_previews_a_update"
+msgstr "Aktualizovať ukážky"
+
+#: 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: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"
+
+#: 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: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>)"
+
+#. %s is href=... and should stay in the <a> tag.
+#: 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>)"
+
 #: 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á."
@@ -2308,10 +3276,18 @@ msgstr "Na odoslanie snímky svojho doplnku vo formáte PNG, JPG alebo GIF použ
 msgid "devcp_previews_header_add"
 msgstr "Pridať ukážku"
 
+#: views/developers/previews.thtml:79
+msgid "devcp_previews_header_caption"
+msgstr "Popis ukážky"
+
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "Upraviť ukážku"
 
+#: views/developers/previews.thtml:94
+msgid "devcp_previews_label_default"
+msgstr "Predvolená ukážka"
+
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
 msgstr "Súbor ukážky"
@@ -2321,6 +3297,26 @@ msgstr "Súbor ukážky"
 msgid "devcp_previews_label_makedefault"
 msgstr "Predvoliť ako obrázok ukážky"
 
+#: views/developers/previews.thtml:101
+msgid "devcp_previews_label_new"
+msgstr "Nový obrázok:"
+
+#: views/developers/previews.thtml:119
+msgid "devcp_previews_label_upload"
+msgstr "Odoslať ukážku: "
+
+#: 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:46
+msgid "devcp_previews_notice_success"
+msgstr "Ukážky boli úspešne aktualizované."
+
+#: 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."
+
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
 msgstr "Odstrániť ukážku"
@@ -2337,57 +3333,133 @@ msgstr "Upraviť ukážku"
 msgid "devcp_previews_submit_upload"
 msgstr "Odoslať ukážku"
 
+#: views/developers/previews.thtml:77
+msgid "devcp_previews_thumbnail"
+msgstr "Miniatúra"
+
+#. %s is the add-on name.
+#: views/developers/previews.thtml:43
+msgid "devcp_previews_title"
+msgstr "Správca ukážok doplnku %s"
+
 #: views/developers/add_step2.thtml:64
 msgid "devcp_question_addontype_incorrect"
 msgstr "Nesprávne?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Naozaj chcete odstrániť tento súbor?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78
+#: 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."
 
+#: 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."
+
+#: 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."
+
+#: 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:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "Aktívni denní používatelia: <em>%s</em>"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "Prevzatí celkom: <em>%s</em>"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "Prevzatí za týždeň: <em>%s</em>"
 
-#: controllers/developers_controller.php:1481
+#: 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ť."
+
+#: views/developers/addon_status_confirm.thtml:59
+msgid "devcp_status_confirm_active_sure"
+msgstr "Naozaj chcete ozna�iť tento doplnok ako aktívny?"
+
+#: views/developers/addon_status_confirm.thtml:50
+msgid "devcp_status_confirm_header_sure"
+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ť."
+
+#: views/developers/addon_status_confirm.thtml:55
+msgid "devcp_status_confirm_inactive_sure"
+msgstr "Naozaj chcete ozna�iť tento doplnok ako neaktívny?"
+
+#: views/developers/addon_status_confirm.thtml:74
+msgid "devcp_status_confirm_no"
+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."
+
+#: views/developers/addon_status_confirm.thtml:67
+msgid "devcp_status_confirm_public_sure"
+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."
+
+#: views/developers/addon_status_confirm.thtml:63
+msgid "devcp_status_confirm_sandbox_sure"
+msgstr "Naozaj chcete presunúť tento doplnok do sandboxu?"
+
+#: views/developers/addon_status_confirm.thtml:73
+msgid "devcp_status_confirm_yes"
+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."
+
+#: views/developers/addon_status_nominate.thtml:55
+msgid "devcp_status_nominate_header"
+msgstr "Nominovanie doplnku"
+
+#: 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/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83
+#: views/developers/uploader.thtml:76
 #: views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Súhlasím"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82
+#: views/developers/uploader.thtml:75
 #: views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Nesúhlasím"
@@ -2404,12 +3476,13 @@ msgstr "Zakázané"
 msgid "devcp_summary_header_trusted"
 msgstr "Dôveryhodné"
 
-#: views/developers/dashboard.thtml:82
+#: 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"
@@ -2420,6 +3493,7 @@ 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"
@@ -2429,30 +3503,504 @@ msgstr "Uistite sa, že ste %s svojej témy."
 msgid "devcp_theme_upload_preview_link"
 msgstr "odoslali ukážku"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+msgid "devcp_title_edit_addon"
+msgstr "Úprava doplnku %s"
+
+#. title attribute for a javascript link that pops up a help dialog.
+#: views/elements/developers/translationbox.thtml:64
+msgid "devcp_transbox_a_title_help"
+msgstr "Pomocník (neopustíte túto stránku)"
+
+#: 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/developers/translationbox.thtml:97
+msgid "devcp_transbox_chars_used"
+msgstr "Po�et využitých znakov: %1$s / %2$s"
+
+#: 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/developers/translationbox.thtml:143
+msgid "devcp_transbox_help_header_tabs"
+msgstr "Čo sú karty pomenované '%s'?"
+
+#: views/elements/developers/translationbox.thtml:145
+msgid "devcp_transbox_help_header_what"
+msgstr "Čo ak neposkytnem žiadne preklady?"
+
+#: views/elements/developers/translationbox.thtml:147
+msgid "devcp_transbox_help_hide"
+msgstr "Skryť pomocníka"
+
+#: 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."
+
+#: 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."
+
+#: views/elements/developers/translationbox.thtml:81
+msgid "devcp_transbox_img_add_trans"
+msgstr "Pridať preklad"
+
+#: views/elements/developers/translationbox.thtml:82
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Odstrániť preklad"
+
+#: views/elements/developers/translationbox.thtml:123
+msgid "devcp_transbox_input_add_all"
+msgstr "Pridať jazyk do všetkých polí"
+
+#: views/elements/developers/translationbox.thtml:122
+msgid "devcp_transbox_input_add_locale"
+msgstr "Pridať jazyk"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+msgid "devcp_transbox_input_cancel"
+msgstr "Zrušiť"
+
+#: views/elements/developers/translationbox.thtml:134
+msgid "devcp_transbox_input_delete"
+msgstr "Odstrániť"
+
+#: 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: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)."
+
+#: 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: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: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>."
+
+#. %1$s and %2$s are version numbers.
+#: 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)."
+
+#: views/developers/uploader.thtml:68
+msgid "devcp_uploader_a_start"
+msgstr "Za�íname"
+
+#: views/developers/uploader.thtml:103
+msgid "devcp_uploader_ajax_loading"
+msgstr "Odosiela sa súbor…"
+
+#: views/developers/uploader.thtml:123
+msgid "devcp_uploader_button_edit"
+msgstr "Upraviť môj doplnok"
+
+#: views/developers/uploader.thtml:124
+msgid "devcp_uploader_button_later"
+msgstr "Môj doplnok dokon�ím neskôr."
+
+#: 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: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: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: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."
+
+#: views/developers/uploader.thtml:120
+msgid "devcp_uploader_header_created"
+msgstr "Doplnok vytvorený!"
+
+#: 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:139
+msgid "devcp_uploader_header_file_added"
+msgstr "Súbor pridaný!"
+
+#: views/developers/uploader.thtml:66
+msgid "devcp_uploader_header_how"
+msgstr "Ako to funguje?"
+
+#. %s is the version number, e.g. 3.2.
+#: views/developers/uploader.thtml:129
+msgid "devcp_uploader_header_update_created"
+msgstr "Verzia %s vytvorená"
+
+#: 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:91
+msgid "devcp_uploader_label_platformtype"
+msgstr "Podporované platformy:"
+
+#: views/developers/uploader.thtml:90
+msgid "devcp_uploader_label_upload_field"
+msgstr "Súbor doplnku: "
+
+#. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
+#: 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>."
+
+#. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
+#: 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 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:131
+msgid "devcp_uploader_p_update_created"
+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: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é)."
+
+#. %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
+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é)."
+
+#: 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."
+
+#: views/developers/uploader.thtml:91
+msgid "devcp_uploader_platformtype_all"
+msgstr "VÅ¡etky"
+
+#: views/developers/uploader.thtml:92
+msgid "devcp_uploader_platformtype_specific"
+msgstr "Špecifická:"
+
+#. %1$s is the add-on name, %2$s is the version number.
+#: views/developers/uploader.thtml:57
+msgid "devcp_uploader_title_file"
+msgstr "Pridať súbor k %1$s %2$s"
+
+#: views/developers/uploader.thtml:50
+msgid "devcp_uploader_title_submit"
+msgstr "Odoslanie nového doplnku"
+
+#. %s is the add-on name.
+#: views/developers/uploader.thtml:54
+msgid "devcp_uploader_title_update"
+msgstr "Aktualizácia doplnku %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 "Pozrite %s."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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ánku"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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:2612
+#: controllers/developers_controller.php:2613
 msgid "devcp_version_edit_pagetitle"
 msgstr "Upraviť verziu"
 
-#: controllers/developers_controller.php:2572
+#: 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"
+msgstr "Zrušiť"
+
+#: views/developers/versions.thtml:79
+msgid "devcp_versions_a_delete"
+msgstr "Odstrániť verziu"
+
+#: views/developers/versions.thtml:74
+msgid "devcp_versions_a_empty"
+msgstr "Odstrániť prázdnu verziu"
+
+#: views/developers/versions.thtml:71
+msgid "devcp_versions_a_remove"
+msgstr "Odstrániť?"
+
+#: views/developers/versions.thtml:91
+msgid "devcp_versions_add"
+msgstr "Pridať novú verziu"
+
+#: views/developers/versions_delete.thtml:58
+msgid "devcp_versions_delete_a_cancel"
+msgstr "Zrušiť"
+
+#: views/developers/versions_delete.thtml:56
+msgid "devcp_versions_delete_a_delete"
+msgstr "Odstrániť verziu"
+
+#. Followed by a list of reviews and files that will be removed.
+#: views/developers/versions_delete.thtml:50
+msgid "devcp_versions_delete_also"
+msgstr "Týmto odstránite tiež:"
+
+#: views/developers/versions_delete.thtml:53
+msgid "devcp_versions_delete_files"
+msgid_plural "devcp_versions_delete_files"
+msgstr[0] "%s súbor"
+msgstr[1] "%s súbory"
+msgstr[2] "%s súborov"
+
+#. %s is the version number.
+#: views/developers/versions_delete.thtml:48
+msgid "devcp_versions_delete_header"
+msgstr "Odstrániť verziu %s?"
+
+#: views/developers/versions_delete.thtml:52
+msgid "devcp_versions_delete_reviews"
+msgid_plural "devcp_versions_delete_reviews"
+msgstr[0] "%s recenziu"
+msgstr[1] "%s recenzie"
+msgstr[2] "%s recenzií"
+
+#. %s is the version number.
+#: views/developers/versions_delete.thtml:49
+msgid "devcp_versions_delete_sure"
+msgstr "Naozaj chcete natrvalo odstrániť verziu %s?"
+
+#: 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:100
+msgid "devcp_versions_edit_a_delete"
+msgstr "Odstrániť súbor"
+
+#: views/developers/versions_edit.thtml:164
+msgid "devcp_versions_edit_a_new_app"
+msgstr "Pridať novú aplikáciu"
+
+#: views/developers/versions_edit.thtml:153
+msgid "devcp_versions_edit_a_remove_app"
+msgstr "Odstrániť aplikáciu"
+
+#: 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: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>."
+
+#: 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:99
+msgid "devcp_versions_edit_delete_sure"
+msgstr "<b>Naozaj</b> chcete natrvalo odstrániť tento súbor?"
+
+#: views/developers/versions_edit.thtml:186
+msgid "devcp_versions_edit_header_approval"
+msgstr "Informácie o schválení doplnku"
+
+#: views/developers/versions_edit.thtml:119
+msgid "devcp_versions_edit_header_compat"
+msgstr "Kompatibilné aplikácie"
+
+#: views/developers/versions_edit.thtml:73
+msgid "devcp_versions_edit_header_file"
+msgstr "Informácie o súbore"
+
+#. %s is the version number.
+#: views/developers/versions_edit.thtml:52
+msgid "devcp_versions_edit_header_manage"
+msgstr "Správa verzie %s"
+
+#: views/developers/versions_edit.thtml:194
+msgid "devcp_versions_edit_header_notes"
+msgstr "Poznámky k schváleniu doplnku"
+
+#: views/developers/versions_edit.thtml:97
+msgid "devcp_versions_edit_img_delete"
+msgstr "Odstrániť súbor"
+
+#. %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
+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:110
+msgid "devcp_versions_edit_no_files"
+msgstr "Neboli nájdené žiadne súbory."
+
+#: 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:150
+msgid "devcp_versions_edit_remove_compat"
+msgstr "Odstrániť kompatibilitu s aplikáciou"
+
+#: views/developers/versions_edit.thtml:166
+msgid "devcp_versions_edit_select_app"
+msgstr "Zvoľte aplikáciu"
+
+#: views/developers/versions_edit.thtml:77
+msgid "devcp_versions_edit_th_file"
+msgstr "Súbor"
+
+#: 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 "Veľkosť"
+
+#: views/developers/versions_edit.thtml:80
+msgid "devcp_versions_edit_th_status"
+msgstr "Stav"
+
+#: 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."
+
+#: views/developers/versions_edit.thtml:181
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Poznámky k vydaniu"
+
+#: 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."
+
+#: 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."
+
+#: views/developers/versions_edit.thtml:200
+msgid "devcp_versions_edit_update"
+msgstr "Aktualizovať verzie"
+
+#: views/developers/versions.thtml:49
+msgid "devcp_versions_header_manage"
+msgstr "Správa verzií a súborov"
+
+#: views/developers/versions.thtml:87
+msgid "devcp_versions_no_versions"
+msgstr "Žiadne verzie."
+
+#. %s is a version number, base 10.
+#: views/developers/versions.thtml:46
+msgid "devcp_versions_notice_success"
+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ť?"
+
+#: views/developers/versions.thtml:58
+msgid "devcp_versions_th_created"
+msgstr "Vytvorená"
+
+#: views/developers/versions.thtml:57
+msgid "devcp_versions_th_status"
+msgstr "Stav"
+
+#: views/developers/versions.thtml:56
+msgid "devcp_versions_th_version"
+msgstr "Verzia"
+
 #: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Tento doplnok je zakázaný"
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "Tento doplnok ešte nebol nominovaný."
+
+#: controllers/components/editors.php:213
+msgid "editor_review_error_file_not_pending"
+msgstr "Tento súbor ne�aká 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 "Prosím, zvoľte akciu kontroly."
+
+#: controllers/components/editors.php:192
+msgid "editor_review_error_no_applications"
+msgstr "Prosím, zadajte aplikáciu, s ktorou ste testovali."
+
+#. 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 "Prosím, zadajte komentáre ku kontrole."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Prosím, vyberte aspoň jeden súbor na kontrolu."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "Prosím, zadajte opera�ný systém, pod ktorým prebehla kontrola."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filtrovať"
@@ -2462,7 +4010,7 @@ msgid "editorcp_logs_filter_by"
 msgstr "Filter podľa typu/úkonu"
 
 #: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:788
+#: controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Denník udalostí"
 
@@ -2514,6 +4062,7 @@ msgstr "Skryť komentáre"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Zobraziť komentáre"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2524,7 +4073,7 @@ msgid "editorcp_reviewlog_none_found"
 msgstr "V tomto období nie sú žiadne recenzie."
 
 #: views/editors/reviewlog.thtml:42
-#: controllers/editors_controller.php:814
+#: controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Denník recenzií"
 
@@ -2548,24 +4097,24 @@ msgstr "Ostatná aktivita editora"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Recenzie celkom"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Recenzia doplnku"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Vyplňte nasledujúce polia:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Vyberte aspoň jeden súbor na recenziu."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Recenzie samým sebou nie sú dovolené."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Externý softvér"
 
@@ -2579,43 +4128,43 @@ msgid "editors_featured_add_feature_submit"
 msgstr "Pridať"
 
 #: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Úspešne upravené."
 
 #: views/editors/featured.thtml:53
-#: controllers/editors_controller.php:685
+#: 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:730
+#: controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Nepodarilo sa odstrániť."
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Úspešne odstránené."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Odporú�ané doplnky"
 
@@ -2650,40 +4199,43 @@ msgid "editors_notice_filter_session"
 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: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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 deň"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hod."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 min."
 
-#: controllers/editors_controller.php:58
-#: controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61
+#: controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Nástroje editora"
 
-#: controllers/editors_controller.php:286
+#. %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 "len %s"
 
-#: controllers/editors_controller.php:301
+#: 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:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2697,19 +4249,23 @@ msgstr "Vymazať"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Úkon recenzie"
 
+#: views/editors/review.thtml:153
+msgid "editors_review_action_info"
+msgstr "Vyžiadať dodato�né informácie"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Schváliť pre verejnosť"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Požadovať super-recenziu"
 
@@ -2717,27 +4273,31 @@ msgstr "Požadovať super-recenziu"
 msgid "editors_review_action_sandbox"
 msgstr "Nechať v Sandboxe"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Komentáre recenzie"
 
-#: views/editors/review.thtml:167
+#: 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ý obrdží e-mailovú správu a bude môcť tu odpovedať. Pri jeho odpovedi budete upozornený e-mailovou správou."
+
+#: 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."
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Týmto ponecháte doplnok v Sandboxe."
 
-#: views/editors/review.thtml:159
+#: 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. "
 
-#: views/editors/review.thtml:162
+#: 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:174
+#: 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."
 
@@ -2761,15 +4321,15 @@ msgstr "Kategórie:"
 msgid "editors_review_header_compatibility"
 msgstr "Kompatibilita:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Popis"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Komentáre vývojára"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "Licen�ná zmluva"
 
@@ -2777,92 +4337,111 @@ msgstr "Licen�ná zmluva"
 msgid "editors_review_header_files"
 msgstr "Súbory:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "História položky"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomina�ná správa"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Ukážky"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Recenzia %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Poznámky pre recenzenta"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Súhrn"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Poznámky k verzii"
 
+#. 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 "Odpove�"
+
+#: views/elements/developers/editors_review_history_item.thtml:78
+msgid "editors_review_history_info_request"
+msgstr "Žiadosť o informácie"
+
+#: views/elements/developers/editors_review_history_item.thtml:62
 #: views/editors/reviewlog.thtml:77
-#: views/editors/review.thtml:295
 msgid "editors_review_history_nominated_adminreview"
 msgstr "Recenzia správcu"
 
+#: views/elements/developers/editors_review_history_item.thtml:56
 #: views/editors/reviewlog.thtml:71
-#: views/editors/review.thtml:289
 msgid "editors_review_history_nominated_approved"
 msgstr "Nominácia schválená/Verejné"
 
+#: views/elements/developers/editors_review_history_item.thtml:59
 #: views/editors/reviewlog.thtml:74
-#: views/editors/review.thtml:292
 msgid "editors_review_history_nominated_denied"
 msgstr "Nominácia zamietnutá/Sandbox"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Nenašli sa žiadne predchádzajúce recenzie."
 
+#: views/elements/developers/editors_review_history_item.thtml:73
 #: views/editors/reviewlog.thtml:88
-#: views/editors/review.thtml:306
 msgid "editors_review_history_pending_adminreview"
 msgstr "Recenzia správcu"
 
+#: views/elements/developers/editors_review_history_item.thtml:67
 #: views/editors/reviewlog.thtml:82
-#: views/editors/review.thtml:300
 msgid "editors_review_history_pending_approved"
 msgstr "Schválené/Verejné"
 
+#: views/elements/developers/editors_review_history_item.thtml:70
 #: views/editors/reviewlog.thtml:85
-#: views/editors/review.thtml:303
 msgid "editors_review_history_pending_denied"
 msgstr "Zamietnuté/Sandbox"
 
-#: views/editors/review.thtml:198
+#. 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] "Zobraziť/skryť odpove�"
+msgstr[1] "Zobraziť/skryť %1$s odpovede"
+msgstr[2] "Zobraziť/skryť %1$s odpovedí"
+
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Aplikácie:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "alebo vyberte pripravenú odpove�:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Komentáre:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Opera�né systémy:"
 
-#: views/editors/review.thtml:268
-#: views/editors/review.thtml:324
+#: views/editors/review.thtml:281
+#: views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Navrch"
 
@@ -2870,7 +4449,7 @@ msgstr "Navrch"
 msgid "editors_review_next_link"
 msgstr "�alší &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Žiadne ukážky sa nenašli."
 
@@ -2878,41 +4457,46 @@ msgstr "Žiadne ukážky sa nenašli."
 msgid "editors_review_previous_link"
 msgstr "&laquo; predchádzajúci"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong>�. %1$s</strong> z %2$s vo fronte"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Spracovať úkon"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Úkon"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Komentáre"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Dátum"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Recenzent"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Verzia/Súbor"
 
-#: controllers/editors_controller.php:411
+#: 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)"
+
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Recenzia úspešne spracovaná."
 
@@ -2936,7 +4520,7 @@ msgstr "Úkon"
 msgid "editors_reviews_in_reply_to"
 msgstr "V odpovedi na:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Recenzie úspešne spracované!"
 
@@ -2948,23 +4532,23 @@ msgstr "V moderovaní nie sú momentálne žiadne recenzie."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Spracovať recenzie"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Pre špecifickú stránku"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Nové"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Aktualizované"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Testované aplikácie"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Testované opera�né systémy"
 
@@ -3006,17 +4590,20 @@ msgstr "Platformy"
 msgid "editors_th_submissiontypes"
 msgstr "Typy odoslania"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dní"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s hod."
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s min."
@@ -3028,8 +4615,8 @@ msgstr "%s min."
 #: controllers/components/amo.php:610
 #: controllers/components/amo.php:611
 #: controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Prístup odmietnutý"
 
@@ -3037,12 +4624,13 @@ msgstr "Prístup odmietnutý"
 msgid "error_access_denied_message"
 msgstr "Na zobrazenie tejto stránky nemáte oprávnenie."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3052,22 +4640,23 @@ msgstr "Na zobrazenie tejto stránky nemáte oprávnenie."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340
 #: controllers/api_controller.php:123
 #: controllers/api_controller.php:759
 #: controllers/api_controller.php:894
 #: controllers/api_controller.php:925
-#: controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Doplnok sa nenašiel!"
 
 #: controllers/files_controller.php:83
-#: controllers/files_controller.php:185
+#: controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Tento doplnok tu nemožno zobraziť."
 
@@ -3075,7 +4664,7 @@ msgstr "Tento doplnok tu nemožno zobraziť."
 msgid "error_addon_selfreview"
 msgstr "Nemôžete recenzovať vlastný doplnok."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "V kategórii nie sú žiadne doplnky!"
 
@@ -3105,17 +4694,18 @@ msgid "error_field_required"
 msgstr "Toto pole nesmie byť prázdne."
 
 #: controllers/files_controller.php:75
-#: controllers/files_controller.php:91
-#: controllers/files_controller.php:94
-#: controllers/files_controller.php:152
-#: controllers/files_controller.php:165
-#: controllers/files_controller.php:174
-#: controllers/files_controller.php:192
-#: controllers/editors_controller.php:509
+#: 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!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Chyba súboru: %s neexistuje."
@@ -3123,11 +4713,11 @@ 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:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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"
@@ -3145,6 +4735,7 @@ msgstr "Nesprávny kód, skúste to znova!"
 msgid "error_invalid_url"
 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:254
@@ -3152,13 +4743,13 @@ msgstr "URL má neplatný formát. Platná adresa vyzerá takto: http://priklad.
 #: controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
-#: controllers/reviews_controller.php:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475
 #: controllers/api_controller.php:900
-#: controllers/addons_controller.php:87
-#: controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3178,7 +4769,7 @@ msgstr "Oznámenie"
 msgid "error_preview_notfound"
 msgstr "Ukážka sa nenašla!"
 
-#: views/addons/display.thtml:373
+#: views/addons/display.thtml:397
 #: views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Musíte zvoliť hodnotenie."
@@ -3236,8 +4827,8 @@ msgstr "Najprv potvr�te svoj používateľský ú�et kódom, ktorý ste dostal
 msgid "error_username_or_pw_wrong"
 msgstr "Nesprávne meno používateľa alebo heslo!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Verzia sa nenašla!"
 
@@ -3251,12 +4842,14 @@ msgid "feature_learnmore"
 msgstr "Viac informácií"
 
 # %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Viac informácií o %1$s"
 
-#: views/elements/addon_listitem.thtml:132
+#. %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
@@ -3271,6 +4864,60 @@ msgstr[2] "%1$s recenzií"
 msgid "feature_view_more_from_category"
 msgstr "Zobraziť �alšie z kategórie "
 
+#. 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 "Späť na doplnok"
+
+#. 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 "Rozbaliť všetko"
+
+#. 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 "Späť na recenziu"
+
+#. 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 :: Prehliada� súborov :: %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
+msgid "file_browser_toggle_expand_collapse"
+msgstr "+/-"
+
+#. Link text for the AMO About page.
+#: views/elements/footer.thtml:72
+msgid "footer_a_about"
+msgstr "ÄŒo je"
+
+#. Link text to the AMO blog.
+#: views/elements/footer.thtml:74
+msgid "footer_a_blog"
+msgstr "Blog"
+
+#. Link text to the Frequently Asked Questions page.
+#: views/elements/footer.thtml:73
+msgid "footer_a_faq"
+msgstr "FAQ"
+
+#. Full text for the FAQ abbreviation.
+#: views/elements/footer.thtml:73
+msgid "footer_abbr_faq"
+msgstr "Často kladené otázky"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Všetky práva vyhradené."
@@ -3283,7 +4930,8 @@ msgstr "Copyright"
 msgid "footer_credits"
 msgstr "Tvorcovia"
 
-#: views/elements/footer.thtml:73
+#: views/elements/footer.thtml:75
+#: views/elements/footer.thtml:76
 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."
 
@@ -3303,7 +4951,7 @@ msgstr "Ďalšie jazyky:"
 msgid "footer_privacy_policy"
 msgstr "Zásady ochrany súkromia"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Uložiť"
 
@@ -3312,6 +4960,7 @@ 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Slovníky"
@@ -3321,6 +4970,7 @@ 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Rozšírenia"
@@ -3330,6 +4980,7 @@ 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Jazykové balíky (doplnok)"
@@ -3339,6 +4990,7 @@ 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Jazykové balíky (aplikácia)"
@@ -3348,6 +5000,7 @@ 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Zásuvné moduly"
@@ -3357,6 +5010,7 @@ 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:111
 msgid "general_addontype_search_plural"
 msgstr "Vyhľadávacie moduly"
@@ -3366,10 +5020,12 @@ 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Témy"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111
 #: views/elements/header.thtml:122
 #, php-format
@@ -3402,12 +5058,12 @@ msgstr "Doplnky"
 
 #: views/elements/developers/sidebar.thtml:72
 #: views/elements/developers/myaddons.thtml:72
-#: views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Prihlásenie"
 
-#: views/elements/header.thtml:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Odhlásiť"
 
@@ -3415,14 +5071,15 @@ msgstr "Odhlásiť"
 msgid "header_navlink_myaccount"
 msgstr "Môj ú�et"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Registrácia"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81
+#: views/elements/addon_listitem.thtml:80
 #: views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
@@ -3430,16 +5087,21 @@ msgid "img_preview_of"
 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/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$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 "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/install.thtml:146
 #: views/elements/install.thtml:164
 #: views/elements/install.thtml:197
@@ -3448,6 +5110,7 @@ msgstr "Pridať do programu %s %s"
 msgid "install_button_title"
 msgstr "Pridať %1$s do programu %2$s"
 
+#. %1$s is the add-on name
 #: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3472,7 +5135,7 @@ msgstr "Prevziať jazykový balík"
 #: views/elements/addon_categories.thtml:54
 #: views/addons/dictionaries.thtml:59
 #: controllers/components/amo.php:701
-#: controllers/addons_controller.php:894
+#: controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Slovníky/Jazykové balíky"
 
@@ -3568,6 +5231,7 @@ 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:214
 msgid "other_users"
 msgstr "a �alší"
@@ -3580,35 +5244,34 @@ msgstr "Verzie aplikácie"
 msgid "page_title_credits"
 msgstr "Tvorcovia"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Experimentálne doplnky"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
 msgstr "Často kladené otázky"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Často kladené otázky pre Oble�te svoj Firefox"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Zásady stránky Add-ons"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Zásady ochrany súkromia Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Sprievodca systémom kontroly"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Systém kontroly v Sandboxe"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Pomocník k odoslaniu"
 
@@ -3625,11 +5288,14 @@ msgstr "Platné verzie aplikácie"
 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."
 
+#. %s is a full <a> tag
 #: 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)."
 
+#. 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 "tu"
@@ -3638,7 +5304,6 @@ msgstr "tu"
 msgid "pages_appversions_versions"
 msgstr "Verzie"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Naspäť na predchádzajúcu stránku"
 
@@ -3651,6 +5316,7 @@ 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"
@@ -3674,12 +5340,16 @@ msgstr "Prosím, zadajte vypo�utý text."
 
 # %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 "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
+#. %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 "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>."
@@ -3692,7 +5362,7 @@ msgstr "Ste �lovek?"
 msgid "recaptcha_whatsthis"
 msgstr "ÄŒo je toto?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Chyba pri nahlásení tejto recenzie!"
 
@@ -3719,7 +5389,7 @@ msgstr "Spam alebo iný neschválený obsah"
 
 #: views/reviews/display.thtml:95
 #: views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Ďakujeme; táto recenzia bola ozna�ená na schválenie editorom."
 
@@ -3732,10 +5402,12 @@ msgid "review_flag_this_titletip"
 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: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>"
 
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:54
 #: views/reviews/display.thtml:54
 #: views/reviews/review_added.thtml:47
@@ -3743,15 +5415,15 @@ msgstr "<p>Pamätajte na tieto tipy:</p><ul><li>Píšte, akoby ste rozprávali s
 msgid "reviews_header"
 msgstr "Recenzie %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Odporú�ané doplnky"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Najnovšie doplnky"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Aktualizované doplnky"
 
@@ -3789,6 +5461,7 @@ msgstr "Všetky vyhľadávacie moduly"
 msgid "search_landing_browse_search_engines"
 msgstr "Prehľadávať všetky vyhľadávacie moduly"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3809,11 +5482,13 @@ msgstr "Hľadať doplnky"
 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:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Výsledky hľadania pre: %s"
 
+#: views/elements/header.thtml:154
 #: views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Nástroje správcu"
@@ -3823,6 +5498,7 @@ msgstr "Nástroje správcu"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Nástroje vývojára"
 
+#: views/elements/header.thtml:148
 #: views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Nástroje editora"
@@ -3831,6 +5507,7 @@ msgstr "Nástroje editora"
 msgid "sidebar_navlink_welcome"
 msgstr "Vitajte"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3870,6 +5547,7 @@ msgstr "Tému"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Aktualizované doplnky"
 
+#. %1$s is a number
 #: views/helpers/localization.php:65
 #: views/developers/editversion.thtml:58
 #: views/developers/versions_edit.thtml:94
@@ -3884,6 +5562,7 @@ 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3901,28 +5580,36 @@ msgstr "Nástroje vývojára"
 msgid "statistics_addon_switch"
 msgstr "Prepnúť doplnok"
 
+#. This is a date format.
+#. http://php.net/strftime
 #: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:167
+#: 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:138
+#: 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:147
-#: views/statistics/addon.thtml:158
+#: 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 "vytvorené: %1$s"
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3964,7 +5651,7 @@ msgstr "Å tatistika"
 msgid "statistics_index_view_button"
 msgstr "Zobraziť štatistiku"
 
-#: views/statistics/addon.thtml:210
+#: 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"
@@ -3981,7 +5668,7 @@ msgstr "Odstrániť tento diagram"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Zoskupiť podľa: deň"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Zoskupiť podľa: mesiac"
 
@@ -3989,103 +5676,107 @@ msgstr "Zoskupiť podľa: mesiac"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Zoskupiť podľa: týždeň"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Porovnať podľa týždňov"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "nájdené v rozsahu: %s"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Pridať diagram"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Pridať �alší diagram do tohto grafu"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Skryť celkový po�et"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Zobraziť celkový po�et"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Zakresliť celkový po�et do tohto grafu"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Zobraziť údaje (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Skryť udalosti: %s"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Zobraziť udalosti: %s"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Skryť udalosti Firefoxu"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Zobraziť udalosti Firefoxu"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Zbaliť graf"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Rozbaliť graf"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Zmeniť veľkosť grafu"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Aktívni denní používatelia"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplikácia"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Vlastné"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Prevzatia"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Opera�ný systém"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Stav doplnku"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Súhrn"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Verzia doplnku"
 
@@ -4109,11 +5800,11 @@ msgstr "Neznáme"
 msgid "statistics_longnames_version"
 msgstr "Verzia doplnku"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr "Nedostatok údajov na zobrazenie grafu. Skontrolujte neskôr."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr "Pre doplnok zatiaľ nie sú žiadne údaje. Skontrolujte o niekoľko dní."
 
@@ -4121,11 +5812,11 @@ msgstr "Pre doplnok zatiaľ nie sú žiadne údaje. Skontrolujte o niekoľko dnÃ
 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."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "Štatistika je práve deaktivovaná. Skontrolujte neskôr."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "Na zobrazenie grafov štatistiky je potrebný JavaScript."
 
@@ -4140,36 +5831,36 @@ msgstr "Nastavenie bolo aktualizované!"
 msgid "statistics_pagetitle"
 msgstr "Å tatistika"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Aktívni denní používatelia"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Denne prevzatí"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Zvä�šiť"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Zvä�šiť jeden mesiac"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Zmenšiť"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zmenšiť jeden mesiac"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Denné súhrn štatistiky pre %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Kanál RSS údajov súhrnu"
 
@@ -4206,23 +5897,23 @@ msgstr "Verejná"
 msgid "statistics_settings_access_public_description"
 msgstr "Štatistiku doplnku môže prezerať každý"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Zmeniť nastavenie"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Považujte tieto údaje za dôverné."
 
-#: views/statistics/addon.thtml:233
+#: 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:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Táto štatistika je momentálne <b>verejná</b>"
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Zablokované"
 
@@ -4239,7 +5930,7 @@ msgstr "Uložiť nastavenie"
 msgid "statistics_settings_title"
 msgstr "Nastavenie Å¡tatistiky pre %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Odblokované"
 
@@ -4264,7 +5955,7 @@ msgid "statistics_shortnames_version"
 msgstr "Ver."
 
 #: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:190
+#: views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Priemer prevzatí denne"
 
@@ -4273,45 +5964,45 @@ msgid "statistics_summary_downloads_heading"
 msgstr "Prevzatia"
 
 #: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Prevzatí celkom"
 
 #: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:138
+#: 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:149
-#: views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163
+#: views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Zatiaľ žiadne údaje"
 
 #: views/statistics/rss/summary.thtml:70
-#: views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s dňa: %2$s"
@@ -4321,22 +6012,22 @@ msgid "statistics_summary_updatepings_heading"
 msgstr "Aktívni denní používatelia"
 
 #: views/statistics/rss/summary.thtml:46
-#: views/statistics/addon.thtml:143
+#: 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:147
+#: 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:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
-msgstr "Å tatistika %1$s"
+msgstr "Å tatistika doplnku %1$s"
 
 #: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
@@ -4361,6 +6052,7 @@ 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: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>."
@@ -4378,24 +6070,27 @@ 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: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ť."
 
 # %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: 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:74
 msgid "user_del_error_checkbox"
-msgstr "Pred odstránením ú�tu musíte ozna�iť pole \"Chápem, že...\"."
+msgstr "Pred odstránením ú�tu musíte ozna�iť pole \"Chápem, že…\"."
 
 #: 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: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ť."
@@ -4405,6 +6100,7 @@ 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:93
 msgid "user_del_header_delete_account"
 msgstr "Odstránenie používateľského ú�tu %1$s"
@@ -4426,6 +6122,7 @@ msgid "user_del_reviews_anonymized"
 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: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."
@@ -4439,6 +6136,7 @@ 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:58
 #: views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
@@ -4451,6 +6149,9 @@ msgstr "Odstrániť používateľský ú�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
+#. 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"
@@ -4468,6 +6169,7 @@ msgstr ""
 "-- Tím %2$s Add-ons"
 
 # %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4491,6 +6193,8 @@ msgstr "Ďakujeme, že ste sa pripojili k %s Add-ons"
 
 # 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
 #, php-format
 msgid "user_email_pwreset"
@@ -4516,6 +6220,7 @@ msgid "user_emailchange_error"
 msgstr "Chyba!"
 
 # %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513
 #: controllers/users_controller.php:514
 #, php-format
@@ -4528,6 +6233,7 @@ msgid "user_emailchange_success"
 msgstr "Zmena úspešná!"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4700,12 +6406,14 @@ msgid "user_register_amo_link"
 msgstr "%s Add-ons"
 
 # %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 "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:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4720,12 +6428,14 @@ msgid "user_register_congratulations"
 msgstr "Blahoželáme! Váš ú�et používateľa bol úspešne vytvorený."
 
 # %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."
 
 # %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4789,6 +6499,7 @@ 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:110
 msgid "users_info_reviews_by_user"
 msgstr "Recenzie používateľa %s"
@@ -4800,6 +6511,8 @@ msgstr "Prihlásenie používateľa"
 
 # %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4807,6 +6520,8 @@ msgstr "Doplnok, ktorý hľadáte, je momentálne v Sandboxe. Ak máte ú�et na
 
 # %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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4822,3 +6537,22 @@ msgstr "Vynulovanie používateľského hesla"
 msgid "users_register_pagetitle"
 msgstr "Registrácia nového používateľa"
 
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Posledná verzia je kompatibilná s aplikáciou"
+#~ msgid "addons_share_button_text"
+#~ msgstr "Zdieľať"
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Pridať do Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Odoslať na Facebook"
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Zdieľať na FriendFeed"
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Odoslať na MySpace"
+
+#~ msgid "recaptcha_enter_numbers"
+#~ msgstr "Zadajte <strong>�ísla</strong>, ktoré po�ujete."
diff --git a/site/app/locale/sk/pages/experimental_addons.thtml b/site/app/locale/sk/pages/experimental_addons.thtml
deleted file mode 100644
index 54a442a..0000000
--- a/site/app/locale/sk/pages/experimental_addons.thtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<h1>Experimentálne doplnky</h1>
-
-
-<h2>Čo je experimentálny doplnok?</h2>
-
-<p>Experimentálne doplnky sú ur�ené pre pokro�ilých používateľov na otestovanie predtým, ako
-budú dostupné pre širokú verejnosť. Množstvo doplnkov môže byť vo forme prototypu.
-Experimentálne doplnky môžu byť v testovacej alpha resp. beta verzii alebo tesne pred vydaním, 
-kedy sa testuje kvalita, výkon a jednotlivé funkcie.</p>
-
-<p>Pri inštalovaní experimentálnych doplnkov si treba dávať pozor, pretože zatiaľ neboli testované
-editorom a môžu zaprí�iniť neo�akávané problémy.</p>
-
-
-<h2>Ako na stránke rozoznám experimentálny doplnok?</h2>
-
-<p>Experimentálne doplnky sú ozna�ené nápisom "experimentálne" a pred inštaláciou vyžadujú 
-prihlásenie sa na stránke.</p>
-
-
-<h2>Pre�o sa musím pred inštaláciou experimentálnych doplnkov prihlásiť?</h2>
-
-<p>Stránka s doplnkami vyžaduje prihlásenie sa používateľov pred inštaláciou experimentálnych doplnkov 
-ako pripomienku toho, že tento krok podstupujete na vlastné riziko.</p>
-
-
-<h2>Musím sa prihlásiť alebo potrebujem ú�et na inštalovanie verejných doplnkov?</h2>
-
-<p>Nie. Stránka s doplnkami nevyžaduje mať zriadený ú�et alebo byť prihlásený
-pri inštalácii verejných doplnkov.</p>
-
diff --git a/site/app/locale/sq/LC_MESSAGES/messages.po b/site/app/locale/sq/LC_MESSAGES/messages.po
index 0bf52cd..51148b4 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-01-10 15:12+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"
@@ -15,6 +15,10 @@ msgstr ""
 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 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
@@ -43,38 +47,34 @@ msgstr "Publike"
 msgid "a_header_sandbox"
 msgstr "Bankoprovë"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "U shtua %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Përditësuar më %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "shkarkime gjithsej"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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
+#. %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"
@@ -91,22 +91,22 @@ msgstr "për faqe"
 msgid "addon_list_sortby"
 msgstr "Renditur sipas:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "e këshilluar"
 
-# %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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s nuk është i passhëm për %2$s."
 
-# %1 is the addon name
+#. %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
@@ -115,7 +115,7 @@ msgstr "%1$s nuk është i passhëm për %2$s."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Prapa te %1$s..."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -134,6 +134,7 @@ msgstr "Shqyrtim:"
 msgid "addon_review_add_submit"
 msgstr "Parashtroni shqyrtimin tuaj"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -167,22 +168,24 @@ msgstr "Po"
 msgid "addon_review_delete_header"
 msgstr "Fshije Shqyrtimin"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Shqyrtimi u fshi me sukses."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 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:534
+#. %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."
 
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -193,7 +196,7 @@ msgstr ""
 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.
+#. %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"
@@ -203,16 +206,16 @@ msgstr[0] ""
 msgstr[1] ""
 "Shihni %1$s shqyrtime të mëparshme parashtruar nga %2$s për këtë shtesë."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Shqyrtime për %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -226,13 +229,13 @@ msgstr "Përgjigje Zhvilluesi:"
 msgid "addon_review_saved_successfully"
 msgstr "Shqyrtimi juaj u ruajt me sukses. Faleminderit!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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
+#. %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
@@ -255,11 +258,13 @@ msgstr "Shtesa e Mëparshme"
 msgid "addon_version_permalink"
 msgstr "Lidhje e përhershme për te ky version"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "Versioni më i fundit i përputhshëm me"
+#. %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 "Versioni më i fundit i përputhshëm me %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Shko"
 
@@ -267,29 +272,28 @@ msgstr "Shko"
 msgid "addons_author_tooltip"
 msgstr "Shihni Profilin e Autor-it"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
-#, fuzzy
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
-msgstr "Browse all Themes :: %1$s Add-ons"
+msgstr "Shfletoni tërë Temat :: Shtesa për %1$s"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
-#, fuzzy
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
-msgstr "Browse %1$s Themes :: %2$s Add-ons"
+msgstr "Shfletoni Tema %1$s-i :: Shtesa për %2$s"
 
 #: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Shtoni shqyrtim"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Hollësi të Mëtejshme"
 
@@ -297,11 +301,11 @@ msgstr "Hollësi të Mëtejshme"
 msgid "addons_display_categories"
 msgstr "Kategori"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "shqyrtim i hollësishëm"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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"
@@ -310,143 +314,150 @@ msgstr "S'më pëlqen"
 msgid "addons_display_edit_review"
 msgstr "Përpunoni shqyrtimin tuaj"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Kjo shtesë ka rregulla vetësie."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Komente nga Zhvilluesa"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Faqe Hyrëse"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Shqyrtime"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Asistencë"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Pëlqeje"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Përshkrim i Gjatë"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Më tepër Pamje"
 
-# %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:421
+#. %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
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Shtesa të tjera nga %1$s"
 msgstr[1] "Other add-ons by these authors"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: 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."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: 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."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Vlerësoje"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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."
 
-# %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "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:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Ruaje"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Shihni tërë shqyrtimet (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Historik i Plotë Versioni"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Shihni burimin"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Shihni statistikat"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Si ju duket?"
 
@@ -456,7 +467,7 @@ msgstr "Punon me:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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"
@@ -467,10 +478,11 @@ msgstr "nga"
 msgid "addons_home_feature_head"
 msgstr "Ju Këshillojmë"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -485,7 +497,9 @@ msgstr "Më të rejat:"
 msgid "addons_home_other_applications"
 msgstr "Zbatime të Tjera"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -495,19 +509,20 @@ msgstr "Zbatime të Tjera"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -603,6 +618,7 @@ msgstr "për Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "për Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -623,12 +639,13 @@ msgstr ""
 "Shtojcat janë pakëz ndryshe nga zgjerimet, të cialt ndryshojnë ose shtojnë "
 "diçka te një anë ekzistuese."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Shtojca të Zakonshme për %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Shtojca"
 
@@ -639,6 +656,7 @@ msgstr "Shtojca"
 msgid "addons_plugins_support_documentation"
 msgstr "Dokumentacion Asistence: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -646,24 +664,24 @@ 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 addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Paraparje për %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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!"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Shtesa të Këshilluara"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Shtesa të Këshilluara"
 
@@ -671,7 +689,7 @@ msgstr "Shtesa të Këshilluara"
 msgid "addons_searchengines_additional_resources"
 msgstr "Burime Shtesë"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Qendra e Zhvilluesave Mozilla"
@@ -689,35 +707,35 @@ msgstr ""
 "ç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
+#. %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 "Mësoni se si të %1$s te %2$s."
 
-# link path to search plugins instructions, relative to devmo
+#. 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 "/sq/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:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "krijoni të tuajën"
 
-# %1 is the link to mycroft.mozdev.org
+#. %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 "Shfletoni nëpër më tepër motorë kërkimesh te %1$s"
 
-# link text to mycroft.mozdev.org
+#. 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:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Motorë Kërkimesh"
 
@@ -731,7 +749,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "E çaktivizuar"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Version Jo i Plotë"
 
@@ -769,11 +787,12 @@ 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."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Historik Versionesh me Regjistrime Ndryshimesh"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Historik Versionesh të %1$s"
@@ -786,6 +805,7 @@ msgstr "Shto Grup"
 msgid "admin_group_delete_pagetitle"
 msgstr "Fshi Group"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -911,16 +931,20 @@ msgstr "Shpërfill kontroll versioni"
 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: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>"
 
+#. %1$s is a URL
 #: 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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -933,23 +957,23 @@ 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:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Shtesa sipas Emrash"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Shtesat Më të Reja"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Shtesa Popullore"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Shtesa sipas Vlerësimeve"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Shtesa të Përditësuara së Fundmi"
 
@@ -981,7 +1005,7 @@ msgstr "Të Përditësuarat Rishtas Së Pari"
 msgid "category_extra_mostpopular"
 msgstr "Më Populloret Së Pari"
 
-# %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"
@@ -991,166 +1015,161 @@ msgstr "Shihni Tërë %1$s"
 msgid "collection_not_found"
 msgstr "Nuk u gjet përmbledhje!"
 
+#. %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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
-#, fuzzy
 msgid "compatibility_dashboard_center_header"
-msgstr "Add-on Compatibility Center"
+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: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."
+"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:107
-#, fuzzy
 msgid "compatibility_dashboard_loading"
-msgstr "Loading data..."
+msgstr "Po ngarkohen të dhëna..."
 
 #: views/compatibility/dashboard.thtml:41
-#, fuzzy
 msgid "compatibility_dashboard_main_link"
-msgstr "Back to Main"
+msgstr "Mbrapsht te Kryesorja"
 
 #: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
-#, fuzzy
 msgid "compatibility_dashboard_report"
-msgstr "Add-on Compatibility Report"
+msgstr "Raport Përputhshmërie Shtese"
 
 #: 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"
+msgstr "Të dhëna për Zhvilluesa Shtese"
 
 #: views/compatibility/developers.thtml:64
-#, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
-msgstr "Adjust maxVersion without uploading"
+msgstr "Rregulloni maxVersion pa e ngarkuar"
 
 #: views/compatibility/dashboard.thtml:128
-#, fuzzy
 msgid "compatibility_developers_check_status"
-msgstr "Check Status of My Add-ons"
+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: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."
+"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:118
-#, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
-msgstr "Mozilla Developer Center Logo"
+msgstr "Shenja Dalluese e Qendrës Mozilla të Zhvilluesve"
 
 #: views/compatibility/developers.thtml:71
-#, fuzzy
 msgid "compatibility_developers_no_addons"
-msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
+msgstr "Nuk keni ndonjë shtesë të strehuar te Shtesat Mozilla."
 
 #: views/compatibility/dashboard.thtml:137
 #: views/compatibility/developers.thtml:53
-#, fuzzy
 msgid "compatibility_developers_results"
-msgstr "Add-on Status Check Results"
+msgstr "Përfundime Kontrolli për Gjendje Shtojce"
 
 #: views/compatibility/dashboard.thtml:141
-#, fuzzy
 msgid "compatibility_developers_retrieving"
-msgstr "Retrieving status of hosted add-ons..."
+msgstr "Po shihet gjendja e shtesave të strehuara..."
 
+#. %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
-#, fuzzy
 msgid "compatibility_developers_user_count"
-msgstr "%1$s %2$s users (%3$s&#37; of total)"
+msgstr "%1$s përdoruesa %2$s-i (%3$s&#37; gjithsej)"
 
 #: 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."
+"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:98
-#, fuzzy
 msgid "compatibility_report_detailed_link"
-msgstr "View Detailed Report"
+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: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."
+"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:85
-#, fuzzy
 msgid "compatibility_report_legend_alpha"
-msgstr "Alpha Versions"
+msgstr "Versione Alfa"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
-#, fuzzy
 msgid "compatibility_report_legend_alpha_description"
-msgstr "Add-ons compatible with an alpha version of %1$s"
+msgstr "Shtesa të përputhshme me një version alfa të %1$s-it"
 
 #: views/compatibility/dashboard.thtml:89
-#, fuzzy
 msgid "compatibility_report_legend_beta"
-msgstr "Beta Versions"
+msgstr "Versione Beta"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: 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"
+msgstr ""
+"Shtesa të përputhshme me një version beta ose version kandidat të %1$s-it"
 
 #: views/compatibility/dashboard.thtml:93
-#, fuzzy
 msgid "compatibility_report_legend_latest"
-msgstr "Latest Version"
+msgstr "Version Më i Fundit"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: 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"
+msgstr "Shtesa të përditësuara për montimet më të fundit të %1$s-it"
 
 #: views/compatibility/dashboard.thtml:81
-#, fuzzy
 msgid "compatibility_report_legend_other"
-msgstr "Other Versions"
+msgstr "Versione të Tjera"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
-#, fuzzy
 msgid "compatibility_report_legend_other_description"
-msgstr "Add-ons not compatible with any version of %1$s"
+msgstr "Shtesa të papërputhshme me ndonjë version të %1$s-it"
 
 #: views/compatibility/dashboard.thtml:66
-#, fuzzy
 msgid "compatibility_report_title"
-msgstr "Add-on Compatibility Report"
+msgstr "Raport Përputhshmërie Shtese"
 
 #: 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"
+msgstr "Të dhëna për Përdoruesit e Shtesës"
 
 #: views/compatibility/dashboard.thtml:48
-#, fuzzy
 msgid "compatibility_view_report"
-msgstr "View Compatibility Report"
+msgstr "Shihni Raport Përputhshmërie"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: 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:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "faqe wiki"
 
@@ -1192,23 +1211,35 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Licensës Creative Commons Attribution "
 "2.5</a>."
 
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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, %I:%M %p"
@@ -1234,14 +1265,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1289,36 +1348,36 @@ msgstr "Hapi 5: Sukses"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ndihmë për Parashtrim"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Shtesa u çaktivizua me sukses"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Përpunoni Shtesë"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Shtesa u aktivizua me sukses"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Përshkrim Shtese"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: 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:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Emër Shtese"
 
@@ -1327,40 +1386,298 @@ msgstr "Emër Shtese"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Foto Paraparjeje"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Rregulla Vetësie"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Përmbledhje Shtesash"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Email Asistence"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL Asistence"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Shënime Versioni"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Propozoni Shtesë"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Shtesë e propozuar me sukses!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1383,7 +1700,7 @@ msgstr ""
 "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
+#. %1 is the link to the sandbox information page
 #: views/developers/add_step5.thtml:63
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1394,7 +1711,7 @@ msgstr ""
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "këtu"
 
-# %1 is the "nominate" link
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1417,16 +1734,16 @@ msgstr ""
 "Ngaqë shtesa juaj është e besuar, ky version është miratuar vetvetiu për "
 "zonën publike."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Parashtroni Shtesë"
 
-#: controllers/developers_controller.php:2375
+#: 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
+#. %1 is the link to the preview upload page
 #: views/developers/add_step5.thtml:71
 #, php-format
 msgid "devcp_addon_upload_preview"
@@ -1436,7 +1753,7 @@ msgstr "Mund t'u pëlqejë të %s për të rritur interesin rreth shtesës suaj.
 msgid "devcp_addon_upload_preview_link"
 msgstr "ngarkoni një koment"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1465,10 +1782,102 @@ msgstr "Pasues"
 msgid "devcp_change_addontype"
 msgstr "Ndryshoni lloj shtese:"
 
-#: controllers/developers_controller.php:1402
+#: 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 "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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Shtoni Paraparje"
@@ -1561,6 +1970,7 @@ msgstr "Nuk ka url asistence të dhënë nga zhvilluesi."
 msgid "devcp_details_trusted"
 msgstr "E besuar"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1591,6 +2001,7 @@ msgstr ""
 "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"
@@ -1611,11 +2022,58 @@ msgstr ""
 "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"
+
+#: views/developers/discuss.thtml:57
+msgid "devcp_discuss_allreplies_header"
+msgstr "Përgjigje"
+
+#. 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 ""
+"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."
+
+#. %1 is the add-on name
+#: views/developers/discuss.thtml:43
+msgid "devcp_discuss_pagetitle"
+msgstr "Jepni Më Tepër të Dhëna për Shqyrtim Shtese të %1$s"
+
+#. submit button text
+#: views/developers/discuss.thtml:79
+msgid "devcp_discuss_submit_reply"
+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."
+
+#. 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 "shkruajtur nga %1$s më %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Shtoni Autor"
@@ -1628,10 +2086,297 @@ msgstr "Vendndodhje Email e Autorit"
 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 "Add New Author"
+
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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ë"
@@ -1697,6 +2442,206 @@ msgstr "Vendore Objektiv"
 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 "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 "Përditësoni"
@@ -1707,11 +2652,66 @@ 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 "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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Shtesa të Trajtuara"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1720,7 +2720,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Shqyrtim i Miratuar (%s)"
 msgstr[1] "Shqyrtime të Miratuara (%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
 #, php-format
@@ -1729,7 +2729,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Shtesë e Propozuar (%s)"
 msgstr[1] "Shtesa të Propozuara (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1742,8 +2742,8 @@ msgstr[1] "Përditësime në Radhë (%s)"
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "Kartelat me shenjë do të fshihen."
 
-# %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"
@@ -1769,29 +2769,30 @@ msgstr "Shënime për Shqyrtyesat"
 msgid "devcp_editversion_submit_update"
 msgstr "Përditëso"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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 "
@@ -1800,19 +2801,33 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Ju lutem shihni %s për të dhëna."
 
+#. 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 "këtë faqe"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+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."
+
+#. %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"
@@ -1820,7 +2835,7 @@ 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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Jo tërë GUID-et e kartelës përputhen"
 
@@ -1849,6 +2864,8 @@ msgstr "Tejkalon madhësinë maksimum për ngarkimet"
 msgid "devcp_error_http_nofile"
 msgstr "Nuk u ngarkua kartelë"
 
+#. %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"
@@ -1856,14 +2873,15 @@ msgstr ""
 "Kjo prapashtesë kartele (%s) nuk lejohet për një ikonë. Ju lutem përdorni "
 "një nga vijueset: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Pa install.rdf të pranishme."
 
@@ -1871,21 +2889,26 @@ msgstr "Pa install.rdf të pranishme."
 msgid "devcp_error_install_manifest"
 msgstr "U gjetën gabimet vijues te install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 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.
 #: controllers/components/developers.php:569
 #: controllers/components/developers.php:581
 #, php-format
 msgid "devcp_error_invalid_appversion"
 msgstr "%s nuk është version i vlefshëm për %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "ID-ja e kësaj shtese është e pavlefshme: %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"
@@ -1906,6 +2929,7 @@ 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
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1915,6 +2939,7 @@ msgstr "Ndodhi gabimi vijues gjatë përtypjes së install.rdf: %s"
 msgid "devcp_error_move_file"
 msgstr "Nuk lëviza dot kartelën"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1937,15 +2962,15 @@ 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:2718
+#: 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:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "Nuk mund të propozoni një shtesë paraqarkullim."
 
-#: controllers/developers_controller.php:2704
+#: 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ë."
 
@@ -1957,6 +2982,8 @@ msgstr "Ju lutem përzgjidhni të paktën një kategori."
 msgid "devcp_error_one_user"
 msgstr "Duhet të ketë të paktën një autor për këtë shtesë."
 
+#. %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"
@@ -1964,13 +2991,13 @@ msgstr ""
 "Kjo prapashtesë kartelash (%s) nuk lejohet për paraparjet. Ju lutem përdorni "
 "një nga vijueset: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Nuk keni leje të përditësoni këtë shtesë."
 
@@ -1986,7 +3013,7 @@ 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Ju lutem ngarkoni një kartelë."
@@ -2209,7 +3236,7 @@ msgstr "Shtesat e Mia"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Pjesë të Përkthyera"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2254,33 +3281,68 @@ msgstr "Parashtroni Shtesë"
 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: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 "Kthehuni te hollësi shtese"
 
-# %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 "Propozoni %s"
 
-# %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 "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: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 ""
 "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)
+#. %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"
@@ -2296,9 +3358,14 @@ msgstr ""
 "Kalimi i kësaj si paraparje parazgjedhje do të heqë gjendjen parazgjedhje "
 "nga paraparja parazgjedhje e çastit."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2327,6 +3394,60 @@ msgstr "Përpunoni Paraparje"
 msgid "devcp_preview_updated_successfully"
 msgstr "Paraparja u ngarkua me sukses."
 
+#: 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 ""
@@ -2338,10 +3459,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Shtoni Paraparje"
 
+#: 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 "Përpunoni Paraparje"
 
+#: 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 "Kartelë Paraparje"
@@ -2350,6 +3481,34 @@ msgstr "Kartelë Paraparje"
 msgid "devcp_previews_label_makedefault"
 msgstr "Vendose këtë si pamje paraparjeje parazgjedhje"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Fshi Paraparje"
@@ -2366,45 +3525,160 @@ msgstr "Përpunoni Paraparje"
 msgid "devcp_previews_submit_upload"
 msgstr "Ngarkoni Paraparje"
 
+#: 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 "E pasaktë?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Jeni i sigurtë se doni të fshihet kjo kartelë?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
 
+#: 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 "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
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Përdorues Aktivë të Përditshëm"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> Shkarkime Gjithsej"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Shkarkime të Përjavshme"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "Parashtrimi i shtesave është i çaktivizuar për çastin. Ju lutem hidhni një "
@@ -2412,13 +3686,13 @@ msgstr ""
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Pranoj"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Nuk e Pranoj"
 
@@ -2434,11 +3708,11 @@ msgstr "Çaktivizuar"
 msgid "devcp_summary_header_trusted"
 msgstr "E besuar"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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 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"
@@ -2448,7 +3722,7 @@ msgstr "Nuk keni ndonjë shtesë. Klikoni %s për të parashtruar një të tillÃ
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "këtu"
 
-# %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"
@@ -2458,30 +3732,668 @@ msgstr "Ju lutem sigurohuni të %s për temën tuaj."
 msgid "devcp_theme_upload_preview_link"
 msgstr "ngarkoni një paraparje"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Ju lutem shihni %s për të dhëna."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "këtë faqe"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Përpunoni Version"
 
-#: controllers/developers_controller.php:2572
+#: 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 "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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Kjo shtesë është çaktivizuar"
 
+#: controllers/components/editors.php:57
+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 "This file is not pending review."
+
+#. Actions are, for example: approving or rejecting
+#: controllers/components/editors.php:79
+#: controllers/components/editors.php:182
+msgid "editor_review_error_no_action"
+msgstr "Ju lutem përzgjidhni një veprim shqyrtimi."
+
+#: controllers/components/editors.php:192
+msgid "editor_review_error_no_applications"
+msgstr "Ju lutem jepni zbatimin me të cilin e provuat."
+
+#. 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 "Ju lutem jepni komente shqyrtimi."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Ju lutem përzgjidhni të paktën një kartelë për shqyrtim."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "Ju lutem jepni sistemet operative ku e provuat."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filtro"
@@ -2490,7 +4402,7 @@ msgstr "Filtro"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtro sipas llojesh/veprimi"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Regjistër Ngjarjesh"
 
@@ -2542,6 +4454,7 @@ msgstr "Fshih Komente"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Shfaq Komente"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2551,7 +4464,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Regjistër Shqyrtimesh"
 
@@ -2575,24 +4488,24 @@ msgstr "Veprimtari Redaktori së Fundmi"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Shqyrtime Gjithsej"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Shqyrtoni Shtesë"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Ju lutem plotësoni kutitë vijuese:"
 
-#: controllers/editors_controller.php:461
+#: 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:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Nuk lejohen shqyrtime nga vetja."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "\"Software\" i Jashtëm"
 
@@ -2604,39 +4517,39 @@ msgstr "Shto karakteristikë"
 msgid "editors_featured_add_feature_submit"
 msgstr "Shto"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Karakteristika u hoq me sukses."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Shtesë e Trajtuar"
 
@@ -2669,39 +4582,40 @@ msgid "editors_notice_filter_session"
 msgstr ""
 "Këta filtra do të jenë në punë për këtë sesion ose derisa të shfuqizohen."
 
-# %1 is the queue mode
+#. %1 is the queue mode
 #: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 ditë"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 orë"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minutë"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Mjete Redaktorësh"
 
-#: controllers/editors_controller.php:286
+#. %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 "vetëm %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Paraqarkullim"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2715,19 +4629,23 @@ msgstr "Pastro"
 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ë."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Veprim për Shqyrtime"
 
+#: views/editors/review.thtml:153
+msgid "editors_review_action_info"
+msgstr "Kërkoni Më Tepër të Dhëna"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Kaloje në Publik"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Kërko Super-Shqyrtim"
 
@@ -2735,34 +4653,41 @@ msgstr "Kërko Super-Shqyrtim"
 msgid "editors_review_action_sandbox"
 msgstr "Mbaje në Bankoprovë"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Komente Shqyrtimi"
 
-#: views/editors/review.thtml:167
+#: 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."
+
+#: 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."
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Kjo do ta mbajë shtesën në bankoprovë."
 
-#: views/editors/review.thtml:159
+#: 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."
 
-#: views/editors/review.thtml:162
+#: 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."
 
-#: views/editors/review.thtml:174
+#: 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ë "
@@ -2790,15 +4715,15 @@ msgstr "Kategori:"
 msgid "editors_review_header_compatibility"
 msgstr "Përputhshmëri:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Përshkrim"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Komente Zhvilluesish"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -2806,138 +4731,164 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Kartela:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Historik Objekti"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Mesazh Propozimi"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Paraparje"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Rregulla Vetësie"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Shqyrtoni %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Shënime për Shqyrtuesin"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Përmbledhje"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Shënime Versioni"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Përgjigjuni"
+
+#: views/elements/developers/editors_review_history_item.thtml:78
+msgid "editors_review_history_info_request"
+msgstr "Kërkesë Për të Dhëna"
+
+#: views/elements/developers/editors_review_history_item.thtml:62
+#: views/editors/reviewlog.thtml:77
 msgid "editors_review_history_nominated_adminreview"
 msgstr "Shqyrtim Administratori"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Propozimi u Miratua/Publike"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Propozimi u Mohua/Bankoprovë"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Nuk u gjetën shqyrtime të mëparshme."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Shqyrtim Administratori"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Miratuar/Publike"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "E papranuar/Bankoprovë"
 
-#: views/editors/review.thtml:198
+#. 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] "Shfaqi/Fshihi Përgjigjet (%1$s)"
+msgstr[1] "Shfaqi/Fshihi Përgjigjet (%1$s)"
+
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Zbatime:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "ose përzgjidhni një përgjigje të konservuar:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Komente:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sisteme Operativë:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Krye"
 
 #: views/editors/review.thtml:45
-#, fuzzy
 msgid "editors_review_next_link"
-msgstr "next &raquo;"
+msgstr "pasuesja &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Nuk u gjetën paraparje."
 
 #: views/editors/review.thtml:44
-#, fuzzy
 msgid "editors_review_previous_link"
-msgstr "&laquo; prev"
+msgstr "&laquo; e mëparshmja"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %1 is the add-ons rank in the queue, %2 is the total queue length
 #: views/editors/review.thtml:43
-#, fuzzy
 msgid "editors_review_rank_in_queue"
-msgstr "<strong># %1$s</strong> of %2$s in queue"
+msgstr "<strong># %1$s</strong> nga %2$s në radhë"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Përpunoni Veprim"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Veprim"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Komente"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Datë"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Shqyrtues"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Version/Kartelë"
 
-#: controllers/editors_controller.php:411
+#: 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)"
+
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Shqyrtimi u krye me sukses."
 
@@ -2961,7 +4912,7 @@ msgstr "Veprim"
 msgid "editors_reviews_in_reply_to"
 msgstr "Në përgjigje të:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Shqyrtimet u kryen me sukses."
 
@@ -2973,23 +4924,23 @@ msgstr "Nuk ka shqyrtime në pritje për miratim."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Përpunoni Shqyrtime"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Për një \"Site\" të Dhënë"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "I ri"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Përditësuar"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Zbatim i Provuar"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistem Operativ i Provuar"
 
@@ -3030,17 +4981,20 @@ msgstr "Platforma"
 msgid "editors_th_submissiontypes"
 msgstr "Lloje Parashtrimi"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s ditë"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s orë"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minuta"
@@ -3049,8 +5003,8 @@ msgstr "%s minuta"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Hyrje e Mohuar"
 
@@ -3058,12 +5012,13 @@ msgstr "Hyrje e Mohuar"
 msgid "error_access_denied_message"
 msgstr "Nuk jeni të autorizuar të shihni këtë faqe."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3073,18 +5028,19 @@ msgstr "Nuk jeni të autorizuar të shihni këtë faqe."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Shtesë që nuk gjendet!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Kjo shtesë nuk mund të shihet këtu."
 
@@ -3092,7 +5048,7 @@ msgstr "Kjo shtesë nuk mund të shihet këtu."
 msgid "error_addon_selfreview"
 msgstr "Nuk mund shqyrtoni shtesën tuaj."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Nuk ka shtesa në këtë kategori!"
 
@@ -3114,24 +5070,25 @@ msgstr "Kjo nuk është një vendndodhje email e vlefshme."
 msgid "error_field_required"
 msgstr "Kjo fushë nuk mund të lihet bosh."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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ë!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Gabim kartele: %s nuk ekziston."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3148,16 +5105,18 @@ 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3175,7 +5134,7 @@ msgstr "Shënim"
 msgid "error_preview_notfound"
 msgstr "Nuk u gjet paraparje!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Duhet të përzgjidhni një vlerësim."
 
@@ -3228,8 +5187,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Emër përdoruesi ose fjalëkalim gabim!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Nuk u gjet version!"
 
@@ -3241,13 +5200,14 @@ msgstr "U dha fjalëkalim i gabuar!"
 msgid "feature_learnmore"
 msgstr "Mësoni më tepër"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Mësoni më tepër rreth %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3259,6 +5219,40 @@ msgstr[1] "%1$s shqyrtime"
 msgid "feature_view_more_from_category"
 msgstr "Shihni më tepër prej"
 
+#. 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 "Mbrapsht te shtesa"
+
+#. 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 "Zgjeroji të tëra"
+
+#. 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 "Mbrapsh te shqyrtimi"
+
+#. 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 :: Shfletues Kartelash :: Shtesa %2$s-i"
+
+#. 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Tërë të drejtat të rezervuara."
@@ -3295,7 +5289,7 @@ msgstr "Gjuhë të tjera:"
 msgid "footer_privacy_policy"
 msgstr "Rregulla Vetësie"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Ruaj"
 
@@ -3303,7 +5297,7 @@ msgstr "Ruaj"
 msgid "general_addontype_dict"
 msgstr "Fjalor"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Fjalorë"
@@ -3312,7 +5306,7 @@ msgstr "Fjalorë"
 msgid "general_addontype_extension"
 msgstr "Zgjerim"
 
-# 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Zgjerime"
@@ -3321,7 +5315,7 @@ msgstr "Zgjerime"
 msgid "general_addontype_lpaddon"
 msgstr "Paketë Gjuhësore (Shtesë)"
 
-# 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Paketa Gjuhësore (Shtesë)"
@@ -3330,7 +5324,7 @@ msgstr "Paketa Gjuhësore (Shtesë)"
 msgid "general_addontype_lpapp"
 msgstr "Paketë Gjuhësore (Zbatim)"
 
-# 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Paketa Gjuhësore (Zbatim)"
@@ -3339,7 +5333,7 @@ msgstr "Paketa Gjuhësore (Zbatim)"
 msgid "general_addontype_plugin"
 msgstr "Shtojcë"
 
-# 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Shtojca"
@@ -3348,7 +5342,7 @@ msgstr "Shtojca"
 msgid "general_addontype_search"
 msgstr "Motor Kërkimi"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Motorë Kërkimesh"
@@ -3357,11 +5351,12 @@ msgstr "Motorë Kërkimesh"
 msgid "general_addontype_theme"
 msgstr "Temë"
 
-# 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Tema"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3392,12 +5387,12 @@ msgid "header_navlink_addons"
 msgstr "Shtesa"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Dilni"
 
@@ -3405,36 +5400,41 @@ msgstr "Dilni"
 msgid "header_navlink_myaccount"
 msgstr "Llogaria Ime"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Regjistrohuni"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Paraparje Pamjeje për %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/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">Hyni</a> që të instaloni këtë shtesë"
 
+#. %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 "Shtoje te %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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3457,7 +5457,7 @@ msgid "langtools_download_langpack"
 msgstr "Shkarkoni Paketë Gjuhësore"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Fjalorë dhe Paketa Gjuhësore"
 
@@ -3513,7 +5513,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3546,7 +5550,7 @@ msgstr "Tema"
 msgid "other_apps_tooltip"
 msgstr "Gjej shtesa për zbatime të tjera"
 
-# In a user list: user 1, user 2, "others"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "të tjera"
@@ -3559,36 +5563,34 @@ msgstr "Versione Zbatimesh"
 msgid "page_title_credits"
 msgstr "Kredite"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Shtesa Eksperimentale"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
+msgstr "Pyetje të Bëra Shpesh (FAQ)"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "FAQ Modernizoni Firefox-in tuaj"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Rregulla Shtesash"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Rregulla Vetësie Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Udhëzuesa Shqyrtimesh"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Sistemi Bankoprovë i Shqyrtimeve"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Ndihmë për Parashtrime"
 
@@ -3607,6 +5609,7 @@ msgstr ""
 "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:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3614,6 +5617,8 @@ 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:92
 msgid "pages_appversions_required_files_link"
 msgstr "këtu"
@@ -3622,7 +5627,6 @@ msgstr "këtu"
 msgid "pages_appversions_versions"
 msgstr "Versione"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Mbrapsht te faqja e mëparshme"
 
@@ -3634,7 +5638,7 @@ msgstr "Faqe të Dhënash Bankoprove"
 msgid "pagination_next_page"
 msgstr "pasues"
 
-# %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"
@@ -3658,16 +5662,16 @@ msgstr "Jepni këtu përgjigjent tuaj:"
 msgid "recaptcha_enter_whatyouhear"
 msgstr "Ju lutem, shtypni këtu atë çka dëgjoni."
 
-# %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 ""
 "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
+#. %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 ""
@@ -3682,7 +5686,7 @@ msgstr "Jeni qenie njerëzore?"
 msgid "recaptcha_whatsthis"
 msgstr "Ç'është kjo?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Gabim në flamurëzimin e këtij shqyrtimi!"
 
@@ -3707,7 +5711,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam ose përndryshe lëndë jo nga shqyrtime"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Faleminderit; ky shqyrtim u flamurëzua për miratim nga botuesi."
 
@@ -3721,7 +5725,7 @@ 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
+#. %1 is the URL of the support section, %2 for the review guidelines
 #: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3740,21 +5744,22 @@ msgstr ""
 "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:54 views/reviews/display.thtml:54
 #: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Shqyrtime %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Shtesa të Trajtuara"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Shtesat më të Reja"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Shtesa të Përditësuara"
 
@@ -3791,6 +5796,7 @@ msgstr "Tërë Motorët e Kërkimeve"
 msgid "search_landing_browse_search_engines"
 msgstr "Shfletoni Motorë Kërkimesh"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3810,12 +5816,13 @@ msgstr "Kërkoni në Shtesa"
 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:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Përfundime kërkimi për: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Mjete Admin"
 
@@ -3823,7 +5830,7 @@ msgstr "Mjete Admin"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Mjete Zhvilluesi"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Mjete Përpunuesi"
 
@@ -3831,6 +5838,7 @@ msgstr "Mjete Përpunuesi"
 msgid "sidebar_navlink_welcome"
 msgstr "Mirësevini"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3854,7 +5862,7 @@ msgstr "Shtesat Më Të Reja"
 
 #: views/elements/pitch.thtml:49
 msgid "sidebar_pitch_search"
-msgstr "Kërkoni Shtojcë"
+msgstr "Shtojcë Kërkimesh"
 
 #: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
@@ -3868,6 +5876,7 @@ msgstr "Temë"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Shtesa të Përditësuara"
 
+#. %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
@@ -3879,7 +5888,7 @@ msgstr "%1$s KB"
 msgid "stars_not_yet_rated"
 msgstr "Ende e pavlerësuar"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3897,24 +5906,32 @@ msgstr "Mjete Zhvilluesi"
 msgid "statistics_addon_switch"
 msgstr "Këmbe Shtesën"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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."
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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:147 views/statistics/addon.thtml:158
+#: 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 "%1$s të krijuara"
 
+#. %1$s is an application name and version.  Example:  Firefox 3.5
 #: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3956,10 +5973,9 @@ msgstr "Pult Statistikash"
 msgid "statistics_index_view_button"
 msgstr "Shihni Statistika"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
-#, fuzzy
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
-msgstr "View this table in CSV format"
+msgstr "Shiheni këtë tabelë në formatin CSV"
 
 #: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
@@ -3970,117 +5986,118 @@ msgid "statistics_js_dropdowns_removeplot"
 msgstr "Hiqe këtë kurbë"
 
 #: controllers/statistics_controller.php:224
-#, fuzzy
 msgid "statistics_js_groupby_selector_date"
-msgstr "Group by: Day"
+msgstr "Grupoji sipas: Ditësh"
 
-#: controllers/statistics_controller.php:226
-#, fuzzy
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
-msgstr "Group by: Month"
+msgstr "Grupoji sipas: Muajsh"
 
 #: controllers/statistics_controller.php:225
-#, fuzzy
 msgid "statistics_js_groupby_selector_week"
-msgstr "Group by: Week"
+msgstr "Grupoji sipas: Javësh"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Krahasoji sipas: Javësh"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "U gjetën %s te intervali"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Shtoni Kurbë"
 
-#: controllers/statistics_controller.php:246
+#: 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:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Shfaqe Numërimin për Gjithsej"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Fshihe Numërimin për Gjithsej"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Shihni të Dhëna (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Fshih Ngjarje %s"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Shfaq Ngjarje %s"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Fshih Ngjarje Firefox"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Shfaq Ngjarje Firefox"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Tkurre Grafikun"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Zgjeroje Grafikun"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Ripërmaso grafikun"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Përdoruesa të Përditshëm Aktivë"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Zbatim"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Vetjak"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Shkarkime"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistem Operativ"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Gjendje Shtese"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Përmbledhje"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Version Shtese"
 
@@ -4104,13 +6121,13 @@ msgstr "E panjohur"
 msgid "statistics_longnames_version"
 msgstr "Version Shtese"
 
-#: views/statistics/addon.thtml:104
+#: 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ë."
 
-#: views/statistics/addon.thtml:116
+#: 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 "
@@ -4123,13 +6140,13 @@ msgstr ""
 "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:122
+#: 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ë."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "Për të parë grafikët e Pultit të Statistikave nevojitet JavaScript."
 
@@ -4144,36 +6161,36 @@ msgstr "Rregullimet tuaja u përditësuan!"
 msgid "statistics_pagetitle"
 msgstr "Pult Statistikash"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Përdoruesa Aktivë të Përditshëm"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Shkarkime të Përditshme"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Zmadhoje"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Zmadhoje me një muaj"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Zvogëloje"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zvogëloje me një muaj"
 
-#: controllers/statistics_controller.php:258
+#: 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/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "Prurje RSS për të dhënat e përmbledhjes"
 
@@ -4213,23 +6230,23 @@ msgstr "Publike"
 msgid "statistics_settings_access_public_description"
 msgstr "Statistikat e kësaj shtese mund t'i shohë kushdo"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Ndryshoni Rregullimet"
 
-#: views/statistics/addon.thtml:241
+#: 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:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Ky pult, hëpërhë, është <b>vetjak</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Ky pult, për çastin, është <b>publik</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Kyçur"
 
@@ -4246,7 +6263,7 @@ msgstr "Ruaji Rregullimet"
 msgid "statistics_settings_title"
 msgstr "Rregullime Pulti Statistikash për %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Çkyçur"
 
@@ -4270,7 +6287,7 @@ msgstr "Pnj"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Shkarkime të Përditshme Mesatarisht"
 
@@ -4278,37 +6295,37 @@ msgstr "Shkarkime të Përditshme Mesatarisht"
 msgid "statistics_summary_downloads_heading"
 msgstr "Shkarkime"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149 views/statistics/addon.thtml:169
+#: 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:70 views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: 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"
@@ -4317,17 +6334,17 @@ 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:143
+#: 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:147
+#: 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/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Statistika %1$s"
@@ -4352,7 +6369,7 @@ msgstr "Ndryshoni fjalëkalimin"
 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
+#. %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 ""
@@ -4372,7 +6389,7 @@ msgstr "Ripohoni Fjalëkalimin"
 msgid "user_del_deletenow"
 msgstr "Fshije tani llogarinë time si përdorues"
 
-# %1 is the URL of the user's info page
+#. %1 is the URL of the user's info page
 #: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4382,7 +6399,7 @@ msgstr ""
 "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
+#. %1 is a link to the amo-editors mailing list
 #: 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."
@@ -4398,7 +6415,7 @@ msgid "user_del_error_password"
 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
+#. %1 is a link to the amo-admins mailing list
 #: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4409,7 +6426,7 @@ msgstr ""
 msgid "user_del_header_confirm_deletion"
 msgstr "Ripohoni fshirjen e llogarisë"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Fshi Llogarinë e Përdoruesit %1$s"
@@ -4434,7 +6451,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4450,7 +6467,7 @@ msgstr "E kam të qartë që ky hap nuk mund të zhbëhet."
 msgid "user_deleted_nickname"
 msgstr "Përdoruesi u Fshi"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4463,9 +6480,9 @@ msgstr ""
 msgid "user_edit_delete_user"
 msgstr "Fshi llogari përdoruesi"
 
-# 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4486,7 +6503,7 @@ msgstr ""
 "Ju faleminderit që ju bashkuat Shtesave %2$s\n"
 "-- Ekipi i Shtesave %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4511,8 +6528,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Faleminderit që ju bashkuat Shtesave %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
 #, php-format
 msgid "user_email_pwreset"
@@ -4539,7 +6556,7 @@ msgstr "Ricaktoni fjalëkalimin tuaj për te Shtesa %s"
 msgid "user_emailchange_error"
 msgstr "Gabim!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4549,7 +6566,7 @@ msgstr "Ju lutem ripohoni ndryshimin e vendndodhjes tuaj email te Shtesa %1$s"
 msgid "user_emailchange_success"
 msgstr "Sukses!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4719,7 +6736,7 @@ msgstr "Dërgo lidhje ricaktimi fjalëkalimi"
 msgid "user_register_amo_link"
 msgstr "Shtesa %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"
@@ -4727,7 +6744,7 @@ 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
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4744,7 +6761,7 @@ msgstr "ridërgo mesazhin e ripohimit"
 msgid "user_register_congratulations"
 msgstr "Përgëzime! Llogaria juaj e përdoruesit u krijua me sukses."
 
-# %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"
@@ -4753,7 +6770,7 @@ msgstr ""
 "\"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
+#. %1 is the link to the Mozilla Add-ons front page
 #: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
@@ -4813,18 +6830,17 @@ msgstr "Nofkë"
 msgid "users_info_pagetitle"
 msgstr "Të dhëna Përdoruesi për %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
-#, fuzzy
 msgid "users_info_reviews_by_user"
-msgstr "Reviews by %s"
+msgstr "Shqyrtime nga %s"
 
 #: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Hyrje përdoruesi"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4833,8 +6849,8 @@ msgstr ""
 "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
+#. %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"
@@ -4850,3 +6866,37 @@ msgstr "Ricaktim Fjalëkalimi Përdoruesi"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Regjistrim Përdoruesi të Ri"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Versioni më i fundit i përputhshëm me"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "recaptcha_enter_numbers"
+#~ msgstr "Ju lutem jepni më poshtë <strong>numrat</strong> që po dëgjoni."K
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
diff --git a/site/app/locale/sv_SE/LC_MESSAGES/messages.po b/site/app/locale/sv_SE/LC_MESSAGES/messages.po
index 17ab05f..f56236b 100644
--- a/site/app/locale/sv_SE/LC_MESSAGES/messages.po
+++ b/site/app/locale/sv_SE/LC_MESSAGES/messages.po
@@ -21,6 +21,10 @@ msgstr ""
 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 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
@@ -49,38 +53,34 @@ msgstr "Publikt"
 msgid "a_header_sandbox"
 msgstr "Sandlåda"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, fuzzy, php-format
-msgid "added"
-msgstr "Added %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Uppdaterad %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "totala antal hämtningar"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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
+#. %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"
@@ -97,22 +97,22 @@ msgstr "per sida"
 msgid "addon_list_sortby"
 msgstr "Sortera på:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "rekommenderat"
 
-# %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:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s är inte tillgänglig för %2$s."
 
-# %1 is the addon name
+#. %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
@@ -121,7 +121,7 @@ msgstr "%1$s är inte tillgänglig för %2$s."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Tillbaka till %1$s..."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -140,6 +140,7 @@ msgstr "Recension:"
 msgid "addon_review_add_submit"
 msgstr "Skicka in din recension"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -173,23 +174,25 @@ msgstr "Ja"
 msgid "addon_review_delete_header"
 msgstr "Ta bort recension"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Recensionen är nu borttagen."
 
+#. %s is the name of the add-on
 #: 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:534
+#. %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
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -200,7 +203,7 @@ msgstr ""
 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.
+#. %1 is the review count, %2 is the nickname or full name of the user.
 #: views/reviews/display.thtml:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
@@ -208,16 +211,16 @@ 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 addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "Recensioner av %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -231,13 +234,13 @@ msgstr "Svar från utvecklaren:"
 msgid "addon_review_saved_successfully"
 msgstr "Din recension sparades, tack så mycket!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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
+#. %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
@@ -262,11 +265,14 @@ msgstr "Previous Add-on"
 msgid "addon_version_permalink"
 msgstr "Permanent länk till denna version"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "Senaste version som är kompatibel med"
+#. %1 is the current Application name (e.g. Firefox)
+#. %2 is the Application's version number
+#: 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:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Skicka in"
 
@@ -274,20 +280,21 @@ msgstr "Skicka in"
 msgid "addons_author_tooltip"
 msgstr "Se författarens profil"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
@@ -296,7 +303,7 @@ msgstr "Browse %1$s Themes :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "Lägg till recension"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Avancerad information"
 
@@ -304,11 +311,11 @@ msgstr "Avancerad information"
 msgid "addons_display_categories"
 msgstr "Kategorier"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "utförlig recension"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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"
@@ -317,143 +324,150 @@ msgstr "Gillar den inte"
 msgid "addons_display_edit_review"
 msgstr "Redigera din recension"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Detta tillägg har integritetsriktlinjer."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Utvecklarkommentarer"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Hemsida"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Recensioner"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Hjälp"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Gillar det"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Utförlig beskrivning"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Fler bilder"
 
-# %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:421
+#. %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
 #, 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] "Other add-ons by these authors"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: 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."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "Hjälp för denna utökning ges av utecklaren på %s eller genom att skicka e-"
 "post till %s."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Betygsätt"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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 "
 "tillgänglig för tilläggsutvecklare och de kan behöva kontakta dig för att "
 "lösa ditt problem."
 
-# %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "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:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Spara"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Visa alla recensioner (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Visa alla versioner"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Komplett versionshistorik"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Visa källkoden"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Visa statistik"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Vad tycker du?"
 
@@ -463,7 +477,7 @@ msgstr "Fungerar med:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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"
@@ -474,10 +488,11 @@ msgstr "av"
 msgid "addons_home_feature_head"
 msgstr "Vi rekommenderar"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -492,7 +507,9 @@ msgstr "Nyaste:"
 msgid "addons_home_other_applications"
 msgstr "Andra applikationer"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -502,19 +519,20 @@ msgstr "Andra applikationer"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -610,6 +628,7 @@ msgstr "för Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "för Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -630,12 +649,13 @@ msgstr ""
 "skiljer sig litefrån utökningar, som ändrar eller utökar existerande "
 "funktionalitet."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Vanliga insticksprogram för %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Insticksprogram"
 
@@ -646,6 +666,7 @@ msgstr "Insticksprogram"
 msgid "addons_plugins_support_documentation"
 msgstr "Hjälpdokumentation: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -653,24 +674,24 @@ msgstr ""
 "%s kräver att du accepterar följande användaravtal innan installationen kan "
 "fortsätta:"
 
-# %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Förhandsvisningar för %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Rekommenderade tillägg"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Rekommenderat tillägg"
 
@@ -678,7 +699,7 @@ msgstr "Rekommenderat tillägg"
 msgid "addons_searchengines_additional_resources"
 msgstr "Ytterligare resurser"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Utvecklarcenter"
@@ -696,35 +717,35 @@ msgstr ""
 "det avstängt. Slå på JavaScript innan du försöker installera någon av "
 "sökmotorerna nedan."
 
-# %1 is "make your own" link
-# %2 is MDC link
+#. %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 "Lär hur du %1$s på %2$s."
 
-# link path to search plugins instructions, relative to devmo
+#. 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 "/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:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "gör din egen"
 
-# %1 is the link to mycroft.mozdev.org
+#. %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 "Bläddra bland fler sökmotorer på %1$s"
 
-# link text to mycroft.mozdev.org
+#. 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:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Sökmotorer"
 
@@ -738,7 +759,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Disabled"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 #, fuzzy
 msgid "addons_status_incomplete"
 msgstr "Incomplete Version"
@@ -782,11 +803,12 @@ msgstr ""
 "Dessa versioner visas för referens och teständamål. Du bör alltid använda "
 "den senaste versionen av ett tillägg."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Versionshistorik med ändringsloggar"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s versionshistorik"
@@ -799,6 +821,7 @@ msgstr "Lägg till grupp"
 msgid "admin_group_delete_pagetitle"
 msgstr "Ta bort grupp"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -925,6 +948,7 @@ msgstr "Ignorera versionskontroll"
 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:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
@@ -932,10 +956,13 @@ 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: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:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
@@ -948,23 +975,23 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Uppgradera Firefox</a> för att använda "
 "detta tillägg"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Tillägg sorterade på namn"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Nyaste tilläggen"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Populära tillägg"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Tillägg sorterade på betyg"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Nyligen uppdaterade tillägg"
 
@@ -996,7 +1023,7 @@ msgstr "Senast uppdaterat först"
 msgid "category_extra_mostpopular"
 msgstr "Mest populära först"
 
-# %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"
@@ -1007,12 +1034,20 @@ msgstr "Visa alla %1$s"
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
+#. %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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 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:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
@@ -1052,6 +1087,8 @@ 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
 #: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
@@ -1080,6 +1117,10 @@ 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)
 #: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
@@ -1097,6 +1138,8 @@ msgstr ""
 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:69
 #, fuzzy
 msgid "compatibility_report_intro"
@@ -1110,6 +1153,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
@@ -1120,6 +1164,7 @@ 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
 #: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
@@ -1130,6 +1175,7 @@ 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
 #: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
@@ -1140,6 +1186,7 @@ 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
 #: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
@@ -1161,12 +1208,13 @@ msgstr "Information for Add-on Users"
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: 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:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wikisida"
 
@@ -1208,26 +1256,35 @@ msgstr ""
 "\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution "
 "2.5 License</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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)
+#. 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"
@@ -1253,14 +1310,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1308,36 +1393,36 @@ msgstr "Steg 5: Klart"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Hjälp med inskickningsprocessen"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Tillägget inaktiverat"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Redigera tillägg"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Tillägget aktiverades"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Tilläggets beskrivning"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "Användarvillkor"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Tilläggets hemsida"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Tilläggets namn"
 
@@ -1346,40 +1431,298 @@ msgstr "Tilläggets namn"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Förhandsgranska bildtext"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Integritetsriktlinjer"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Tilläggets sammanfattning"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "E-postaddress för hjälp"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL för hjälp"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: 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:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Nominera tillägg"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Tillägget nominerades!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1402,7 +1745,7 @@ msgstr ""
 "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
+#. %1 is the link to the sandbox information page
 #: views/developers/add_step5.thtml:63
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1412,7 +1755,7 @@ msgstr "Du kan läsa mer om systemet med sandlådans granskningssystem %s."
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "här"
 
-# %1 is the "nominate" link
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1435,16 +1778,16 @@ msgstr ""
 "Eftersom ditt tillägg är betrott har denna version automatiskt godkänts för "
 "denna publika ytan."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: 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:2375
+#: controllers/developers_controller.php:2460
 msgid "devcp_addon_updated_successfully"
 msgstr "Tillägget uppdaterat"
 
-# %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"
@@ -1454,7 +1797,7 @@ 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"
 
-# #1 is the author email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1483,10 +1826,102 @@ msgstr "Nästa"
 msgid "devcp_change_addontype"
 msgstr "Ändra tilläggstyp:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "Utvecklarekommentarer uppdaterade."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Lägg till förhandsvisning"
@@ -1579,6 +2014,7 @@ msgstr "Ingen URL för hjälp angiven av utvecklaren."
 msgid "devcp_details_trusted"
 msgstr "Betrott"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1609,6 +2045,7 @@ msgstr ""
 "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"
@@ -1629,11 +2066,65 @@ msgstr ""
 "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 "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Lägg till författare"
@@ -1646,10 +2137,297 @@ msgstr "E-postadress till författaren"
 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 "Add New Author"
+
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+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"
@@ -1715,6 +2493,206 @@ msgstr "MÃ¥llokal"
 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 "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 "Uppdatera"
@@ -1725,11 +2703,66 @@ 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 "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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Uppmärksammat tillägg"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1738,7 +2771,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Modererade recensioner (%s)"
 msgstr[1] "Modererade recensioner (%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
 #, php-format
@@ -1747,7 +2780,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Nominerade tillägg (%s)"
 msgstr[1] "Nominerade tillägg (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1760,8 +2793,8 @@ msgstr[1] "Väntande uppdateringar (%s)"
 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)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
 #: views/developers/editversion.thtml:58
 #, php-format
 msgid "devcp_editversion_filename_size"
@@ -1787,29 +2820,30 @@ msgstr "Information till granskare"
 msgid "devcp_editversion_submit_update"
 msgstr "Uppdatera"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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 /"
@@ -1817,19 +2851,33 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Se %s för referens."
 
+#. 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 "denna sida"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+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"
@@ -1837,7 +2885,7 @@ msgstr ""
 "Den filextensionen (%s) tillåts inte för den valda tilläggstypen. Använd en "
 "av följande: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Inte alla fil-GUID stämde"
 
@@ -1866,6 +2914,8 @@ msgstr "Överstiger maximalstorlek för uppladdningar"
 msgid "devcp_error_http_nofile"
 msgstr "Ingen fil uppladdad"
 
+#. %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"
@@ -1873,13 +2923,14 @@ msgstr ""
 "Den filextensionen (%s) är inte tillåten för en ikon. Använd en av följande: "
 "%s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Ingen install.rdf fanns."
 
@@ -1887,21 +2938,26 @@ msgstr "Ingen install.rdf fanns."
 msgid "devcp_error_install_manifest"
 msgstr "Följande fel hittades i install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Välj en giltig tilläggstyp."
 
+#. %$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 "%s är inte en giltig version för %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "IDt för detta tillägg är inte giltigt: %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"
@@ -1920,6 +2976,7 @@ msgstr ""
 "Versionen för detta tillägg är ogiltig: versioner kan inte innehålla "
 "mellanslag."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1929,6 +2986,7 @@ msgstr "Följande fel hittades i install.rdf: %s"
 msgid "devcp_error_move_file"
 msgstr "Kunde inte flytta filen"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1951,15 +3009,15 @@ 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:2718
+#: 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:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Du kan bara nominera tillägg som finns i sandlådan."
 
@@ -1971,6 +3029,8 @@ msgstr "Välj minst en kategori."
 msgid "devcp_error_one_user"
 msgstr "Det måste finnas åtminstone en författare för detta tillägg."
 
+#. %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"
@@ -1978,13 +3038,13 @@ 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:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Du har inte rättighet att uppdatera detta tillägg."
 
@@ -2000,7 +3060,7 @@ 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:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Ladda upp en fil."
@@ -2219,7 +3279,7 @@ msgstr "Mina tillägg"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Lokaliserade fält"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2263,33 +3323,68 @@ msgstr "Skicka in tillägg"
 msgid "devcp_myaddons_title"
 msgstr "Utvecklarverktyg"
 
+#. %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 "Tillbaka till detaljer för tillägget"
 
-# %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 "Nominera %s"
 
-# %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 "Automatiskt detekterad tilläggstyp: %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 ""
 "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)
+#. %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"
@@ -2304,9 +3399,14 @@ msgstr ""
 "Om du gör detta till standardförhandsvisning kommer det att ta bort denna "
 "status från nuvarande standardförhandsvisning."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2335,6 +3435,60 @@ msgstr "Redigera förhandsvisning"
 msgid "devcp_preview_updated_successfully"
 msgstr "Förhandsvisning uppdaterad."
 
+#: 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 ""
@@ -2346,10 +3500,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Lägg till förhandsvisning"
 
+#: 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 "Redigera förhandsvisning"
 
+#: 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 "Förhandsvisningsfil"
@@ -2358,6 +3522,34 @@ msgstr "Förhandsvisningsfil"
 msgid "devcp_previews_label_makedefault"
 msgstr "Gör detta till standardvald förhandsvisningsbild"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Ta bort förhandsvisning"
@@ -2374,56 +3566,171 @@ msgstr "Redigera förhandsvisning"
 msgid "devcp_previews_submit_upload"
 msgstr "Ladda upp förhandsvisning"
 
+#: 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 "Felaktig?"
 
-#: controllers/developers_controller.php:2632
+#: 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/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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>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 "Hoppa över uppdatering av information för mitt nuvarande tillägg"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Aktiva dagliga användare"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> hämtningar totalt"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> hämtningar denna vecka"
 
-#: controllers/developers_controller.php:1481
+#: 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 "Tillägg kan inte läggas till för närvarande. Försök igen senare."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Jag accepterar"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Jag avböjer"
 
@@ -2439,11 +3746,11 @@ msgstr "Inaktiverat"
 msgid "devcp_summary_header_trusted"
 msgstr "Betrott"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Senaste 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"
@@ -2453,7 +3760,7 @@ msgstr "Du har inga tillägg. Klicka %s för att skicka in ett."
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "här"
 
-# %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"
@@ -2463,30 +3770,674 @@ msgstr "Se till att %s för ditt tema."
 msgid "devcp_theme_upload_preview_link"
 msgstr "ladda upp en förhandsvisning"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Se %s för referens."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "denna sida"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Redigera version"
 
-#: controllers/developers_controller.php:2572
+#: 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 "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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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: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 "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Filtrera"
@@ -2495,7 +4446,7 @@ msgstr "Filtrera"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtrera på typ/handling"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Händelselogg"
 
@@ -2547,6 +4498,7 @@ msgstr "Göm kommentarer"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Visa kommentarer"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2556,7 +4508,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Granskningslogg"
 
@@ -2580,24 +4532,24 @@ msgstr "Färsk redaktörsaktivitet"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Totala granskningar"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Granska tillägg"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Fyll i följande fält:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Välj minst en fil att granska."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Granskningar av eget material är inte tillåtet."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Extern programvara"
 
@@ -2609,39 +4561,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:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Tog bort uppmärksamhet."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Uppmärksammade tillägg"
 
@@ -2673,39 +4625,40 @@ msgstr "Add-ons riktlinjer"
 msgid "editors_notice_filter_session"
 msgstr "Detta filter kvarstår för denna session eller tills de rensas."
 
-# %1 is the queue mode
+#. %1 is the queue mode
 #: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 dag"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 timme"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minut"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Redaktörsverktyg"
 
-#: controllers/editors_controller.php:286
+#. %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 "%s bara"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Förhandsversion"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2719,20 +4672,25 @@ msgstr "Rensa"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Granska handling"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Tryck ut till publika"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Begär super-granskning"
 
@@ -2740,33 +4698,41 @@ msgstr "Begär super-granskning"
 msgid "editors_review_action_sandbox"
 msgstr "Håll kvar i sandlådan"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Granska kommentarer"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "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:170
+#: 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:159
+#: 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:162
+#: 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:174
+#: 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 "
@@ -2793,15 +4759,15 @@ msgstr "Kategorier:"
 msgid "editors_review_header_compatibility"
 msgstr "Kompatibilitet:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Beskrivning"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Utvecklarekommentarer"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "Användningsvillkor (EULA)"
 
@@ -2809,85 +4775,111 @@ msgstr "Användningsvillkor (EULA)"
 msgid "editors_review_header_files"
 msgstr "Filer:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Historik"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomineringsmeddelande"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Förhandsvisningar"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Integritetspolicy"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Granskning %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Information till granskare"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Sammanfattning"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Information för versionen"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "Admingranskning"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Nominering godkänd/Publik"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Nominering nekad/Sandlåda"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Inga tidigare granskningsposter hittades."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Admingranskning"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Godkänd/Publikt"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Nekad/Sandlåda"
 
-#: views/editors/review.thtml:198
+#. 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 "Applikationer:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "eller välj ett färdigt svar:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Kommentarer:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Operativsystem:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Högst upp"
 
@@ -2896,7 +4888,7 @@ msgstr "Högst upp"
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Inga förhandsivsningar funna."
 
@@ -2905,42 +4897,49 @@ msgstr "Inga förhandsivsningar funna."
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %1 is the add-ons rank in the queue, %2 is the total queue length
 #: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Utför"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Handling"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Kommentarer"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Datum"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Recensent"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Version/Fil"
 
-#: controllers/editors_controller.php:411
+#: 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 "Recensionen hanterad."
 
@@ -2966,7 +4965,7 @@ msgstr "Handling"
 msgid "editors_reviews_in_reply_to"
 msgstr "Som svar till:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Recensioner hanterade!"
 
@@ -2978,23 +4977,23 @@ msgstr "Det finns för närvarande inga recensioner att moderera."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Hantera recensioner"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Webbplatsspecifik"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Ny"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Uppdaterad"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Testade applikationer"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Testade operativsystem"
 
@@ -3035,17 +5034,20 @@ msgstr "Plattformar"
 msgid "editors_th_submissiontypes"
 msgstr "Inskickningstyper"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dagar"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s timmar"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minuter"
@@ -3054,8 +5056,8 @@ msgstr "%s minuter"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Ã…tkomst nekad"
 
@@ -3063,12 +5065,13 @@ msgstr "Ã…tkomst nekad"
 msgid "error_access_denied_message"
 msgstr "Du har inte rättigheter att se denna sida."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3078,18 +5081,19 @@ msgstr "Du har inte rättigheter att se denna sida."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Tillägget hittades inte!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Detta tillägg är inte synligt här."
 
@@ -3097,7 +5101,7 @@ 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:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Inga tillägg i denna kategori!"
 
@@ -3119,24 +5123,25 @@ msgstr "Detta är inte en giltig e-postadress."
 msgid "error_field_required"
 msgstr "Detta fält får inte vara tomt."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Filen hittades inte!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Fel: filen %s finns inte."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3153,16 +5158,18 @@ msgstr ""
 "URLen har ett ogiltigt format. Giltiga URLer ser ut som 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3181,7 +5188,7 @@ msgstr "Information"
 msgid "error_preview_notfound"
 msgstr "Förhandsvisning ej funnen!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Du måste välja ett betyg."
 
@@ -3231,8 +5238,8 @@ msgstr "Bekräfta ditt konto med koden du fick via e-post först."
 msgid "error_username_or_pw_wrong"
 msgstr "Fel användarnamn eller lösenord!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versionen fanns inte!"
 
@@ -3244,13 +5251,14 @@ msgstr "Fel lösenord angett!"
 msgid "feature_learnmore"
 msgstr "Läs mer"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Lär dig mer om %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3262,6 +5270,45 @@ msgstr[1] "%1$s recensioner"
 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Alla rättigheter reserverade."
@@ -3298,7 +5345,7 @@ msgstr "Andra språk:"
 msgid "footer_privacy_policy"
 msgstr "Integritetsriktlinjer"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Spara"
 
@@ -3306,7 +5353,7 @@ msgstr "Spara"
 msgid "general_addontype_dict"
 msgstr "Ordlista"
 
-# 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Ordlistor"
@@ -3315,7 +5362,7 @@ msgstr "Ordlistor"
 msgid "general_addontype_extension"
 msgstr "Utökning"
 
-# 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Utökningar"
@@ -3324,7 +5371,7 @@ msgstr "Utökningar"
 msgid "general_addontype_lpaddon"
 msgstr "Språkpaket (Tillägg)"
 
-# 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Språkpaket (Tillägg)"
@@ -3333,7 +5380,7 @@ msgstr "Språkpaket (Tillägg)"
 msgid "general_addontype_lpapp"
 msgstr "Språkpaket (Applikation)"
 
-# 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Språkpaket (Applikation)"
@@ -3342,7 +5389,7 @@ msgstr "Språkpaket (Applikation)"
 msgid "general_addontype_plugin"
 msgstr "Insticksprogram"
 
-# 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Insticksprogram"
@@ -3351,7 +5398,7 @@ msgstr "Insticksprogram"
 msgid "general_addontype_search"
 msgstr "Sökmotor"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Sökmotorer"
@@ -3360,11 +5407,12 @@ msgstr "Sökmotorer"
 msgid "general_addontype_theme"
 msgstr "Tema"
 
-# 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Teman"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3395,12 +5443,12 @@ msgid "header_navlink_addons"
 msgstr "Tillägg"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Logga ut"
 
@@ -3408,36 +5456,41 @@ msgstr "Logga ut"
 msgid "header_navlink_myaccount"
 msgstr "Mitt konto"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Registrera dig"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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
+#. %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 "<a href=\"%1$s\">Logga in</a> för att installera detta tillägg"
 
+#. %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 "Lägg till %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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3460,7 +5513,7 @@ msgid "langtools_download_langpack"
 msgstr "Hämta hem språkpaket"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Ordlistor & språkpaket"
 
@@ -3517,7 +5570,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3550,7 +5607,7 @@ msgstr "Teman"
 msgid "other_apps_tooltip"
 msgstr "Hitta tillägg för andra applikationer"
 
-# In a user list: user 1, user 2, "others"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "andra"
@@ -3565,42 +5622,41 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_experimental_addons"
 msgstr "Experimental Add-ons"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 #, fuzzy
 msgid "page_title_policy"
 msgstr "Add-ons Policy"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 #, fuzzy
 msgid "page_title_privacy"
 msgstr "Mozilla Privacy Policy"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 #, fuzzy
 msgid "page_title_review_guide"
 msgstr "Review Guidelines"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 #, fuzzy
 msgid "page_title_sandbox"
 msgstr "Sandbox Review System"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 #, fuzzy
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
@@ -3620,6 +5676,7 @@ msgstr ""
 "minst en av följande applikationer stöds. Bara versionerna nedan är tillåtna "
 "för dessa applikationer."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3627,6 +5684,8 @@ msgstr ""
 "Även om applikationen du stöder inte kräver en install.rdf-fil måste du ändå "
 "inkludera en med de egenskaper som specificeras %s."
 
+#. 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 "här"
@@ -3635,7 +5694,6 @@ msgstr "här"
 msgid "pages_appversions_versions"
 msgstr "Versioner"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Tillbaka till föregående sida"
 
@@ -3647,7 +5705,7 @@ msgstr "Informationssida för sandlådan"
 msgid "pagination_next_page"
 msgstr "nästa"
 
-# %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"
@@ -3672,8 +5730,8 @@ msgstr "Skriv svaret här:"
 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
+#. %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"
@@ -3681,8 +5739,8 @@ 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
+#. %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"
@@ -3698,7 +5756,7 @@ msgstr "Är du en människa?"
 msgid "recaptcha_whatsthis"
 msgstr "Vad är detta?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Ett fel uppstod vid märkning av recensionen!"
 
@@ -3728,7 +5786,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Tack; recensionen har märkts för redaktörsgranskning."
 
@@ -3742,7 +5800,7 @@ msgstr ""
 "Är denna recension opassande, inkorrekt eller skräp? Klicka här för att "
 "märka den för redaktörsgranskning."
 
-# %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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3759,21 +5817,22 @@ msgstr ""
 "li></ul><p>Var god läs <a href=\"%2$s\">recensionsriktlinjerna</a> för mer "
 "information om användares tilläggsrecensioner.</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 "Recensioner för %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Uppmärksammade tillägg"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Nyaste tilläggen"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Uppdaterade tillägg"
 
@@ -3810,6 +5869,7 @@ msgstr "Alla sökmotorer"
 msgid "search_landing_browse_search_engines"
 msgstr "Bläddra bland sökmotorer"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3829,12 +5889,13 @@ msgstr "Sök tillägg"
 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:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Sökresultat för: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Adminverktyg"
 
@@ -3842,7 +5903,7 @@ msgstr "Adminverktyg"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Utvecklarverktyg"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Redigerarverktyg"
 
@@ -3850,6 +5911,7 @@ msgstr "Redigerarverktyg"
 msgid "sidebar_navlink_welcome"
 msgstr "Välkommen"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3887,6 +5949,7 @@ msgstr "Tema"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Uppdaterade tillägg"
 
+#. %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
@@ -3898,7 +5961,7 @@ msgstr "%1$s KB"
 msgid "stars_not_yet_rated"
 msgstr "Inte betygsatt än"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3916,24 +5979,32 @@ msgstr "Utvecklarverktyg"
 msgid "statistics_addon_switch"
 msgstr "Byt tillägg"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "%b. %e"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "%b. %e, %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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3975,7 +6046,7 @@ msgstr "Statistikpanelen"
 msgid "statistics_index_view_button"
 msgstr "Visa statistik"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
@@ -3993,7 +6064,7 @@ msgstr "Ta bort denna kurva"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
@@ -4003,104 +6074,109 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s fanns i området"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Lägg till kurva"
 
-#: controllers/statistics_controller.php:246
+#: 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:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Göm totalräknare"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Visa totalräknare"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Visa data (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "FÃ¥ en CSV-fil med dessa data"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Göm %s-händelser"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Visa %s-händelser"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Göm Firefox-händelser"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Visa Firefox-händelser"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Kollapsa graf"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expandera graf"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Ändra storlek på grafen"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Aktiva dagliga användare"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Applikation"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Anpassad"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Hämtningar"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operativsystem"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Tilläggstatus"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Sammanfattning"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Tilläggsversion"
 
@@ -4124,13 +6200,13 @@ msgstr "Okänt"
 msgid "statistics_longnames_version"
 msgstr "Tilläggsversion"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "Det finns inte tillräckligt med data för att visa denna graf. Titta in igen "
 "senare."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr "Vi har inga data för ditt tillägg än. Titta här igen om några dagar."
 
@@ -4141,11 +6217,11 @@ msgstr ""
 "då våra skript just nu arbetar med att uppdatera informationen. Kom tillbaka "
 "om några minuter."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "Statistikpanelen är just nu inte tillgänglig, kom tillbaka senare."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "JavaScript krävs för att visa statistikpanelens grafer."
 
@@ -4160,36 +6236,36 @@ msgstr "Dina inställningar har uppdaterats!"
 msgid "statistics_pagetitle"
 msgstr "Statistikpanel"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Aktiva dagliga användare"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Dagliga hämtningar"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Zooma in"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Zooma in en månad"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Zooma ut"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zooma ut en månad"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Daglig summering av statistik för %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "RSS-kanal för sammanfattningsdata"
 
@@ -4229,23 +6305,23 @@ msgstr "Publik"
 msgid "statistics_settings_access_public_description"
 msgstr "Alla kan se detta tilläggs statistik"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Ändra inställningar"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Behandla detta som konfidentiell information."
 
-#: views/statistics/addon.thtml:233
+#: 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:229
+#: 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:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "LÃ¥st"
 
@@ -4262,7 +6338,7 @@ msgstr "Spara inställningar"
 msgid "statistics_settings_title"
 msgstr "Statistikpanelinställningar för %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Olåst"
 
@@ -4286,7 +6362,7 @@ msgstr "Ok"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Dagliga hämtningar i genomsnitt"
 
@@ -4294,37 +6370,37 @@ msgstr "Dagliga hämtningar i genomsnitt"
 msgid "statistics_summary_downloads_heading"
 msgstr "Hämtningar"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Räknare för senaste dagen"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Hämtningar senaste 7 dagarna"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Totalt antal hämtningar"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Sedan %1$s"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Inga data ännu"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Dagliga aktiva användare i genomsnitt"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Förändring från tidigare räknare"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s den %2$s"
@@ -4333,17 +6409,17 @@ msgstr "%1$s den %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Aktiva dagliga användare"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Aktiva dagliga användare"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Den %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s-statistik"
@@ -4368,7 +6444,7 @@ msgstr "Ändra lösenord"
 msgid "user_confirmationcode_resent"
 msgstr "Bekräftelsekoden omskickad!"
 
-# %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:49
 #, fuzzy
 msgid "user_del_account_deleted"
@@ -4392,7 +6468,7 @@ msgstr "Confirm Password"
 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:62
 #, fuzzy
 msgid "user_del_error_addons"
@@ -4402,7 +6478,7 @@ msgstr ""
 "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:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
@@ -4420,7 +6496,7 @@ msgstr ""
 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:83
 #, fuzzy
 msgid "user_del_error_unknown"
@@ -4433,7 +6509,7 @@ msgstr ""
 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:93
 #, fuzzy
 msgid "user_del_header_delete_account"
@@ -4463,7 +6539,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
@@ -4482,7 +6558,7 @@ msgstr "I understand that this step cannot be undone."
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4496,9 +6572,9 @@ msgstr ""
 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
+#. 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"
@@ -4518,7 +6594,7 @@ msgstr ""
 "Tack för att du registerat dig på  %2$s Add-ons\n"
 "-- %2$s Add-ons-staben"
 
-# %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4542,8 +6618,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Tack för att du registrerat dig på %s Add-ons"
 
-# 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
 #, php-format
 msgid "user_email_pwreset"
@@ -4570,7 +6646,7 @@ msgstr "Återställ ditt %s Add-ons lösenord"
 msgid "user_emailchange_error"
 msgstr "Fel!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4580,7 +6656,7 @@ msgstr "Bekräfta din e-postadressändring på %1$s Add-ons"
 msgid "user_emailchange_success"
 msgstr "Klart!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4754,7 +6830,7 @@ msgstr "Skicka länk för att återställa lösenord"
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
 
-# %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"
@@ -4762,7 +6838,7 @@ msgstr ""
 "En länk för att aktivera ditt konto skickades med e-post till din adress %1"
 "$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
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4779,7 +6855,7 @@ msgstr "skicka bekräftelsebrevet igen"
 msgid "user_register_congratulations"
 msgstr "Grattis! Ditt konto skapades."
 
-# %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"
@@ -4788,7 +6864,7 @@ msgstr ""
 "postleverantör inte sorterat det som skräppost (\"junk mail\" eller \"spam"
 "\"). Om du behöver kan vi %1$s till e-postadressen ovanför."
 
-# %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4852,7 +6928,7 @@ msgstr "Kortnamn"
 msgid "users_info_pagetitle"
 msgstr "Användarinformation för %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
@@ -4862,8 +6938,8 @@ msgstr "Reviews by %s"
 msgid "users_login_pagetitle"
 msgstr "Användarinloggning"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4872,8 +6948,8 @@ msgstr ""
 "ett konto på Mozilla Add-ons så logga in, eller <a href=\"%1$s\">läs mer om "
 "sandlådan.</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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4888,3 +6964,37 @@ msgstr "Återställ användarlösenord"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Registrering av ny användare"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Senaste version som är kompatibel med"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "search_form_submit"
+#~ msgstr "Sök"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
diff --git a/site/app/locale/tr/LC_MESSAGES/messages.po b/site/app/locale/tr/LC_MESSAGES/messages.po
index 51b2931..bdf1af5 100644
--- a/site/app/locale/tr/LC_MESSAGES/messages.po
+++ b/site/app/locale/tr/LC_MESSAGES/messages.po
@@ -21,6 +21,10 @@ msgstr ""
 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. :(
 #: 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
@@ -50,42 +54,39 @@ msgstr "Public"
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, fuzzy, php-format
-msgid "added"
-msgstr "Added %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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
 #, fuzzy
 msgid "addon_detail_last_updated"
 msgstr "Updated %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "%s sürümü"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 #, fuzzy
 msgid "addon_downloads_total"
 msgstr "total downloads"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, fuzzy, php-format
 msgid "addon_list_category_totalcount"
@@ -104,25 +105,27 @@ msgstr "per page"
 msgid "addon_list_sortby"
 msgstr "Sort by:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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: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: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
@@ -132,6 +135,7 @@ 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -150,6 +154,7 @@ msgstr "Ä°nceleme:"
 msgid "addon_review_add_submit"
 msgstr "Görüşü gönder"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -189,24 +194,27 @@ msgstr "Yes"
 msgid "addon_review_delete_header"
 msgstr "Delete Review"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 #, fuzzy
 msgid "addon_review_deleted_successfully"
 msgstr "Review deleted successfully."
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "%s hakkındaki görüşü düzenle"
 
 # %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:534
+#. %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
 #: views/reviews/review_added.thtml:49
 #, fuzzy
 msgid "addon_review_in_moderation"
@@ -220,6 +228,7 @@ 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:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
@@ -228,15 +237,17 @@ 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 addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 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:164
 #, fuzzy, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -251,13 +262,14 @@ msgstr "Developer Reply:"
 msgid "addon_review_saved_successfully"
 msgstr "Görüşünüz başarıyla kaydedildi. Teşekkürler!"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, php-format
@@ -283,12 +295,16 @@ msgstr "Previous Add-on"
 msgid "addon_version_permalink"
 msgstr "Permanent link to this version"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
+# %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:118
 #, fuzzy
-msgid "addon_versions_getlatesttext"
-msgstr "The most recent version compatible with"
+msgid "addon_versions_getlatestversion"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 #, fuzzy
 msgid "addons_author_addons_submit"
 msgstr "Go"
@@ -299,19 +315,23 @@ msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
 # %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "%s gözat"
 
 # %1 is the name of the theme category (eg. Modern)
 # %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
@@ -320,7 +340,7 @@ msgstr "Browse %1$s Themes :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "Görüş ekle"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 #, fuzzy
 msgid "addons_display_advanced_details"
 msgstr "Advanced Details"
@@ -330,12 +350,12 @@ msgstr "Advanced Details"
 msgid "addons_display_categories"
 msgstr "Categories"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 #, fuzzy
 msgid "addons_display_detailed_review"
 msgstr "detailed review"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 #, fuzzy
 msgid "addons_display_dont_like_it"
@@ -345,52 +365,52 @@ msgstr "Don't like it"
 msgid "addons_display_edit_review"
 msgstr "Görüşü düzenle"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "This add-on has a privacy policy."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Developer Comments"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 #, fuzzy
 msgid "addons_display_header_homepage"
 msgstr "Homepage"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Görüşler"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 #, fuzzy
 msgid "addons_display_header_support"
 msgstr "Support"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 #, fuzzy
 msgid "addons_display_like_it"
 msgstr "Like it"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 #, fuzzy
 msgid "addons_display_long_description"
 msgstr "Long Description"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 #, fuzzy
 msgid "addons_display_more_images"
 msgstr "More Images"
@@ -398,20 +418,27 @@ 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.
-#: views/addons/display.thtml:421
+#. %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
 #, fuzzy
 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"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -423,7 +450,9 @@ 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:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -436,7 +465,8 @@ msgstr ""
 "ask for more details or let you know if the bug has been fixed in an "
 "upcoming version."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -448,18 +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:365
+#: views/addons/display.thtml:389
 #, fuzzy
 msgid "addons_display_rate_it"
 msgstr "Rate It"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 #, fuzzy
 msgid "addons_display_review_etiquette"
 msgstr ""
@@ -468,55 +498,58 @@ msgstr ""
 "resolve your issue."
 
 # %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %1 is the support section link
+#: 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:379
+#: views/addons/display.thtml:403
 #, fuzzy
 msgid "addons_display_review_submit"
 msgstr "Save"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Tüm incelemelere bak (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: 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:196
+#: views/addons/display.thtml:220
 #, fuzzy
 msgid "addons_display_version_history"
 msgstr "Complete Version History"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "View the source"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 #, fuzzy
 msgid "addons_display_view_stats"
 msgstr "View statistics"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 #, fuzzy
 msgid "addons_display_what_do_you_think"
 msgstr "What do you think?"
@@ -528,7 +561,7 @@ msgstr "Works with:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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:"
@@ -539,10 +572,11 @@ msgstr "Yazan:"
 msgid "addons_home_feature_head"
 msgstr "Tavsiyemiz"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -559,7 +593,9 @@ msgstr "Newest:"
 msgid "addons_home_other_applications"
 msgstr "Other Applications"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -569,19 +605,20 @@ msgstr "Other Applications"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -689,6 +726,7 @@ msgstr "for Mac OS X"
 msgid "addons_plugins_for_windows"
 msgstr "for Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -708,12 +746,13 @@ msgstr ""
 "graphic formats or playing multimedia files. Plugins are slightly different "
 "from extensions, which modify or add to existing functionality."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, fuzzy, php-format
 msgid "addons_plugins_main_header"
 msgstr "Common Plugins for %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
@@ -724,6 +763,7 @@ msgstr "Plugins"
 msgid "addons_plugins_support_documentation"
 msgstr "Support Documentation: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -732,24 +772,25 @@ msgstr ""
 "installation can proceed:"
 
 # %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Previews for %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Önerilen Eklentiler"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Tavsiye edilen eklentiler"
 
@@ -758,6 +799,7 @@ msgid "addons_searchengines_additional_resources"
 msgstr "Additional Resources"
 
 # link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
@@ -777,33 +819,39 @@ msgstr ""
 
 # %1 is "make your own" link
 # %2 is MDC link
+#. %1 is "make your own" link
+#. %2 is MDC link
 #: 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: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: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: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:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Search Engines"
 
@@ -818,7 +866,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Disabled"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 #, fuzzy
 msgid "addons_status_incomplete"
 msgstr "Incomplete Version"
@@ -863,11 +911,12 @@ msgstr ""
 "These versions are displayed for reference and testing purposes. You should "
 "always use the latest version of an add-on."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Version History with Changelogs"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s Version History"
@@ -880,6 +929,7 @@ msgstr "Add Group"
 msgid "admin_group_delete_pagetitle"
 msgstr "Delete Group"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -1031,6 +1081,7 @@ 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
 #: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
@@ -1038,11 +1089,14 @@ 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: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:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
@@ -1055,27 +1109,27 @@ msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Upgrade Firefox</a> to use this add-on"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 #, fuzzy
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 #, fuzzy
 msgid "browse_addons_newest"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 #, fuzzy
 msgid "browse_addons_popular"
 msgstr "Popular Add-ons"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 #, fuzzy
 msgid "browse_addons_rated"
 msgstr "Add-ons by Rating"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 #, fuzzy
 msgid "browse_addons_updated"
 msgstr "Recently Updated Add-ons"
@@ -1116,6 +1170,7 @@ msgid "category_extra_mostpopular"
 msgstr "Most Popular First"
 
 # %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"
@@ -1126,12 +1181,20 @@ msgstr "See All %1$s"
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
+#. %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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 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:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
@@ -1171,6 +1234,8 @@ 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
 #: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
@@ -1199,6 +1264,10 @@ 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)
 #: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
@@ -1216,6 +1285,8 @@ msgstr ""
 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:69
 #, fuzzy
 msgid "compatibility_report_intro"
@@ -1229,6 +1300,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
@@ -1239,6 +1311,7 @@ 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
 #: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
@@ -1249,6 +1322,7 @@ 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
 #: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
@@ -1259,6 +1333,7 @@ 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
 #: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
@@ -1280,12 +1355,13 @@ msgstr "Information for Add-on Users"
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, fuzzy, php-format
 msgid "credits_contributing"
 msgstr "For information on contributing, please see our %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 #, fuzzy
 msgid "credits_contributing_wikipage"
 msgstr "wiki page"
@@ -1336,18 +1412,27 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
+#: 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>."
+
 # 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/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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
@@ -1355,7 +1440,10 @@ msgid "date"
 msgstr "%e %B %Y"
 
 # date and time format string (strftime)
+#. 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"
@@ -1384,16 +1472,44 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 #, fuzzy
 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"
+#: 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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 #, fuzzy
 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"
@@ -1442,36 +1558,36 @@ msgstr "Step 5: Success"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Submission Help"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Add-on disabled successfully"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Edit Add-on"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Add-on enabled successfully"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Add-on Description"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Add-on Homepage"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Add-on Name"
 
@@ -1480,42 +1596,302 @@ msgstr "Add-on Name"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Preview Caption"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Privacy Policy"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Add-on Summary"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 #, fuzzy
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Support Email"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 #, fuzzy
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "Support URL"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Version Notes"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Nominate Add-on"
 
-#: controllers/developers_controller.php:2729
+#: 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: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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1539,6 +1915,7 @@ msgstr ""
 "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"
@@ -1549,6 +1926,7 @@ 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"
@@ -1571,16 +1949,17 @@ msgstr ""
 "Because your add-on is trusted, this version has automatically been approved "
 "for the public area."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "Submit Add-on"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1591,6 +1970,7 @@ 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"
@@ -1619,10 +1999,102 @@ msgstr "Next"
 msgid "devcp_change_addontype"
 msgstr "Change add-on type:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "Developer Comments updated."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Add Preview"
@@ -1719,6 +2191,7 @@ msgstr "No support url provided by developer."
 msgid "devcp_details_trusted"
 msgstr "Trusted"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1752,6 +2225,7 @@ msgstr ""
 "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"
@@ -1775,11 +2249,65 @@ msgstr ""
 "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"
+msgstr "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Add Author"
@@ -1792,10 +2320,297 @@ msgstr "Author's Email Address"
 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:94
+#, fuzzy
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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"
@@ -1864,6 +2679,206 @@ msgstr "Target Locale"
 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: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 "Update"
@@ -1875,12 +2890,68 @@ 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"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 #, fuzzy
 msgid "devcp_editorsqueue_featured"
 msgstr "Featured Add-ons"
 
 # %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1890,6 +2961,7 @@ msgstr[0] "One Moderated Review"
 msgstr[1] "Moderated Reviews (%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
 #, php-format
@@ -1899,6 +2971,7 @@ msgstr[0] "One Nominated Add-on"
 msgstr[1] "Nominated Add-ons (%s)"
 
 # %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1913,6 +2986,8 @@ 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"
@@ -1938,29 +3013,30 @@ msgstr "Notes to Reviewer"
 msgid "devcp_editversion_submit_update"
 msgstr "Update"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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 "
@@ -1968,20 +3044,34 @@ msgstr ""
 "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
 #, fuzzy, 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.
 #: controllers/components/developers.php:591
 #, fuzzy
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "this page"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, fuzzy, php-format
+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
 #, fuzzy, php-format
 msgid "devcp_error_file_extension"
@@ -1989,7 +3079,7 @@ 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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Not all file GUIDs match"
 
@@ -2023,6 +3113,8 @@ 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
 #: controllers/components/developers.php:401
 #, fuzzy, php-format
 msgid "devcp_error_icon_extension"
@@ -2030,13 +3122,14 @@ msgstr ""
 "That file extension (%s) is not allowed for an icon. Please use one of the "
 "following: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No install.rdf present."
 
@@ -2045,21 +3138,26 @@ msgstr "No install.rdf present."
 msgid "devcp_error_install_manifest"
 msgstr "The following errors were found in install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 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.
 #: controllers/components/developers.php:569
 #: controllers/components/developers.php:581
 #, fuzzy, php-format
 msgid "devcp_error_invalid_appversion"
 msgstr "%s is not a valid version for %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, fuzzy, 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.
 #: controllers/components/developers.php:572
 #, fuzzy, php-format
 msgid "devcp_error_invalid_minversion"
@@ -2077,6 +3175,7 @@ msgstr ""
 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.
 #: controllers/components/developers.php:501
 #, fuzzy, php-format
 msgid "devcp_error_manifest_parse"
@@ -2087,6 +3186,7 @@ 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
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -2112,17 +3212,17 @@ 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:2718
+#: controllers/developers_controller.php:2803
 #, fuzzy
 msgid "devcp_error_nominate_message"
 msgstr "You must supply the requested details for nomination."
 
-#: controllers/developers_controller.php:2712
+#: 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:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "You can only nominate add-ons currently in the sandbox."
 
@@ -2136,6 +3236,8 @@ 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
 #: controllers/components/developers.php:1081
 #, fuzzy, php-format
 msgid "devcp_error_preview_extension"
@@ -2143,13 +3245,13 @@ msgstr ""
 "That file extension (%s) is not allowed for a preview. Please use one of the "
 "following: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "You do not have permission to update this add-on."
 
@@ -2167,7 +3269,7 @@ msgstr ""
 "Add-ons cannot use an external updateURL. Please remove this from install."
 "rdf and try again."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 #, fuzzy
 msgid "devcp_error_upload_file"
@@ -2392,6 +3494,7 @@ msgid "devcp_localebox_header_localizedfields"
 msgstr "Localized Fields"
 
 # %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2437,11 +3540,26 @@ 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.
+#: 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 "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
@@ -2449,11 +3567,33 @@ msgid "devcp_nominate_submit_nominate"
 msgstr "Nominate %s"
 
 # %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: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 ""
@@ -2464,6 +3604,10 @@ msgstr ""
 # %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"
@@ -2479,9 +3623,14 @@ msgstr ""
 "Making this the default preview will remove default status from the current "
 "default preview."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2510,6 +3659,60 @@ msgstr "Edit Preview"
 msgid "devcp_preview_updated_successfully"
 msgstr "Preview updated successfully."
 
+#: 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 ""
@@ -2521,10 +3724,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Add Preview"
 
+#: 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 "Edit Preview"
 
+#: 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 "Preview File"
@@ -2533,6 +3746,34 @@ msgstr "Preview File"
 msgid "devcp_previews_label_makedefault"
 msgstr "Make this the default preview image"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Delete Preview"
@@ -2549,57 +3790,172 @@ msgstr "Edit Preview"
 msgid "devcp_previews_submit_upload"
 msgstr "Upload Preview"
 
+#: 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 "Incorrect?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Are you sure you want to delete this file?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
 
+#: 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 "Skip reviewing my current add-on information"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, fuzzy, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Active Daily Users"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, fuzzy, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> Total Downloads"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, fuzzy, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Weekly Downloads"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "Add-on submissions are currently disabled. Please check back at a later time."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "I Accept"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "I Decline"
 
@@ -2615,11 +3971,12 @@ msgstr "Disabled"
 msgid "devcp_summary_header_trusted"
 msgstr "Trusted"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2630,6 +3987,7 @@ 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"
@@ -2639,31 +3997,675 @@ msgstr "Please be sure to %s for your theme."
 msgid "devcp_theme_upload_preview_link"
 msgstr "upload a preview"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Please see %s for reference."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "this page"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Edit Version"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Version updated successfully."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 #, fuzzy
 msgid "downloads_disable_warning"
 msgstr "This add-on is disabled"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 #, fuzzy
 msgid "editorcp_logs_button_filter"
@@ -2674,7 +4676,7 @@ msgstr "Filter"
 msgid "editorcp_logs_filter_by"
 msgstr "Filter by type/action"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 #, fuzzy
 msgid "editorcp_logs_page_heading"
 msgstr "Event Log"
@@ -2739,6 +4741,7 @@ msgstr "Hide Comments"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Show Comments"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, fuzzy, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2749,7 +4752,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 #, fuzzy
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Review Log"
@@ -2779,24 +4782,24 @@ msgstr "Recent Editor Activity"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total Reviews"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Review Add-on"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Please complete the following fields:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Please select at least one file to review."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Self-reviews are not allowed."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "External Software"
 
@@ -2810,46 +4813,46 @@ msgstr "Add feature"
 msgid "editors_featured_add_feature_submit"
 msgstr "Add"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 #, fuzzy
 msgid "editors_featured_addon_remove_success"
 msgstr "Successfully removed feature."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 #, fuzzy
 msgid "editors_featured_addons_pagetitle"
 msgstr "Featured Add-ons"
@@ -2888,38 +4891,41 @@ 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: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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 day"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hour"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minute"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Editor Control Panel"
 
-#: controllers/editors_controller.php:286
+#. %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 "%s only"
 
-#: controllers/editors_controller.php:301
+#: 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:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2933,20 +4939,25 @@ msgstr "Clear"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Review Action"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Push to Public"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Request Super-Review"
 
@@ -2954,34 +4965,42 @@ msgstr "Request Super-Review"
 msgid "editors_review_action_sandbox"
 msgstr "Retain in Sandbox"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Review Comments"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "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:170
+#: 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:159
+#: 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:162
+#: 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:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "If you have concerns about this add-on's security, copyright issues, or "
@@ -3009,15 +5028,15 @@ msgstr "Categories:"
 msgid "editors_review_header_compatibility"
 msgstr "Compatibility:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Description"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Developer Comments"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
@@ -3025,86 +5044,113 @@ msgstr "EULA"
 msgid "editors_review_header_files"
 msgstr "Files:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Item History"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 #, fuzzy
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomination Message"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Previews"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Review %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes to Reviewer"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Summary"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Version Notes"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "Admin Review"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Nomination Approved/Public"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomination Denied/Sandbox"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "No previous review entries could be found."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Admin Review"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Approved/Public"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Denied/Sandbox"
 
-#: views/editors/review.thtml:198
+#. 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 "Applications:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "or select a canned response:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Comments:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Operating Systems:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Top"
 
@@ -3113,7 +5159,7 @@ msgstr "Top"
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "No previews found."
 
@@ -3122,42 +5168,50 @@ msgstr "No previews found."
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Process Action"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Action"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comments"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Date"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Reviewer"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Version/File"
 
-#: controllers/editors_controller.php:411
+#: 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 "Review successfully processed."
 
@@ -3175,6 +5229,15 @@ msgstr "Remove flags; keep review"
 msgid "editors_reviews_action_skip"
 msgstr "Skip"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+#, fuzzy
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: views/editors/reviews_queue.thtml:100
 msgid "editors_reviews_header_action"
 msgstr "Action"
@@ -3184,7 +5247,7 @@ msgstr "Action"
 msgid "editors_reviews_in_reply_to"
 msgstr "In reply to:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Reviews processed successfully!"
 
@@ -3196,23 +5259,23 @@ msgstr "There are currently no reviews in moderation."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Process Reviews"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Site Specific"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "New"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Updated"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Tested Application"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Tested Operating Systems"
 
@@ -3254,17 +5317,20 @@ msgstr "Platforms"
 msgid "editors_th_submissiontypes"
 msgstr "Submission Types"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s days"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s hours"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutes"
@@ -3273,8 +5339,8 @@ msgstr "%s minutes"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Access Denied"
 
@@ -3282,12 +5348,13 @@ msgstr "Access Denied"
 msgid "error_access_denied_message"
 msgstr "You are not authorized to view this page."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3297,18 +5364,19 @@ msgstr "You are not authorized to view this page."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Eklenti bulunamadı!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "This add-on is not viewable here."
 
@@ -3317,7 +5385,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:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Kategoride eklenti yok!"
 
@@ -3339,24 +5407,25 @@ msgstr "Bu geçerli bir eposta adresi değil."
 msgid "error_field_required"
 msgstr "Bu alan boş bırakılmamalı."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "File not found!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "File error: %s does not exist."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3374,16 +5443,18 @@ 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
 #: 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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3402,7 +5473,7 @@ msgstr "Notice"
 msgid "error_preview_notfound"
 msgstr "Preview not found!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 #, fuzzy
 msgid "error_review_rating_required"
 msgstr "You must select a rating."
@@ -3455,8 +5526,8 @@ msgstr "Lütfen önce kullanıcı hesabınızı doğrulayınız."
 msgid "error_username_or_pw_wrong"
 msgstr "Yanlış kullanıcı adı ya da parola girildi!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Version not found!"
 
@@ -3470,12 +5541,14 @@ msgid "feature_learnmore"
 msgstr "Learn more"
 
 # %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, fuzzy, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Learn more about %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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
 #, fuzzy, php-format
 msgid "feature_reviews"
@@ -3487,6 +5560,45 @@ msgstr[0] "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
+#: views/files/browse.thtml:65
+#, fuzzy
+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)
+#: views/files/browse.thtml:67
+#, fuzzy
+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)
+#: views/files/browse.thtml:64
+#, fuzzy
+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)
+#: views/files/browse.thtml:46
+#, fuzzy
+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.
+#: views/files/browse.thtml:68
+#, fuzzy
+msgid "file_browser_toggle_expand_collapse"
+msgstr "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Bütün hakları saklıdır."
@@ -3525,7 +5637,7 @@ msgstr "DiÄŸer diller:"
 msgid "footer_privacy_policy"
 msgstr "Gizlilik politikası"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Kaydet"
 
@@ -3535,6 +5647,7 @@ 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:110
 #, fuzzy
 msgid "general_addontype_dict_plural"
@@ -3546,6 +5659,7 @@ 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:108
 #, fuzzy
 msgid "general_addontype_extension_plural"
@@ -3557,6 +5671,7 @@ 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:113
 #, fuzzy
 msgid "general_addontype_lpaddon_plural"
@@ -3568,6 +5683,7 @@ 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:112
 #, fuzzy
 msgid "general_addontype_lpapp_plural"
@@ -3579,6 +5695,7 @@ 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:114
 #, fuzzy
 msgid "general_addontype_plugin_plural"
@@ -3590,6 +5707,7 @@ 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:111
 #, fuzzy
 msgid "general_addontype_search_plural"
@@ -3601,11 +5719,13 @@ 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:109
 #, fuzzy
 msgid "general_addontype_theme_plural"
 msgstr "Themes"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, fuzzy, php-format
 msgid "header_home_tooltip"
@@ -3641,12 +5761,12 @@ msgid "header_navlink_addons"
 msgstr "Add-ons"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Çıkış yap"
 
@@ -3655,37 +5775,44 @@ msgstr "Çıkış yap"
 msgid "header_navlink_myaccount"
 msgstr "My Account"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Kaydol"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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
+#. %1 is the login URL for the link tag
+#. %2 is the link to an explanatory page.
 #: 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$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
 #, 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/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/install.thtml:158
 #, fuzzy, php-format
 msgid "install_download"
@@ -3711,7 +5838,7 @@ msgid "langtools_download_langpack"
 msgstr "Download Language Pack"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 #, fuzzy
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dictionaries & Language Packs"
@@ -3781,7 +5908,7 @@ msgstr "Firefox"
 #: config/bootstrap.php:277
 #, fuzzy
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3821,6 +5948,7 @@ 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:214
 msgid "other_users"
 msgstr "others"
@@ -3835,42 +5963,41 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_experimental_addons"
 msgstr "Experimental Add-ons"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 #, fuzzy
 msgid "page_title_policy"
 msgstr "Add-ons Policy"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 #, fuzzy
 msgid "page_title_privacy"
 msgstr "Mozilla Privacy Policy"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 #, fuzzy
 msgid "page_title_review_guide"
 msgstr "Review Guidelines"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 #, fuzzy
 msgid "page_title_sandbox"
 msgstr "Sandbox Review System"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 #, fuzzy
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
@@ -3893,6 +6020,7 @@ msgstr ""
 "least one of the below applications supported. Only the versions listed "
 "below are allowed for these applications."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, fuzzy, php-format
 msgid "pages_appversions_required_files"
@@ -3900,6 +6028,8 @@ 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.
 #: views/pages/appversions.thtml:92
 #, fuzzy
 msgid "pages_appversions_required_files_link"
@@ -3910,7 +6040,6 @@ msgstr "here"
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/experimental_addons.thtml:56
 #, fuzzy
 msgid "pages_experimental_addons_backbutton"
 msgstr "Back to the previous page"
@@ -3924,6 +6053,7 @@ 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"
@@ -3952,6 +6082,8 @@ msgstr "Please type what you hear."
 
 # %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
 #, fuzzy
 msgid "recaptcha_hardtohear_text"
@@ -3961,6 +6093,8 @@ msgstr ""
 
 # %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
 #, fuzzy
 msgid "recaptcha_hardtoread_text"
@@ -3978,7 +6112,7 @@ msgstr "Are you human?"
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 #, fuzzy
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
@@ -4009,7 +6143,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 #, fuzzy
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
@@ -4027,6 +6161,7 @@ msgstr ""
 "editor review."
 
 # %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:48
 #, fuzzy
 msgid "review_guidelines_short"
@@ -4044,21 +6179,22 @@ msgstr ""
 "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: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:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Özellikli Eklenti"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "En yeni eklentiler"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 #, fuzzy
 msgid "rss_updatedaddons"
 msgstr "Updated Add-ons"
@@ -4104,6 +6240,7 @@ msgstr "All Search Engines"
 msgid "search_landing_browse_search_engines"
 msgstr "Browse Search Engines"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, fuzzy, php-format
 msgid "search_matching_addons_number"
@@ -4123,12 +6260,13 @@ msgstr "Eklentilerde ara"
 msgid "search_rss_description"
 msgstr "Arama sonuçları beslemesi"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Sonuçlarda bunu ara: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Admin Tools"
 
@@ -4136,7 +6274,7 @@ msgstr "Admin Tools"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Developer Tools"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editor Tools"
 
@@ -4145,6 +6283,7 @@ msgstr "Editor Tools"
 msgid "sidebar_navlink_welcome"
 msgstr "Welcome"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, fuzzy, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -4190,6 +6329,7 @@ msgstr "Theme"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Add-ons"
 
+#. %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
@@ -4203,6 +6343,7 @@ 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/stars.thtml:54
 #, fuzzy, php-format
 msgid "stars_rated_x_outof_5"
@@ -4223,27 +6364,35 @@ msgstr "Developer Tools"
 msgid "statistics_addon_switch"
 msgstr "Switch Add-on"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. This is a date format.
+#. http://php.net/strftime
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, fuzzy
 msgid "statistics_date_shortmonth"
 msgstr "M. j"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. This is a date format.
+#. http://php.net/strftime
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, fuzzy
 msgid "statistics_date_shortmonthwithyear"
 msgstr "M. j, 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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 #, fuzzy
 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: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:498
 #, fuzzy, php-format
 msgid "statistics_events_app_released"
@@ -4294,7 +6443,7 @@ msgstr "Statistics Dashboard"
 msgid "statistics_index_view_button"
 msgstr "View Statistics"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
@@ -4314,7 +6463,7 @@ msgstr "Remove this plot"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
@@ -4324,127 +6473,132 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 #, fuzzy
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s found in range"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 #, fuzzy
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Add Plot"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 #, fuzzy
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Add another plot to this graph"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Hide Total Count"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Show Total Count"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 #, fuzzy
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "View Data (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Hide %s Events"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Show %s Events"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Hide Firefox Events"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Show Firefox Events"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Collapse Graph"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expand Graph"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Resize the graph"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 #, fuzzy
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Active Daily Users"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 #, fuzzy
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 #, fuzzy
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Custom"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 #, fuzzy
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 #, fuzzy
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operating System"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 #, fuzzy
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Add-on Status"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 #, fuzzy
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Summary"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 #, fuzzy
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Add-on Version"
@@ -4474,13 +6628,13 @@ msgstr "Unknown"
 msgid "statistics_longnames_version"
 msgstr "Add-on Version"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 #, fuzzy
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "There is not yet enough data to display this graph. Please check back later."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 #, fuzzy
 msgid "statistics_notice_data_none"
 msgstr ""
@@ -4494,13 +6648,13 @@ msgstr ""
 "may be incomplete as our scripts work to update this information. Please "
 "check back in a few minutes."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 #, fuzzy
 msgid "statistics_notice_disabled"
 msgstr ""
 "The Statistics Dashboard is currently disabled. Please check back later."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 #, fuzzy
 msgid "statistics_notice_nojavascript"
 msgstr "JavaScript is required to view the Statistics Dashboard graphs."
@@ -4518,42 +6672,42 @@ msgstr "Your settings have been updated!"
 msgid "statistics_pagetitle"
 msgstr "Statistics Dashboard"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 #, fuzzy
 msgid "statistics_plot_legend_adu"
 msgstr "Active Daily Users"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 #, fuzzy
 msgid "statistics_plot_legend_downloads"
 msgstr "Daily Downloads"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 #, fuzzy
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Zoom In"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 #, fuzzy
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Zoom in one month"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 #, fuzzy
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Zoom Out"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 #, fuzzy
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out one month"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, fuzzy, php-format
 msgid "statistics_rss_description"
 msgstr "Daily summary of statistics for %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 #, fuzzy
 msgid "statistics_rss_icon_title"
 msgstr "RSS feed of summary data"
@@ -4601,27 +6755,27 @@ msgstr "Public"
 msgid "statistics_settings_access_public_description"
 msgstr "Anyone can view this add-on's statistics"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 #, fuzzy
 msgid "statistics_settings_change_link"
 msgstr "Change Settings"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 #, fuzzy
 msgid "statistics_settings_confidential"
 msgstr "Please treat this information as confidential."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 #, fuzzy
 msgid "statistics_settings_currently_private"
 msgstr "This dashboard is currently <b>private</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 #, fuzzy
 msgid "statistics_settings_currently_public"
 msgstr "This dashboard is currently <b>public</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 #, fuzzy
 msgid "statistics_settings_locked_alt"
 msgstr "Locked"
@@ -4641,7 +6795,7 @@ msgstr "Save Settings"
 msgid "statistics_settings_title"
 msgstr "Statistics Dashboard Settings for %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 #, fuzzy
 msgid "statistics_settings_unlocked_alt"
 msgstr "Unlocked"
@@ -4671,7 +6825,7 @@ msgstr "Uk"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 #, fuzzy
 msgid "statistics_summary_downloads_average"
 msgstr "Average Daily Downloads"
@@ -4681,43 +6835,43 @@ msgstr "Average Daily Downloads"
 msgid "statistics_summary_downloads_heading"
 msgstr "Downloads"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 #, fuzzy
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Last Day Count"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 #, fuzzy
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in the last 7 days"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 #, fuzzy
 msgid "statistics_summary_downloads_total"
 msgstr "Total Downloads"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, fuzzy, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Since %1$s"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 #, fuzzy
 msgid "statistics_summary_nodata"
 msgstr "No data yet"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 #, fuzzy
 msgid "statistics_summary_updatepings_average"
 msgstr "Average Daily Active Users"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 #, fuzzy
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Change from previous count"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, fuzzy, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s on %2$s"
@@ -4727,18 +6881,18 @@ msgstr "%1$s on %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Active Daily Users"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 #, fuzzy
 msgid "statistics_summary_updatepings_total"
 msgstr "Active Daily Users"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, fuzzy, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "On %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, fuzzy, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Statistics"
@@ -4767,6 +6921,7 @@ 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:49
 #, fuzzy
 msgid "user_del_account_deleted"
@@ -4791,6 +6946,7 @@ 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:62
 #, fuzzy
 msgid "user_del_error_addons"
@@ -4801,6 +6957,7 @@ msgstr ""
 "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:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
@@ -4819,6 +6976,7 @@ 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:83
 #, fuzzy
 msgid "user_del_error_unknown"
@@ -4832,6 +6990,7 @@ 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:93
 #, fuzzy
 msgid "user_del_header_delete_account"
@@ -4862,6 +7021,7 @@ msgstr ""
 "associated with you."
 
 # %1 is a link to the amo-editors mailing list
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
@@ -4881,6 +7041,7 @@ msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 #, fuzzy
 msgid "user_edit_confirm_email_sent"
@@ -4897,6 +7058,9 @@ 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
+#. 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"
@@ -4917,6 +7081,7 @@ msgstr ""
 "-- %2$s Add-ons Staff"
 
 # %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, fuzzy, php-format
@@ -4942,6 +7107,8 @@ msgstr "Mozilla Eklentileri'ne katıldığnız için teşekkürler"
 
 # This is the password reset email
 # %1 is the pw reset URL
+#. 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"
@@ -4970,6 +7137,7 @@ msgid "user_emailchange_error"
 msgstr "Error!"
 
 # %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, fuzzy, php-format
 msgid "user_emailchange_subject"
@@ -4981,6 +7149,7 @@ msgid "user_emailchange_success"
 msgstr "Success!"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, fuzzy, php-format
 msgid "user_emailchange_successful_description"
@@ -5157,6 +7326,7 @@ msgid "user_register_amo_link"
 msgstr "%s Add-ons"
 
 # %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"
@@ -5165,6 +7335,7 @@ msgstr ""
 "You have to click it before you can log into %2$s Add-ons."
 
 # %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -5182,6 +7353,7 @@ msgid "user_register_congratulations"
 msgstr "Congratulations! Your user account was successfully created."
 
 # %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"
@@ -5191,6 +7363,7 @@ msgstr ""
 "us %1$s to your email address mentioned above."
 
 # %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -5256,6 +7429,7 @@ 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:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
@@ -5267,6 +7441,8 @@ msgstr "Kullanıcı Girişi"
 
 # %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
 #, fuzzy, php-format
 msgid "users_login_sandbox_display_warning"
@@ -5277,6 +7453,8 @@ msgstr ""
 
 # %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
 #, fuzzy, php-format
 msgid "users_login_sandbox_page_warning"
@@ -5292,3 +7470,55 @@ msgstr "Kullanıcı Şifre Sıfırlaması"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Yeni Kullanıcı Kaydı"
+
+#, fuzzy
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "The most recent version compatible with"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+# This contains the email sent to users when they signed up for a new
+# account:
+# %1 is the confirmation URL
+# %2 is the username
+# %3 is the password
+#~ msgid "user_email_confirm_account"
+#~ msgstr ""
+#~ "Mozilla Eklentilerine HoÅŸgeldiniz.\n"
+#~ "\n"
+#~ "Yeni hesabınızı kullanmaya başlamadan önce etkinleştirmelisiniz - bu "
+#~ "iÅŸlem e-posta adresinizin doÄŸrulunu garanti eder.\n"
+#~ "Hesabınızı etkinleştirmek için, aşağıdaki bağlantıya tıklayın veya "
+#~ "tarayıcınızın adres çubuğuna yapıştırın:\n"
+#~ "\n"
+#~ "%1$s\n"
+#~ "\n"
+#~ "Sizin kayıt bilgilerinizi içeren bu e-postayı güvenli bir yerde saklayın, "
+#~ "kayıt yaptığınız hesabın ayrıntıları aşağıdadır.\n"
+#~ "\n"
+#~ "E-Posta:   %2$s\n"
+#~ "Åžifre: %3$s\n"
+#~ "Mozilla Eklentilerine katıldığınız için teşekkürler\n"
+#~ "-- Mozilla Eklentileri Yönetimi"
diff --git a/site/app/locale/uk/LC_MESSAGES/messages.po b/site/app/locale/uk/LC_MESSAGES/messages.po
index c60608d..e577099 100644
--- a/site/app/locale/uk/LC_MESSAGES/messages.po
+++ b/site/app/locale/uk/LC_MESSAGES/messages.po
@@ -23,6 +23,10 @@ msgstr ""
 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 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
@@ -51,38 +55,34 @@ msgstr "Публічний"
 msgid "a_header_sandbox"
 msgstr "Пі�очниц�"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, fuzzy, php-format
-msgid "added"
-msgstr "Added %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Оновлено %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Вер�і� %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "в�ього завантажень"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
@@ -99,22 +99,22 @@ msgstr "на �торінку"
 msgid "addon_list_sortby"
 msgstr "Сортувати за:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "рекомендований"
 
-# %1 назва додатку, %2 платформа
+#. %1 is the add-on name, %2 is the platform
 #: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s недо�тупний дл� %2$s."
 
-# %1 назва додатку
+#. %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
@@ -123,7 +123,7 @@ msgstr "%1$s недо�тупний дл� %2$s."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "�азад до %1$s…"
 
-# %1 назва додатку
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -142,6 +142,7 @@ msgstr "Відгук:"
 msgid "addon_review_add_submit"
 msgstr "�аді�лати �вій відгук"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -175,23 +176,24 @@ msgstr "Так"
 msgid "addon_review_delete_header"
 msgstr "Стерти відгук"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "Відгук у�пішно �терто."
 
+#. %s is the name of the add-on
 #: 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:534
-#, fuzzy
+#. %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 flagging review: Notes for flagged reviews are limited to between 10 "
-"and 100 characters; your character length was %1$s."
+"Проблема при помітці відгуку: тек�т помітки має бути довжиною від 10 до 100 "
+"�имволів, а ваш має довжину %1$s �имволів."
 
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -202,24 +204,25 @@ msgstr ""
 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:135
-#, fuzzy, php-format
+#, 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."
+msgstr[0] "Подивити�� %1$s попередній відгук про цей додаток, наді�ланий %2$s."
+msgstr[1] ""
+"Подивити�� %1$s попередніх відгуків про цей додаток, наді�ланих %2$s."
 
-# %1 назва додатку
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -233,14 +236,13 @@ msgstr "Відповідь розробника:"
 msgid "addon_review_saved_successfully"
 msgstr "Ваш відгук збережено вдало. Д�куємо!"
 
-#  php-format
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
 #: views/reviews/display.thtml:72 views/reviews/display.thtml:75
-#, fuzzy, php-format
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "огл�нено %1$s %2$s"
 
-# %1 кори�тувач, %2 (мі�цева) дата, %3 рейтинг
+#. %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
@@ -250,26 +252,26 @@ msgstr "%1$s %2$s (рейтинг %3$s)"
 #: 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"
+msgstr "�а�тупний додаток"
 
 #: 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"
+msgstr "Попередній додаток"
 
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "По�тійне по�иланн� на цю вер�ію"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "�айо�танніша вер�і� �умі�на з"
+#. %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 "�айновіша вер�і�, �умі�на з %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "За�лати"
 
@@ -277,29 +279,28 @@ msgstr "За�лати"
 msgid "addons_author_tooltip"
 msgstr "Перегл�нути профіль автора"
 
-# %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
-#, fuzzy
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
-msgstr "Browse all Themes :: %1$s Add-ons"
+msgstr "Перегл�д у�іх тем :: Додатки до %1$s"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
-#, fuzzy
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
-msgstr "Browse %1$s Themes :: %2$s Add-ons"
+msgstr "Перегл�д тем — %1$s :: Додатки до %2$s"
 
 #: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Додати відгук"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Додаткові подробиці"
 
@@ -307,11 +308,11 @@ msgstr "Додаткові подробиці"
 msgid "addons_display_categories"
 msgstr "Категорії"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "детальний огл�д"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "�е �подобало�ь"
@@ -320,66 +321,69 @@ msgstr "�е �подобало�ь"
 msgid "addons_display_edit_review"
 msgstr "Редагувати �вій відгук"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "У цього додатку є умови конфіденційно�ті."
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Коментарі розробника"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Початкова"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Відгуки"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Підтримка"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Сподобало�ь"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Докладний опи�"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 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:421
-#, fuzzy
+#. %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] "Інші додатки від %1$s"
-msgstr[1] "Other add-ons by these authors"
+msgstr[1] "Інші додатки від цих авторів"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -391,7 +395,9 @@ msgstr ""
 "розробникам котрими ви пи�али відгуки, вони не зможуть перепитати ва� або "
 "�пові�тити про те що ваду було виправлено."
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -403,7 +409,8 @@ msgstr ""
 "розробникам котрими ви пи�али відгуки, вони не зможуть перепитати ва� або "
 "�пові�тити про те що ваду було виправлено."
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -415,68 +422,67 @@ msgstr ""
 "ви пи�али відгуки, вони не зможуть перепитати ва� або �пові�тити про те що "
 "ваду було виправлено."
 
-#: views/addons/display.thtml:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Оцінка"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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:405
+#. %1 is the review guidelines link
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Поради щодо оцінюванн�</a>"
 
-# %1 is the support section link
-# php-format
-#: views/addons/display.thtml:396 views/addons/display.thtml:400
-#, fuzzy, php-format
+#. %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 ""
 "Завітайте у <a href=\"%1$s\">розділ підтримки</a>  щоб дізнати�ь де ви "
 "зможете отримати допомогу �то�овно цього додатку."
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Зберегти"
 
-#: views/addons/display.thtml:415
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Перегл�нути в�і додатки %1$s"
 
-# %1 кількі�ть перегл�дів
-#: views/addons/display.thtml:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Дивити�� в�і відгуки (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Показати в�і вер�ії"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "Повна і�торі� вер�ій"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Перегл�нути джерело"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Перегл�нути �тати�тику"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Що �кажете?"
 
@@ -486,7 +492,7 @@ msgstr "Працює з:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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 "від"
@@ -497,10 +503,11 @@ msgstr "від"
 msgid "addons_home_feature_head"
 msgstr "Ми рекомендуємо"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -516,7 +523,9 @@ msgstr "�айновіші:"
 msgid "addons_home_other_applications"
 msgstr "Інші програми"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -526,19 +535,20 @@ msgstr "Інші програми"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -583,17 +593,16 @@ msgid "addons_home_view_all_updated_title"
 msgstr "Перегл�нути в�і недавно оновлені додатки"
 
 #: views/elements/install.thtml:108
-#, fuzzy
 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>"
+"<ol><li>Дл� того щоб зберегти файл, нати�ніть на по�иланні нижче.</li><li>У "
+"Mozilla Sunbird, відкрийте Додатки з меню Ін�трументи.</li><li>�ати�ніть "
+"кнопку В�тановити, виберіть завантажений вами файл та нати�ніть \"OK\".</"
+"li></ol>"
 
 #: views/elements/install.thtml:107
-#, fuzzy
 msgid "addons_install_in_sunbird_title"
-msgstr "How to Install in Sunbird"
+msgstr "Як в�тановлювати  у Sunbird"
 
 #: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
@@ -601,8 +610,8 @@ msgstr ""
 "<ol><li>Клацніть правою клавішею мишки на по�иланні нижче і оберіть "
 "\"Зберегти �к…\" дл� завантаженн� і збереженн� файлу на �вій ди�к.</li><li>У "
 "Mozilla Thunderbird, відкрийте додатки у меню Ін�трументи.</li><li>Клікніть "
-"на кнопці В�тановити, і знайдіть/оберіть файл, �кий ви завантажили і "
-"клацніть \"Гаразд\".</li></ol>"
+"на кнопці В�тановити, знайдіть/оберіть файл, �кий ви завантажили і клацніть "
+"\"Гаразд\".</li></ol>"
 
 #: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
@@ -635,6 +644,7 @@ msgstr "дл� Mac OS X"
 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"
@@ -655,12 +665,13 @@ msgstr ""
 "Модулі трохи відрізн�ють�� від розширень, �кі модифікують або додають�� до "
 "і�нуючої функціонально�ті."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Поширені модулі дл� %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Модулі"
 
@@ -671,6 +682,7 @@ msgstr "Модулі"
 msgid "addons_plugins_support_documentation"
 msgstr "Документаці�: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -678,35 +690,35 @@ msgstr ""
 "%s потребує, щоб ви прийн�ли на�тупну Ліцензійну угоду з кінцевим "
 "кори�тувачем перед продовженн�м в�тановленн�:"
 
-# %1 назва додатку
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Знімки екрану дл� %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 msgid "addons_recommended_introduction"
 msgstr ""
 "З такою кількі�тю на�вних додатків кожен може знайти �обі що�ь цікаве. "
 "Почніть з переліку найпопул�рніших. �а�олоджуйте�ь!"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Рекомендовані додатки"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Рекомендовані додатки"
 
 #: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
-msgstr "Additional Resources"
+msgstr "Додаткові ре�ур�и"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
-msgstr "Mozilla Developer Center"
+msgstr "Центр розробників Mozilla"
 
 #: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
@@ -721,35 +733,35 @@ msgstr ""
 "відключили. Будь ла�ка, включіть 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:150 views/addons/searchengines.thtml:167
-#, fuzzy, php-format
+#, 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: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: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:148 views/addons/searchengines.thtml:166
-#, fuzzy, php-format
+#, 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:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "За�оби пошуку"
 
@@ -759,39 +771,32 @@ msgstr ""
 "О�облива под�ка проекту Mycroft за їх роботу над за�обами пошуку Firefox"
 
 #: controllers/components/amo.php:201 controllers/components/amo.php:229
-#, fuzzy
 msgid "addons_status_disabled"
-msgstr "Disabled"
+msgstr "Вимкнено"
 
-#: controllers/components/amo.php:191
-#, fuzzy
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
-msgstr "Incomplete Version"
+msgstr "�еповна вер�і�"
 
 #: controllers/components/amo.php:197 controllers/components/amo.php:227
-#, fuzzy
 msgid "addons_status_nominated"
-msgstr "In Sandbox; Public Nomination"
+msgstr "У пі�очниці; кандидат у загальнодо�тупні"
 
 #: controllers/components/amo.php:195 controllers/components/amo.php:226
-#, fuzzy
 msgid "addons_status_pending"
-msgstr "In Sandbox; Pending Review"
+msgstr "У пі�очниці; очікує на відгук"
 
 #: controllers/components/amo.php:199 controllers/components/amo.php:228
-#, fuzzy
 msgid "addons_status_public"
-msgstr "Public"
+msgstr "Загальнодо�тупний"
 
 #: controllers/components/amo.php:193 controllers/components/amo.php:225
-#, fuzzy
 msgid "addons_status_sandbox"
-msgstr "In Sandbox"
+msgstr "У пі�очниці"
 
 #: controllers/components/amo.php:203
-#, fuzzy
 msgid "addons_status_unknown"
-msgstr "Unknown"
+msgstr "�евідомо"
 
 #: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
@@ -807,11 +812,12 @@ msgstr ""
 "Ці вер�ії показані з метою по�иланн� і випробуванн�. Ви повинні завжди "
 "викори�товувати найо�таннішу вер�ію додатку."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "І�торі� вер�ій із протоколом змін"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "І�торі� вер�ій %1$s"
@@ -824,6 +830,7 @@ msgstr "Додати групу"
 msgid "admin_group_delete_pagetitle"
 msgstr "Стерти групу"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -949,22 +956,23 @@ msgstr "�е зважати на цільову вер�ію"
 msgid "app_compat_older_firefox_only"
 msgstr "Цей додаток розраховано на �тару вер�ію Firefox"
 
+#. %1$s and %2$s are URLs
 #: 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>"
+"Ви можете <a href=\"%1$s\">�пробувати �тарішу вер�ію додатку</a> чи <a href="
+"\"#\" onclick=\"%2$s\">пропу�тити цю перевірку</a>"
 
+#. %1$s is a URL
 #: 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: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 "Цей додаток вимагає ще не випущений <a href=\"%1$s\">Firefox %2$s</a>"
 
 #: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
@@ -972,23 +980,23 @@ msgstr ""
 "<a href=\"http://getfirefox.com\">Оновіть Firefox</a> щоб �кори�тати�ь цим "
 "додатком"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Додатки за ім’�м"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "�айновіші додатки"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Попул�рні додатки"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Додатки за рейтингом"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "�едавно оновлені додатки"
 
@@ -1020,62 +1028,63 @@ msgstr "�айновіші �початку"
 msgid "category_extra_mostpopular"
 msgstr "�айпопул�рніші �початку"
 
-# %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:84
-#, fuzzy
 msgid "collection_not_found"
-msgstr "Collection not found!"
+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"
 
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
-#, fuzzy
 msgid "compatibility_dashboard_center_header"
-msgstr "Add-on Compatibility Center"
+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: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."
+"Будьте готові до випу�ку %1$s з ін�трументами та інформацією, "
+"до�тупниминижче дл� �пільноти розробників додатків до %2$s."
 
 #: views/compatibility/dashboard.thtml:107
-#, fuzzy
 msgid "compatibility_dashboard_loading"
-msgstr "Loading data..."
+msgstr "Завантаженн� даних..."
 
 #: views/compatibility/dashboard.thtml:41
-#, fuzzy
 msgid "compatibility_dashboard_main_link"
-msgstr "Back to Main"
+msgstr "�азад до опи�у"
 
 #: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
-#, fuzzy
 msgid "compatibility_dashboard_report"
-msgstr "Add-on Compatibility Report"
+msgstr "Звіт про �умі�ні�ть додатку"
 
 #: 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"
+msgstr "Інформаці� дл� розробників додатків"
 
 #: views/compatibility/developers.thtml:64
-#, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
-msgstr "Adjust maxVersion without uploading"
+msgstr "Змінити maxVersion без відвантаженн�"
 
 #: views/compatibility/dashboard.thtml:128
-#, fuzzy
 msgid "compatibility_developers_check_status"
-msgstr "Check Status of My Add-ons"
+msgstr "Перевірити �тату� моїх додатків"
 
+#. %1$s is a URL
+#. %2$s is an application and version.  Example:  Firefox 3.0
 #: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
@@ -1104,6 +1113,10 @@ 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)
 #: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
@@ -1121,6 +1134,8 @@ msgstr ""
 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:69
 #, fuzzy
 msgid "compatibility_report_intro"
@@ -1134,6 +1149,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
@@ -1144,6 +1160,7 @@ 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
 #: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
@@ -1154,6 +1171,7 @@ 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
 #: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
@@ -1164,6 +1182,7 @@ 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
 #: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
@@ -1185,12 +1204,13 @@ msgstr "Information for Add-on Users"
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Дл� інформації щодо вне�ку, будь ла�ка, завітайте на нашу %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "вікі-�торінку"
 
@@ -1231,26 +1251,35 @@ msgstr ""
 "\">famfamfam Silk Icon Set</a>, до�тупні за ліцензією<a href=\"http://"
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 </a>."
 
-# date format string as used in PHP’s strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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)
+#. 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"
@@ -1276,14 +1305,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1331,36 +1388,36 @@ msgstr "Крок 5: У�піх"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Підказка з подаванн�"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "Додаток відключено у�пішно"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "Редагувати додаток"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "Додаток включено у�пішно"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "Опи� додатку"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "ЛУКК"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "Домашн� �торінка додатку"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "�азва додатку"
 
@@ -1369,40 +1426,298 @@ msgstr "�азва додатку"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Перегл�д заголовку"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "Умови конфіденційно�ті"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "Під�умок додатку"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Support Email"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "Support URL"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "Примітки вер�ії"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "Подати додаток"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Додаток подано у�пішно!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1425,7 +1740,7 @@ msgstr ""
 "пі�очниці та редактора додатків Mozilla’и. Ва� повідомл�ть електронною "
 "поштою, коли відбудеть�� поді�."
 
-# %1 по�иланн� на інформаційну �торінку пі�очниці
+#. %1 is the link to the sandbox information page
 #: views/developers/add_step5.thtml:63
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1435,7 +1750,7 @@ msgstr "Ви можете прочитати більше про �и�тему
 msgid "devcp_addon_submission_sandbox_readmore_link"
 msgstr "тут"
 
-# %1 по�иланн� “поданн��
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1458,16 +1773,16 @@ msgstr ""
 "Тому, що вашому додатку довір�ють, ц� вер�і� автоматично �хвалена дл� "
 "публічної діл�нки."
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "�аді�лати додаток"
 
-#: controllers/developers_controller.php:2375
+#: controllers/developers_controller.php:2460
 msgid "devcp_addon_updated_successfully"
 msgstr "Додаток оновлено у�пішно"
 
-# %1 по�иланн� на �торінку завантаженн� поперед. перегл�ду
+#. %1 is the link to the preview upload page
 #: views/developers/add_step5.thtml:71
 #, php-format
 msgid "devcp_addon_upload_preview"
@@ -1477,7 +1792,7 @@ msgstr "Ви можете захотіти %s , щоб підвищити інт
 msgid "devcp_addon_upload_preview_link"
 msgstr "відвантажити знімок екрану"
 
-# #1 автор�ький email
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1506,10 +1821,102 @@ msgstr "Далі"
 msgid "devcp_change_addontype"
 msgstr "Змінити тип додатку:"
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "Оновлено коментарі розробника."
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Додати знімок екрану"
@@ -1602,6 +2009,7 @@ msgstr "No support url provided by developer."
 msgid "devcp_details_trusted"
 msgstr "Довірити"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1631,6 +2039,7 @@ msgstr ""
 "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"
@@ -1651,11 +2060,65 @@ msgstr ""
 "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"
+msgstr "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Додати автора"
@@ -1668,10 +2131,297 @@ msgstr "Email автора"
 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 "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+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 "�втори"
@@ -1737,6 +2487,206 @@ msgstr "Target Locale"
 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: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 "Оновити"
@@ -1747,11 +2697,66 @@ 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"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Featured Add-ons"
 
-# %1 рахунок перегл�дів
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1760,7 +2765,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Модеровані перегл�ди (%s)"
 msgstr[1] "Модеровані перегл�ди (%s)"
 
-# %1 рахунок номінованих додатків
+#. %1 is the nominated addons count
 #: views/elements/developers/editorsqueue.thtml:44
 #: views/elements/developers/editorsmenu.thtml:58
 #, php-format
@@ -1769,7 +2774,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "�оміновані додатки (%s)"
 msgstr[1] "�оміновані додатки (%s)"
 
-# %1 рахунок оновлень
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1782,8 +2787,8 @@ msgstr[1] "Оновленн� в черзі (%s)"
 msgid "devcp_editversion_checkedfiles_delete"
 msgstr "Позначені файли будуть �терті."
 
-# %1 назва файлу
-# %2 розмір файлу (150 КБ)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
 #: views/developers/editversion.thtml:58
 #, php-format
 msgid "devcp_editversion_filename_size"
@@ -1809,29 +2814,30 @@ msgstr "Примітки огл�дачу"
 msgid "devcp_editversion_submit_update"
 msgstr "Оновити"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: controllers/developers_controller.php:1992
 msgid "devcp_error_addonname_not_unique"
 msgstr ""
 "�азва дл� вашого додатку вже і�нує в базі даних. Будь ла�ка, переконайте��, "
@@ -1839,19 +2845,33 @@ msgstr ""
 "це невідповідні 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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Будь ла�ка, дивіть�� %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 "цю �торінку"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+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"
@@ -1859,7 +2879,7 @@ msgstr ""
 "Це розширенн� файлу (%s) недозволене дл� обраного типу додатку. Будь ла�ка, "
 "викори�тайте одне з на�тупних: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "�е в�і файли GUIDів відповідають"
 
@@ -1888,6 +2908,8 @@ msgstr "Перевищує макÑ�имальний розмір відвантÐ
 msgid "devcp_error_http_nofile"
 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:401
 #, php-format
 msgid "devcp_error_icon_extension"
@@ -1895,13 +2917,14 @@ msgstr ""
 "Це розширенн� файлу (%s) недозволене дл� значка. Будь ла�ка, викори�тайте "
 "одне з на�тупних: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Від�утній install.rdf."
 
@@ -1909,21 +2932,26 @@ msgstr "Від�утній install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "�а�тупні помилки знайдені у install.rdf:"
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Будь ла�ка, оберіть дій�ний тип додатку."
 
+#. %$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 "%s не є дій�ною вер�ією дл� %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "ID цього додатку недій�не: %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"
@@ -1939,6 +2967,7 @@ msgstr ""
 msgid "devcp_error_invalid_version_spaces"
 msgstr "Вер�і� цього додатку недій�на: вер�ії не можуть мі�тити пробілів."
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1948,6 +2977,7 @@ msgstr "�а�тупна помилка з’�вила�� під ча� ана
 msgid "devcp_error_move_file"
 msgstr "�еможливо перемі�тити файл"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1970,15 +3000,15 @@ msgstr "Дл� цього додатку не знайдено жодного ID
 msgid "devcp_error_no_platform"
 msgstr "Жодної платформи не обрано"
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "Ви повинні подати потрібні деталі дл� поданн�."
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "Ви не можете подавати додаток попередньої вер�ії."
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "Ви можете подавати тільки додатки, �кі вже в пі�очниці."
 
@@ -1990,6 +3020,8 @@ msgstr "Будь ла�ка, оберіть принаймні одну кате
 msgid "devcp_error_one_user"
 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"
@@ -1997,13 +3029,13 @@ msgstr ""
 "Це розширенн� файлу (%s) недозволене дл� знімку екрану. Будь ла�ка, "
 "викори�тайте одне з на�тупних: %s"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
 msgid "devcp_error_saving"
 msgstr "Стала�� помилка при збереженні ваших даних."
 
-#: controllers/developers_controller.php:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "Вам не дозволено оновлювати цей додаток."
 
@@ -2019,7 +3051,7 @@ msgstr ""
 "Додатки не можуть викори�товувати URL оновленн�. Будь ла�ка, вилучте його з "
 "install.rdf та �пробуйте знову."
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Будь ла�ка, відвантажте файл."
@@ -2241,7 +3273,7 @@ msgstr "Мої додатки"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Локалізовані пол�"
 
-# %1 типова мова
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2285,33 +3317,68 @@ msgstr "�аді�лати додаток"
 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: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 "Повернути�� до деталей додатку"
 
-# %1 назва додатку
+#. %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"
 
-# %1 автовизначений тип додатку
+#. %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: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 ""
 "Ска�уванн� цього, �к типового знімку екрану �причинить автоматичне "
 "перемиканн� іншого знімку на роль типового."
 
-# %1 типова мова (україн�ька)
-# %2 типовий код мови (uk-UA)
-# %3 назва мови поточної �торінки (Deutsch)
-# %4 код мови поточної �торінки (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"
@@ -2326,9 +3393,14 @@ msgstr ""
 "Зробивши цей знімок типовим ви приберете типовий �тату� з поточного типового "
 "знімку."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2357,6 +3429,60 @@ msgstr "Редагувати знімок"
 msgid "devcp_preview_updated_successfully"
 msgstr "Знімок екрану оновлено у�пішно."
 
+#: 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 ""
@@ -2368,10 +3494,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Додати знімок екрану"
 
+#: 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 "Редагувати знімок екрану"
 
+#: 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 "Файл знімку екрану"
@@ -2380,6 +3516,34 @@ msgstr "Файл знімку екрану"
 msgid "devcp_previews_label_makedefault"
 msgstr "Зробити це типовим зображенн�м перегл�ду"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "Стерти знімок екрану"
@@ -2396,56 +3560,171 @@ msgstr "Редагувати знімок"
 msgid "devcp_previews_submit_upload"
 msgstr "Відвантажити знімок екрану"
 
+#: 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 "�евірно?"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "Ви впевнені, що хочете �терти цей файл?"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
+
+#: 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 "Пропу�тити оновленн� інформації про мій поточний додаток"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Active Daily Users"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> Total Downloads"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Weekly Downloads"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "Подаванн� додатків зараз відключено. Будь ла�ка, �пробуйте знову пізніше."
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "Я погоджую�ь"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Я відмовл�ю�ь"
 
@@ -2461,11 +3740,11 @@ msgstr "Відключено"
 msgid "devcp_summary_header_trusted"
 msgstr "Довірено"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "О�танн� вер�і�:"
 
-# %1 по�иланн� на �торінку над�иланн� додатку
+#. %1 is a link to the add-on submit page
 #: views/developers/index.thtml:101
 #, php-format
 msgid "devcp_summary_noaddons_submit_one"
@@ -2475,7 +3754,7 @@ msgstr "У ва� немає жодних додатків. Клацніть %s
 msgid "devcp_summary_noaddons_submit_one_link"
 msgstr "тут"
 
-# %1 is the link to the перегл�д upload page
+#. %1 is the link to the preview upload page
 #: views/developers/add_step5.thtml:68
 #, php-format
 msgid "devcp_theme_upload_preview"
@@ -2485,30 +3764,674 @@ msgstr "Будь ла�ка, переконайте��, що %s дл� вашо
 msgid "devcp_theme_upload_preview_link"
 msgstr "Відвантажити знімок екрану"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Будь ла�ка, дивіть�� %s дл� довідки."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "цю �торінку"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Редагувати вер�ію"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "Вер�і� оновлена у�пішно."
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Цей додаток відключено"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Фільтр"
@@ -2517,7 +4440,7 @@ msgstr "Фільтр"
 msgid "editorcp_logs_filter_by"
 msgstr "Фільтр за типом/дією"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Журнал подій"
 
@@ -2569,6 +4492,7 @@ msgstr "Приховати коментарі"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Показати коментарі"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2578,7 +4502,7 @@ msgstr "Дивити�� запи�и між %s та %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "За цей період не знайдено перегл�дів."
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Журнал огл�ду"
 
@@ -2602,24 +4526,24 @@ msgstr "�ещодавн� активні�ть редакторів"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Загалом перегл�дів"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Перегл�д додатку"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Будь ла�ка, заповніть на�тупні пол�:"
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Будь ла�ка, оберіть принаймні один файл дл� перегл�ду."
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Самоперегл�ди недозволені."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Зовнішні програми"
 
@@ -2631,39 +4555,39 @@ msgstr "Add feature"
 msgid "editors_featured_add_feature_submit"
 msgstr "Add"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Successfully added feature."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Successfully removed feature."
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Featured Add-ons"
 
@@ -2695,39 +4619,40 @@ msgstr "Політика додатків"
 msgid "editors_notice_filter_session"
 msgstr "Ці фільтри залишатимуть�� на мі�ці на цю �е�ію або до очищенн�."
 
-# %1 режим черги
+#. %1 is the queue mode
 #: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Зараз немає %s додатків дл� перегл�ду."
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 день"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 година"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 хвилина"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Панель управлінн� редактора"
 
-#: controllers/editors_controller.php:286
+#. %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 "лише %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Попередн� вер�і�"
 
-# %1 назва програми
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2741,20 +4666,25 @@ msgstr "Очи�тка"
 msgid "editors_queue_submit_filter"
 msgstr "Фільтр"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "В�і черги перегл�дів зараз відключено. Будь ла�ка, �пробуйте знову пізніше."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Ді� перегл�ду"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Проштовхнути на публіку"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Запро�ити �уперперегл�д"
 
@@ -2762,31 +4692,39 @@ msgstr "Запро�ити �уперперегл�д"
 msgid "editors_review_action_sandbox"
 msgstr "Залишити у пі�очниці"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Перегл�д коментарів"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "Це позначить додаток і його о�танню вер�ію та файли �к публічні. Майбутні "
 "вер�ії підуть у пі�очницю, поки їх не перегл�не редактор."
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Це залишить додаток у пі�очниці."
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Це �хвалить вер�ію пі�очниці публічного додатку до по�ви на публічній "
 "�тороні."
 
-#: views/editors/review.thtml:162
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "Це зму�ить вер�ію пі�очниці публічного додатку залишити�� у пі�очниці."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Якщо у ва� є думки щодо безпеки цього додатку, питань автор�ьких прав або "
@@ -2813,15 +4751,15 @@ msgstr "Категорії:"
 msgid "editors_review_header_compatibility"
 msgstr "Сумі�ні�ть:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Опи�"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Коментарі розробника"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "ЛУКК"
 
@@ -2829,85 +4767,111 @@ msgstr "ЛУКК"
 msgid "editors_review_header_files"
 msgstr "Файли:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "І�торі� предмету"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Повідомленн� поданн�"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Попередні перегл�ди"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Умови конфіденційно�ті"
 
-# %1 назва додатку and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Перегл�д %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Примітки перегл�дачу"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Під�умок"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Примітки вер�ії"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "Перегл�д адміна"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "Поданн� �хвалено/публіка"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "Поданн� відхилено/пі�очниц�"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "�еможливо знайти попередні перегл�ди."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "Перегл�д адміна"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Схвалено/публіка"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Відхилено/пі�очниц�"
 
-#: views/editors/review.thtml:198
+#. 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 "Програми:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "або оберіть �тандартну відповідь:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Коментарі:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Операційні �и�теми:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Верх"
 
@@ -2916,7 +4880,7 @@ msgstr "Верх"
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "�е знайдено попередніх перегл�дів."
 
@@ -2925,42 +4889,49 @@ msgstr "�е знайдено попередніх перегл�дів."
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Ді� обробки"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Ді�"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Коментарі"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Дата"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Перегл�дач"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Вер�і�/файл"
 
-#: controllers/editors_controller.php:411
+#: 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 "Перегл�д у�пішно оброблено."
 
@@ -2986,7 +4957,7 @@ msgstr "Ді�"
 msgid "editors_reviews_in_reply_to"
 msgstr "У відповідь на:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Перегл�ди оброблено у�пішно!"
 
@@ -2998,23 +4969,23 @@ msgstr "�а модеруванні зараз немає перегл�дів."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Перегл�ди обробки"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Окремий �айт"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "�ове"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Оновлене"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Випробувана програма"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Випробувані операційні �и�теми"
 
@@ -3055,17 +5026,20 @@ msgstr "Платформи"
 msgid "editors_th_submissiontypes"
 msgstr "Типи подаванн�"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s днів"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s годин"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s хвилин"
@@ -3074,8 +5048,8 @@ msgstr "%s хвилин"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "У до�тупі відмовлено"
 
@@ -3083,12 +5057,13 @@ msgstr "У до�тупі відмовлено"
 msgid "error_access_denied_message"
 msgstr "Вам недозволено огл�дати цю �торінку."
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3098,18 +5073,19 @@ msgstr "Вам недозволено огл�дати цю �торінку."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Додаток не знайдено!"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Цей додаток не перегл�даєть�� тут."
 
@@ -3117,7 +5093,7 @@ msgstr "Цей додаток не перегл�даєть�� тут."
 msgid "error_addon_selfreview"
 msgstr "Ви не можете огл�дати �вої вла�ні додатки."
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Жодних додатків у цій категорії!"
 
@@ -3139,24 +5115,25 @@ msgstr "Це недій�на email адре�а."
 msgid "error_field_required"
 msgstr "Це поле не повинно бути пу�тим."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "Файл не знайдено!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Помилка файлу: %s не знайдено."
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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 "У цій формі є помилки. Будь ла�ка, виправте їх і знову надішліть."
@@ -3173,16 +5150,18 @@ 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3201,7 +5180,7 @@ msgstr "Повідомленн�"
 msgid "error_preview_notfound"
 msgstr "Знімок не знайдено!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Ви повинні зазначити рейтинг."
 
@@ -3254,8 +5233,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "�евірне ім’� кори�тувача або пароль!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Вер�ію не знайдено!"
 
@@ -3267,13 +5246,14 @@ msgstr "Введено невірний пароль!"
 msgid "feature_learnmore"
 msgstr "Дізнайте�ь більше"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Дізнати�ь більше про %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3285,6 +5265,45 @@ msgstr[1] "огл�дів"
 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "В�і права захищені."
@@ -3321,7 +5340,7 @@ msgstr "Інші мови:"
 msgid "footer_privacy_policy"
 msgstr "Умови конфіденційно�ті"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "Зберегти"
 
@@ -3329,7 +5348,7 @@ msgstr "Зберегти"
 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:110
 msgid "general_addontype_dict_plural"
 msgstr "Словники"
@@ -3338,7 +5357,7 @@ msgstr "Словники"
 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Розширенн�"
@@ -3347,7 +5366,7 @@ msgstr "Розширенн�"
 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Пакети перекладу додатка"
@@ -3356,7 +5375,7 @@ msgstr "Пакети перекладу додатка"
 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Пакети перекладу"
@@ -3365,7 +5384,7 @@ msgstr "Пакети перекладу"
 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Модулі"
@@ -3374,7 +5393,7 @@ msgstr "Модулі"
 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:111
 msgid "general_addontype_search_plural"
 msgstr "За�іб Пошуку"
@@ -3383,11 +5402,12 @@ msgstr "За�іб Пошуку"
 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:109
 msgid "general_addontype_theme_plural"
 msgstr "Теми"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3418,12 +5438,12 @@ msgid "header_navlink_addons"
 msgstr "Додатки"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Вийти"
 
@@ -3431,36 +5451,41 @@ msgstr "Вийти"
 msgid "header_navlink_myaccount"
 msgstr "Мій профіль"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Реє�траці�"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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
+#. %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 "<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/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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3483,7 +5508,7 @@ msgid "langtools_download_langpack"
 msgstr "Завантажити мовний пакет"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Словники та мовні пакети"
 
@@ -3540,7 +5565,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3573,7 +5602,7 @@ msgstr "Теми"
 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:214
 msgid "other_users"
 msgstr "інші"
@@ -3588,42 +5617,41 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_experimental_addons"
 msgstr "Experimental Add-ons"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 #, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 #, fuzzy
 msgid "page_title_policy"
 msgstr "Add-ons Policy"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 #, fuzzy
 msgid "page_title_privacy"
 msgstr "Mozilla Privacy Policy"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 #, fuzzy
 msgid "page_title_review_guide"
 msgstr "Review Guidelines"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 #, fuzzy
 msgid "page_title_sandbox"
 msgstr "Sandbox Review System"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 #, fuzzy
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
@@ -3643,6 +5671,7 @@ msgstr ""
 "підтримкою принаймні однієї з нижчевказаних програм. Лише нижчевказані "
 "вер�ії дозволені дл� цих програм."
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3650,6 +5679,8 @@ 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:92
 msgid "pages_appversions_required_files_link"
 msgstr "тут"
@@ -3658,7 +5689,6 @@ msgstr "тут"
 msgid "pages_appversions_versions"
 msgstr "Вер�ії"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "�азад на попередню �торінку"
 
@@ -3670,7 +5700,7 @@ 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"
@@ -3695,8 +5725,8 @@ msgstr "Введіть відповідь �юди:"
 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
+#. %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"
@@ -3704,8 +5734,8 @@ 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
+#. %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"
@@ -3721,7 +5751,7 @@ msgstr "Ви людина?"
 msgid "recaptcha_whatsthis"
 msgstr "Що це?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Помилка відмічанн� цього відгуку!"
 
@@ -3751,7 +5781,7 @@ msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
 
@@ -3765,7 +5795,7 @@ 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
+#. %1 is the URL of the support section, %2 for the review guidelines
 #: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3782,21 +5812,22 @@ msgstr ""
 "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:54 views/reviews/display.thtml:54
 #: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Перегл�дів дл� %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Вла�тиві додатки"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "�айновіші додатки"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Оновлені додатки"
 
@@ -3833,6 +5864,7 @@ msgstr "В�і пошукові за�оби"
 msgid "search_landing_browse_search_engines"
 msgstr "перегл�нути пошукові за�оби"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3852,12 +5884,13 @@ msgstr "Пошук додатків"
 msgid "search_rss_description"
 msgstr "Пошук RSS результатів"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Пошук результатів дл�: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Ін�трументи адміна"
 
@@ -3865,7 +5898,7 @@ msgstr "Ін�трументи адміна"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Ін�трументи розробника"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Ін�трументи редактора"
 
@@ -3873,6 +5906,7 @@ msgstr "Ін�трументи редактора"
 msgid "sidebar_navlink_welcome"
 msgstr "Ла�каво про�имо"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3910,6 +5944,7 @@ msgstr "Тему"
 msgid "sidebar_pitch_updated_addons"
 msgstr "Оновлені додатки"
 
+#. %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
@@ -3921,7 +5956,7 @@ msgstr "%1$s КБ"
 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3939,24 +5974,32 @@ msgstr "Ін�трументи розробника"
 msgid "statistics_addon_switch"
 msgstr "Перемкнути додаток"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "M. j"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "M. j, 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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3998,7 +6041,7 @@ msgstr "Statistics Dashboard"
 msgid "statistics_index_view_button"
 msgstr "View Statistics"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
@@ -4016,7 +6059,7 @@ msgstr "Remove this plot"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
@@ -4026,104 +6069,109 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s found in range"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Add Plot"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Add another plot to this graph"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Hide Total Count"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Show Total Count"
 
-#: controllers/statistics_controller.php:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "View Data (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Hide %s Events"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Show %s Events"
 
-#: controllers/statistics_controller.php:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Hide Firefox Events"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Show Firefox Events"
 
-#: controllers/statistics_controller.php:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Collapse Graph"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expand Graph"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Resize the graph"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Active Daily Users"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Custom"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operating System"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Add-on Status"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Summary"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Add-on Version"
 
@@ -4147,12 +6195,12 @@ msgstr "Unknown"
 msgid "statistics_longnames_version"
 msgstr "Add-on Version"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr ""
 "There is not yet enough data to display this graph. Please check back later."
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
 "We don't have any data for your add-on yet. Please check back in a few days."
@@ -4164,12 +6212,12 @@ msgstr ""
 "may be incomplete as our scripts work to update this information. Please "
 "check back in a few minutes."
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr ""
 "The Statistics Dashboard is currently disabled. Please check back later."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "JavaScript is required to view the Statistics Dashboard graphs."
 
@@ -4184,36 +6232,36 @@ msgstr "Your settings have been updated!"
 msgid "statistics_pagetitle"
 msgstr "Statistics Dashboard"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Active Daily Users"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Daily Downloads"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Zoom In"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Zoom in one month"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Zoom Out"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out one month"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Daily summary of statistics for %1$s"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "RSS feed of summary data"
 
@@ -4253,23 +6301,23 @@ msgstr "Public"
 msgid "statistics_settings_access_public_description"
 msgstr "Anyone can view this add-on's statistics"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Change Settings"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Please treat this information as confidential."
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "This dashboard is currently <b>private</b>."
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "This dashboard is currently <b>public</b>."
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Locked"
 
@@ -4286,7 +6334,7 @@ msgstr "Save Settings"
 msgid "statistics_settings_title"
 msgstr "Statistics Dashboard Settings for %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Unlocked"
 
@@ -4310,7 +6358,7 @@ msgstr "Uk"
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Average Daily Downloads"
 
@@ -4318,37 +6366,37 @@ msgstr "Average Daily Downloads"
 msgid "statistics_summary_downloads_heading"
 msgstr "Downloads"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Last Day Count"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in the last 7 days"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Total Downloads"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Since %1$s"
 
 #: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "No data yet"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Average Daily Active Users"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Change from previous count"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s on %2$s"
@@ -4357,17 +6405,17 @@ msgstr "%1$s on %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Active Daily Users"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Active Daily Users"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "On %1$s"
 
 #: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Statistics"
@@ -4392,7 +6440,7 @@ msgstr "Змінити пароль"
 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:49
 #, fuzzy
 msgid "user_del_account_deleted"
@@ -4416,7 +6464,7 @@ msgstr "Confirm Password"
 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:62
 #, fuzzy
 msgid "user_del_error_addons"
@@ -4426,7 +6474,7 @@ msgstr ""
 "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:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
@@ -4444,7 +6492,7 @@ msgstr ""
 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:83
 #, fuzzy
 msgid "user_del_error_unknown"
@@ -4457,7 +6505,7 @@ msgstr ""
 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:93
 #, fuzzy
 msgid "user_del_header_delete_account"
@@ -4487,7 +6535,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
@@ -4506,7 +6554,7 @@ msgstr "Я розумію, що цей крок не відворотній."
 msgid "user_deleted_nickname"
 msgstr "Видалений кори�тувач"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4519,9 +6567,9 @@ msgstr ""
 msgid "user_edit_delete_user"
 msgstr "Видалити ваш обліковий запи�"
 
-# Це мі�тить email, �кий над�илаєть�� кори�тувачам, коли вони реє�трують новий 
-# рахунок:
-# %1 URL підтвердженн�, %2 поточна програма
+#. 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"
@@ -4541,8 +6589,7 @@ msgstr ""
 "Д�куємо, що приєднали�� до �айту додатків %2$s\n"
 "-- Колектив додатків %2$s"
 
-# %1 is the confirmation url, %2 is the application name
-# php-format
+#. %1 is the confirmation url, %2 is the application name
 #: views/users/email/emailchange_plain.thtml:6
 #: views/users/email/emailchange_plain.thtml:8
 #, fuzzy, php-format
@@ -4566,8 +6613,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "Д�куємо за реє�трацію на �айті додатків %s"
 
-# Це email �киданн� парол�
-# %1 URL �киданн� парол�, %2 програма
+#. 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"
@@ -4594,8 +6641,7 @@ msgstr "Скиньте �вій пароль додатків %s"
 msgid "user_emailchange_error"
 msgstr "Помилка!"
 
-# %1 is the application name
-# php-format
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, fuzzy, php-format
 msgid "user_emailchange_subject"
@@ -4605,8 +6651,7 @@ msgstr "Будь лаÑ�ка підтвердіть зміну Ñ�воєї пошÑ
 msgid "user_emailchange_success"
 msgstr "У�піх!"
 
-# %1 is the new email address
-# php-format
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, fuzzy, php-format
 msgid "user_emailchange_successful_description"
@@ -4781,7 +6826,7 @@ msgstr "�аді�лати по�иланн� �киданн� парол�"
 msgid "user_register_amo_link"
 msgstr "%s додатків"
 
-# %1 кори�тувацький email, %2 поточна програма
+#. %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"
@@ -4790,7 +6835,7 @@ msgstr ""
 "електронною поштою на вашу адре�у %1$s. Ви повинні клікнути його перед тим, "
 "�к увійти на Додатки %2$s."
 
-# %1 кори�тувацький email
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4807,7 +6852,7 @@ msgstr "повторно надіÑ�лати повідомленнÑ� підтвÐ
 msgid "user_register_congratulations"
 msgstr "Вітаємо! Ваш кори�тувацький рахунок у�пішно �творено."
 
-# %1 по�иланн� на �торінку "коду повторного над�иланн� підтвердженн�"
+#. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
 msgid "user_register_resend_confirmation_link"
@@ -4816,7 +6861,7 @@ msgstr ""
 "email’у не позначила його �к \"junk mail\" або \"spam\". Якщо потрібно, ми "
 "можемо  %1$s на ваш вищезгаданий email."
 
-# %1 по�иланн� на першу �торінку Додатків Mozilla’и
+#. %1 is the link to the Mozilla Add-ons front page
 #: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
@@ -4880,7 +6925,7 @@ msgstr "Прізви�ько"
 msgid "users_info_pagetitle"
 msgstr "Інформаці� кори�тувача дл� %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
@@ -4890,8 +6935,8 @@ msgstr "Reviews by %s"
 msgid "users_login_pagetitle"
 msgstr "Вхід кори�тувача"
 
-# %1 по�иланн� на �торінку пі�очниці/по��ненн� політики
-# Це повідомленн� дл� незнайденого о�обливого додатку
+#. %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"
@@ -4900,8 +6945,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
 #: views/users/login.thtml:56
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4917,3 +6962,33 @@ msgstr "Скиданн� парол� кори�тувача"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Реє�траці� нового кори�тувача"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "�айо�танніша вер�і� �умі�на з"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+#~ msgid "search_form_submit"
+#~ msgstr "Шукати"
diff --git a/site/app/locale/vi/LC_MESSAGES/messages.po b/site/app/locale/vi/LC_MESSAGES/messages.po
index 4ab8afc..b39a5e1 100644
--- a/site/app/locale/vi/LC_MESSAGES/messages.po
+++ b/site/app/locale/vi/LC_MESSAGES/messages.po
@@ -16,6 +16,10 @@ msgstr ""
 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 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
@@ -44,38 +48,34 @@ msgstr "Công cộng"
 msgid "a_header_sandbox"
 msgstr "Hộp cát"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "�ã thêm %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "Cập nhật %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Phiên bản %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "tổng số lượt tải"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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
+#. %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"
@@ -92,22 +92,22 @@ msgstr "má»—i trang"
 msgid "addon_list_sortby"
 msgstr "Sắp theo:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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 addon name, %2 is the platform
+#. %1 is the add-on name, %2 is the platform
 #: 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 addon name
+#. %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
@@ -116,7 +116,7 @@ msgstr "%1$s không hiện hữu cho %2$s."
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Quay lại %1$s..."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -135,6 +135,7 @@ msgstr "�ánh giá:"
 msgid "addon_review_add_submit"
 msgstr "Gửi đánh giá"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -168,23 +169,24 @@ msgstr "Có"
 msgid "addon_review_delete_header"
 msgstr "Xóa �ánh-giá"
 
-#: controllers/reviews_controller.php:444
+#: 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:46
 #, php-format
 msgid "addon_review_edit_title"
 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:534
+#. %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."
 
-# Removing an extra comma
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
@@ -195,7 +197,7 @@ msgstr ""
 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.
+#. %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"
@@ -203,16 +205,16 @@ msgid_plural "addon_review_others_by_user"
 msgstr[0] "Xem %1$s bài đánh giá trước được gửi bởi %2$s cho tiện ích này."
 msgstr[1] "Xem %1$s bài đánh giá trước được gửi bởi %2$s cho tiện ích này."
 
-# %1 is the addon name
+#. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 msgid "addon_review_pagetitle"
 msgstr "�ánh giá cho %s"
 
-# %1 is the user, %2 is the (localized) date
+#. %1 is the user, %2 is the (localized) date
 #: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -226,13 +228,13 @@ msgstr "Nhà phát triển trả l�i:"
 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:285 views/addons/display.thtml:288
+#: 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
+#. %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
@@ -255,11 +257,13 @@ msgstr "Tiện ích Trước"
 msgid "addon_version_permalink"
 msgstr "Liên kết tĩnh đến tiện ích này"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-msgstr "Phiên bản gần nhất tương thích với"
+#. %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 "Phiên bản mới nhất tương thích với %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Gá»­i Ä‘i"
 
@@ -267,19 +271,20 @@ msgstr "Gá»­i Ä‘i"
 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:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
 msgstr "Duyệt xem tất cả Giao diện :: Tiện ích %1$s"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
 msgstr "Duyệt xem Giao diện %1$s :: Tiện ích %2$s"
 
@@ -287,7 +292,7 @@ msgstr "Duyệt xem Giao diện %1$s :: Tiện ích %2$s"
 msgid "addons_display_add_review"
 msgstr "Thêm đánh giá"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Chi tiết Nâng cao"
 
@@ -295,11 +300,11 @@ msgstr "Chi tiết Nâng cao"
 msgid "addons_display_categories"
 msgstr "Phân mục"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "đánh giá chi tiết"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: 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"
@@ -308,143 +313,149 @@ msgstr "Không thích"
 msgid "addons_display_edit_review"
 msgstr "Chỉnh sửa đánh giá của bạn"
 
-#: views/addons/display.thtml:143
+#: 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/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: 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:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Trang chủ"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "�ánh giá"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Hỗ trợ"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Thích"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "Mô tả �ầy đủ"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Nhi�u Hình Hơn"
 
-# %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:421
-#, fuzzy
+#. %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] "Tiện ích khác của %1$s"
-msgstr[1] "Other add-ons by these authors"
+msgstr[1] "Tiện ích khác của các tác giả này"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: 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"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: 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"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: 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:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Xếp hạng nó"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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 đ�."
 
-# %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "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:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "LÆ°u"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: 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:195 views/addons/display.thtml:197
+#: 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:196
+#: 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:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Xem nguồn"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Xem thống kê"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Bạn nghĩ sao?"
 
@@ -454,7 +465,7 @@ msgstr "Hoạt động trên:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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"
@@ -465,10 +476,11 @@ msgstr "bởi"
 msgid "addons_home_feature_head"
 msgstr "Chúng tôi khuyên dùng"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -483,7 +495,9 @@ msgstr "Mới nhất:"
 msgid "addons_home_other_applications"
 msgstr "Chương trình Khác"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -493,19 +507,20 @@ msgstr "Chương trình Khác"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -599,6 +614,7 @@ msgstr "cho Max OS X"
 msgid "addons_plugins_for_windows"
 msgstr "cho Windows"
 
+#. %1$s is a URL
 #: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
@@ -619,12 +635,13 @@ msgstr ""
 "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ó."
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Phần bổ trợ Thông dụng cho %1$s"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "Phần bổ trợ"
 
@@ -635,6 +652,7 @@ msgstr "Phần bổ trợ"
 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:68
 #, php-format
 msgid "addons_policy_eula_require"
@@ -642,24 +660,24 @@ 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 addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Xem trÆ°á»›c cho %s"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 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é!"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "Tiện ích được Khuyên dùng"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "Tiện ích được Khuyên dùng"
 
@@ -667,7 +685,7 @@ msgstr "Tiện ích được Khuyên dùng"
 msgid "addons_searchengines_additional_resources"
 msgstr "Tài nguyên Khác"
 
-# link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Trung tâm Phát triển Mozilla"
@@ -685,35 +703,35 @@ msgstr ""
 "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
+#. %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 "H�c cách %1$s trên %2$s."
 
-# link path to search plugins instructions, relative to devmo
+#. 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 "/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: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
+#. %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 "Duyệt qua các máy tìm kiếm tại %1$s"
 
-# link text to mycroft.mozdev.org
+#. 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:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "Máy tìm kiếm"
 
@@ -726,7 +744,7 @@ msgstr ""
 msgid "addons_status_disabled"
 msgstr "Bị vô hiệu hóa"
 
-#: controllers/components/amo.php:191
+#: 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"
 
@@ -764,11 +782,12 @@ 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."
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "Lịch sử Phiên bản cùng với Lưu kí Thay đổi"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s Lịch sử Phiên bản"
@@ -781,6 +800,7 @@ msgstr "Thêm Nhóm"
 msgid "admin_group_delete_pagetitle"
 msgstr "Xóa Nhóm"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -906,16 +926,20 @@ msgstr "B� qua việc kiểm tra phiên bản"
 msgid "app_compat_older_firefox_only"
 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: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>"
 
+#. %1$s is a URL
 #: 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:64
 msgid "app_compat_unreleased_version"
 msgstr ""
@@ -927,23 +951,23 @@ msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Nâng cấp Firefox</a> để dùng tiện ích này"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "Tiện ích xếp theo Tên"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "Tiện ích Mới nhất"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "Tiện ích Thông dụng"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "Tiện ích xếp theo Xếp hạng"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "Tiện ích được Cập nhật Gần đây"
 
@@ -975,7 +999,7 @@ msgstr "Cập nhật Gần đây Trước"
 msgid "category_extra_mostpopular"
 msgstr "Thông dụng nhất Trước"
 
-# %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"
@@ -985,11 +1009,19 @@ msgstr "Xem tất cả %1$s"
 msgid "collection_not_found"
 msgstr "Không tìm thấy bộ sưu tập!"
 
+#. %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"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
@@ -1022,6 +1054,8 @@ msgstr "�i�u chỉnh maxVersion mà không cần tải lên"
 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:130
 msgid "compatibility_developers_login_first"
 msgstr ""
@@ -1045,6 +1079,10 @@ msgstr "Kết quả Kiểm tra Trạng thái Tiện ích"
 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  
+#. %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 ngư�i dùng %2$s (%3$s&#37; trên tổng số)"
@@ -1059,6 +1097,8 @@ msgstr ""
 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:69
 msgid "compatibility_report_intro"
 msgstr ""
@@ -1069,6 +1109,7 @@ msgstr ""
 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: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"
@@ -1077,6 +1118,7 @@ msgstr "Các tiện ích tương thích với phiên bản alpha của %1$s"
 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:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
@@ -1086,6 +1128,7 @@ msgstr ""
 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: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"
@@ -1094,6 +1137,7 @@ msgstr "Các tiện ích cập nhật theo các bản xây dựng của %1$s"
 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: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"
@@ -1111,12 +1155,13 @@ msgstr "Thông tin cho Ngư�i dùng Tiện ích"
 msgid "compatibility_view_report"
 msgstr "Hiển thị Báo cáo Tính tương thích"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "�ể thêm thông tin v� sự đóng góp, vui lòng xem %s."
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "trang wiki"
 
@@ -1158,26 +1203,35 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Giấy phép Creative Commons "
 "Attribution 2.5</a>."
 
-# date format string as used in PHP's strftime():
-# http://php.net/strftime
+#: 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>."
+
+#. 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:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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)
+#. 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 tháng %m năm %Y, %I:%M %p"
@@ -1203,14 +1257,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
 #: controllers/components/developers.php:1163
 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"
@@ -1258,36 +1340,36 @@ 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:2661
+#: 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:2283
-#: controllers/developers_controller.php:2284
+#: 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:2656
+#: 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:2196
-#: controllers/developers_controller.php:2484
+#: 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:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "EULA"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: 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:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "Tên của Tiện ích"
 
@@ -1296,40 +1378,298 @@ msgstr "Tên của Tiện ích"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Tiêu đ� xem trước"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: 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:2185
-#: controllers/developers_controller.php:2473
+#: 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:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "Email hỗ trợ"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "URL hỗ trợ"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: 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:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "�� cử Tiện ích"
 
-#: controllers/developers_controller.php:2729
+#: controllers/developers_controller.php:2814
 msgid "devcp_addon_nominated_successfully"
 msgstr "Tiện ích đã được ứng cử thành công!"
 
-# %1 is the addon edit link
-# %2 is the main dev CP link
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1352,7 +1692,7 @@ msgstr ""
 "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
+#. %1 is the link to the sandbox information page
 #: views/developers/add_step5.thtml:63
 #, php-format
 msgid "devcp_addon_submission_sandbox_readmore"
@@ -1362,7 +1702,7 @@ 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"
 
-# %1 is the "nominate" link
+#. %1 is the "nominate" link
 #: views/developers/add_step5.thtml:60
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
@@ -1385,16 +1725,16 @@ 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:1475
-#: controllers/developers_controller.php:1476
+#: 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:2375
+#: 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
+#. %1 is the link to the preview upload page
 #: views/developers/add_step5.thtml:71
 #, php-format
 msgid "devcp_addon_upload_preview"
@@ -1404,7 +1744,7 @@ msgstr "Có thể bạn sẽ muốn %s để tăng sự quan tâm đối với t
 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
+#. #1 is the author email
 #: views/developers/author_lookup.thtml:41
 #, php-format
 msgid "devcp_author_lookup_none_found"
@@ -1433,10 +1773,102 @@ msgstr "Tiếp"
 msgid "devcp_change_addontype"
 msgstr "Thay đổi kiểu tiện ích:"
 
-#: controllers/developers_controller.php:1402
+#: 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
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "Thêm phần xem trước"
@@ -1529,6 +1961,7 @@ msgstr "Không có url hỗ trợ của nhà phát triển."
 msgid "devcp_details_trusted"
 msgstr "�ược tin tưởng"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1558,6 +1991,7 @@ msgstr ""
 "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"
@@ -1577,11 +2011,65 @@ 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
+#, fuzzy
+msgid "devcp_discuss_addreply_header"
+msgstr "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "Thêm Tác Giả"
@@ -1594,10 +2082,297 @@ msgstr "�ịa chỉ Email của Tác giả"
 msgid "devcp_edit_author_remove"
 msgstr "Xóa"
 
+#: 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 "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
 #: 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
+#, 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 "Tác giả"
@@ -1663,6 +2438,206 @@ msgstr "�ịa danh �ích"
 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
+#, 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 "Cập nhật"
@@ -1673,11 +2648,66 @@ 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
+#, fuzzy
+msgid "devcp_editbox_authors"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "Tiện ích Nổi bật"
 
-# %1 is the review count
+#. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
 #, php-format
@@ -1686,7 +2716,7 @@ msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "Các đánh giá �ã đi�u chỉnh (%s)"
 msgstr[1] "Các đánh giá �ã đi�u chỉnh (%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
 #, php-format
@@ -1695,7 +2725,7 @@ msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "Các tiện ích �ược đ� cử (%s)"
 msgstr[1] "Các tiện ích �ược đ� cử (%s)"
 
-# %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1708,8 +2738,8 @@ msgstr[1] "Các bản cập nhật �ang xem xét (%s)"
 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)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
 #: views/developers/editversion.thtml:58
 #, php-format
 msgid "devcp_editversion_filename_size"
@@ -1735,29 +2765,30 @@ msgstr "Chú ý đối với Ngư�i đánh giá"
 msgid "devcp_editversion_submit_update"
 msgstr "Cập nhật"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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 "
@@ -1766,19 +2797,33 @@ msgstr ""
 "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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "Vui lòng xem %s để tham khảo."
 
+#. 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 "trang này"
 
-#: controllers/developers_controller.php:2013
+#: 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
+#, fuzzy, php-format
+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"
@@ -1786,7 +2831,7 @@ 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:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "Tất cả GUIDs tập tin chưa khớp"
 
@@ -1815,6 +2860,8 @@ msgstr "Vượt quá kích thước tải lên tối đa"
 msgid "devcp_error_http_nofile"
 msgstr "Không có tập tin nào được tải lên"
 
+#. %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"
@@ -1822,13 +2869,14 @@ 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"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Không có install.rdf."
 
@@ -1836,21 +2884,26 @@ 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:1607
+#: 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ệ."
 
+#. %$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 "%s không phải là một phiên bản hợp lệ cho %s"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "�ịnh danh của tiện ích này không hợp lệ: %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"
@@ -1870,6 +2923,7 @@ 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
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1879,6 +2933,7 @@ msgstr "Lỗi sau xảy ra trong khi phân tích install.rdf: %s"
 msgid "devcp_error_move_file"
 msgstr "Không thể di chuyển tập tin"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1901,15 +2956,15 @@ 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:2718
+#: 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:2712
+#: 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:2704
+#: 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."
 
@@ -1921,6 +2976,8 @@ msgstr "Vui lòng thêm ít nhất một phân mục."
 msgid "devcp_error_one_user"
 msgstr "Tiện ích này cần có ít nhất một tác giả."
 
+#. %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"
@@ -1928,13 +2985,13 @@ 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:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: 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:1696
+#: 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."
 
@@ -1950,7 +3007,7 @@ 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:409
+#: 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."
@@ -2171,7 +3228,7 @@ msgstr "Tiện ích của Tôi"
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Các phần được Bản địa hóa"
 
-# %1 is the default locale
+#. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
@@ -2215,33 +3272,68 @@ msgstr "Gửi Tiện �ch"
 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: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 "Trở lại phần chi tiết tiện ích"
 
-# %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 "�� cử %s"
 
-# %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 "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: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 ""
 "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)
+#. %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"
@@ -2256,9 +3348,14 @@ 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."
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2287,6 +3384,60 @@ 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: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 ""
@@ -2298,10 +3449,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Thêm ảnh Xem trước"
 
+#: 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 "Chỉnh sửa Ảnh xem trước"
 
+#: 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 "Tập tin Ảnh xem trước"
@@ -2310,6 +3471,34 @@ msgstr "Tập tin Ảnh xem trước"
 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:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "X�a ảnh Xem trước"
@@ -2326,57 +3515,172 @@ 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: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 "Không đúng?"
 
-#: controllers/developers_controller.php:2632
+#: 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/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
 
+#: 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 "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:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> Ngư�i dùng Hàng ngày"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "<em>%s</em> Tổng số Lượt tải"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Số lượt tải Hàng tuần"
 
-#: controllers/developers_controller.php:1481
+#: 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 ""
 "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/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: 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/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "Tôi Từ Chối"
 
@@ -2392,11 +3696,11 @@ msgstr "Bị vô hiệu hóa"
 msgid "devcp_summary_header_trusted"
 msgstr "Tin cậy"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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 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"
@@ -2406,7 +3710,7 @@ 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"
 
-# %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"
@@ -2416,30 +3720,667 @@ 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"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "Vui lòng xem %s để tham khảo."
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "trang này"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "Chỉnh sửa Phiên bản"
 
-#: controllers/developers_controller.php:2572
+#: 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
+#, 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "Tiện ích này đã bị vô hiệu hóa."
 
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "Tiện ích này chưa được ứng cử."
+
+#: controllers/components/editors.php:213
+msgid "editor_review_error_file_not_pending"
+msgstr "Tập tin này không còn ch� đánh giá nữa."
+
+#. Actions are, for example: approving or rejecting
+#: controllers/components/editors.php:79
+#: controllers/components/editors.php:182
+msgid "editor_review_error_no_action"
+msgstr "Vui lòng ch�n một thao tác đánh giá."
+
+#: controllers/components/editors.php:192
+msgid "editor_review_error_no_applications"
+msgstr "Vui lòng nhập tên chương trình mà bạn đã kiểm nghiệm."
+
+#. 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 "Vui lòng nhập bình luận cho đánh giá."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Vui lòng ch�n ít nhất một tập tin để đánh giá."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "Vui lòng nhập hệ đi�u hành mà bạn đã kiểm nghiệm."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "Bộ l�c"
@@ -2448,7 +4389,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:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Lưu kí Sự kiện"
 
@@ -2500,6 +4441,7 @@ msgstr "Ẩn bình luận"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "Hiện bình luận"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2509,7 +4451,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 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Lưu kí �ánh giá"
 
@@ -2533,24 +4475,24 @@ 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:369
-#: controllers/editors_controller.php:370
+#: 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:460
+#: 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:461
+#: 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:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Không được phép tự đánh giá."
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Phần m�m Bên ngoài"
 
@@ -2562,39 +4504,39 @@ 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:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: 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:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: 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:725
+#: 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:739
-#: controllers/editors_controller.php:741
+#: 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"
 
@@ -2627,39 +4569,40 @@ 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."
 
-# %1 is the queue mode
+#. %1 is the queue mode
 #: 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:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 ngày"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 gi�"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 phút"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: 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"
 
-#: controllers/editors_controller.php:286
+#. %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 "Chỉ cho %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Phát hành thử"
 
-# %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2673,20 +4616,25 @@ msgstr "Xóa trắng"
 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."
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Thao tác �ánh giá"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "�ưa ra Công cộng"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "�� nghị �ánh giá Cấp cao"
 
@@ -2694,34 +4642,42 @@ msgstr "�� nghị �ánh giá Cấp cao"
 msgid "editors_review_action_sandbox"
 msgstr "Vẫn để trong Hộp cát"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "�ánh giá Bình luận"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "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:170
+#: 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:159
+#: 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."
 
-#: views/editors/review.thtml:162
+#: 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."
 
-#: views/editors/review.thtml:174
+#: 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 "
@@ -2748,15 +4704,15 @@ msgstr "Phân mục:"
 msgid "editors_review_header_compatibility"
 msgstr "Tính tương thích:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Mô tả"
 
-#: views/editors/review.thtml:258
+#: 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:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "Th�a thuận Ngư�i dùng Cuối"
 
@@ -2764,85 +4720,111 @@ msgstr "Th�a thuận Ngư�i dùng Cuối"
 msgid "editors_review_header_files"
 msgstr "Tập tin:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Lược sử Danh mục"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Thông điệp �� cử"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Xem trÆ°á»›c"
 
-#: views/editors/review.thtml:252
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Chính sách Riêng tư"
 
-# %1 is the addon name and version
+#. %1 is the add-on name and version
 #: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "�ánh giá %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Ghi chú cho Ngư�i đánh giá"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Tóm tắt"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Ghi chú Phiên bản"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "�ánh giá của Quản trị"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "�� cử �ược chấp thuận / Công cộng"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "�� cử Bị từ chối / Hộp cát"
 
-#: views/editors/review.thtml:315
+#: 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."
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "�ánh giá của Quản trị"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "Chấp thuận / Công cộng"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "Từ chối / Hộp cát"
 
-#: views/editors/review.thtml:198
+#. 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 "Ứng dụng:"
 
-#: views/editors/review.thtml:186
+#: 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:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Bình luận:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Hệ đi�u  hành:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Trên cùng"
 
@@ -2850,7 +4832,7 @@ msgstr "Trên cùng"
 msgid "editors_review_next_link"
 msgstr "tiếp &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Không tìm thấy ảnh xem trước."
 
@@ -2858,41 +4840,47 @@ msgstr "Không tìm thấy ảnh xem trước."
 msgid "editors_review_previous_link"
 msgstr "&laquo; trÆ°á»›c"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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
+#. %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> trên %2$s trong danh sách ch�"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Thao tác Xử lí"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Thao tác"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Bình luận"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Ngày"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Ngư�i đánh giá"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Phiên bản / Tập tin"
 
-#: controllers/editors_controller.php:411
+#: 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)"
+
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "�ánh giá được tiến hành thành công."
 
@@ -2916,7 +4904,7 @@ msgstr "Thao tác"
 msgid "editors_reviews_in_reply_to"
 msgstr "Trả l�i:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "�ánh giá đã được tiến hành thành công!"
 
@@ -2928,23 +4916,23 @@ 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:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Riêng biệt của Trang"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "Má»›i"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "�ã cập nhật"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Ứng dụng đã được Thử nghiệm"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Hệ đi�u hành đã được Thử nghiệm"
 
@@ -2985,17 +4973,20 @@ msgstr "N�n tảng"
 msgid "editors_th_submissiontypes"
 msgstr "Kiểu gửi lên"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s ngày"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s gi�"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s phút"
@@ -3004,8 +4995,8 @@ msgstr "%s phút"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "Truy cập Bị từ chối"
 
@@ -3013,12 +5004,13 @@ 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/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -3028,18 +5020,19 @@ msgstr "Bạn không có quy�n xem trang này."
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: 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:185
+#: 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."
 
@@ -3047,7 +5040,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:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "Không có tiện ích trong phân mục này!"
 
@@ -3069,24 +5062,25 @@ msgstr "�ây không phải là địa chỉ email hợp lệ."
 msgid "error_field_required"
 msgstr "Phần này không được để trống."
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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!"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: 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/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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."
@@ -3103,16 +5097,18 @@ 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3130,7 +5126,7 @@ msgstr "Cảnh báo"
 msgid "error_preview_notfound"
 msgstr "Không tìm thấy ảnh xem trước!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: 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."
 
@@ -3183,8 +5179,8 @@ msgstr ""
 msgid "error_username_or_pw_wrong"
 msgstr "Sai tên truy nhập hoặc mật khẩu!"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: 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!"
 
@@ -3196,13 +5192,14 @@ msgstr "Nhập sai mật khẩu!"
 msgid "feature_learnmore"
 msgstr "Tìm hiểu thêm"
 
-# %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Tìm hiểu thêm v� %1$s"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3214,6 +5211,40 @@ msgstr[1] "%1$s đánh giá"
 msgid "feature_view_more_from_category"
 msgstr "Xem thêm trong"
 
+#. 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 "Trở lại tiện ích"
+
+#. 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 "Mở rộng tất cả"
+
+#. 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 "Trở lại đánh giá"
+
+#. 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 :: Duyệt Tập Tin :: Tiện ích %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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "M�i quy�n được bảo lưu."
@@ -3250,7 +5281,7 @@ msgstr "Ngôn ngữ khác:"
 msgid "footer_privacy_policy"
 msgstr "Chính sách Riêng tư"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "LÆ°u"
 
@@ -3258,7 +5289,7 @@ msgstr "LÆ°u"
 msgid "general_addontype_dict"
 msgstr "Từ điể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:110
 msgid "general_addontype_dict_plural"
 msgstr "Từ điển"
@@ -3267,7 +5298,7 @@ msgstr "Từ điển"
 msgid "general_addontype_extension"
 msgstr "Phần mở rộng"
 
-# 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:108
 msgid "general_addontype_extension_plural"
 msgstr "Phần mở rộng"
@@ -3276,7 +5307,7 @@ msgstr "Phần mở rộng"
 msgid "general_addontype_lpaddon"
 msgstr "Gói ngôn ngữ (Tiện ích)"
 
-# 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Gói ngôn ngữ (Tiện ích)"
@@ -3285,7 +5316,7 @@ msgstr "Gói ngôn ngữ (Tiện ích)"
 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
+#. Plural in this context means many of the add-on type
 #: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Gói ngôn ngữ (Chương trình)"
@@ -3294,7 +5325,7 @@ msgstr "Gói ngôn ngữ (Chương trình)"
 msgid "general_addontype_plugin"
 msgstr "Phần bổ trợ"
 
-# 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "Phần bổ trợ"
@@ -3303,7 +5334,7 @@ msgstr "Phần bổ trợ"
 msgid "general_addontype_search"
 msgstr "Máy tìm kiếm"
 
-# 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:111
 msgid "general_addontype_search_plural"
 msgstr "Máy tìm kiếm"
@@ -3312,11 +5343,12 @@ msgstr "Máy tìm kiếm"
 msgid "general_addontype_theme"
 msgstr "Giao diệ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:109
 msgid "general_addontype_theme_plural"
 msgstr "Giao diện"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3347,12 +5379,12 @@ msgid "header_navlink_addons"
 msgstr "Tiện ích"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Thoát"
 
@@ -3360,39 +5392,43 @@ msgstr "Thoát"
 msgid "header_navlink_myaccount"
 msgstr "Tài khoản của Tôi"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "�ăng kí"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 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.
+#. %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 ""
 "<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/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
+#. %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 "Thêm %1$s vào %2$s"
 
+#. %1$s is the add-on name
 #: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3415,7 +5451,7 @@ msgid "langtools_download_langpack"
 msgstr "Tải xuống Gói ngôn ngữ"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Từ điển và Gói ngôn ngữ"
 
@@ -3504,7 +5540,7 @@ msgstr "Giao diện"
 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"
+#. In a user list: user 1, user 2, "others"
 #: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "ngư�i khác"
@@ -3517,36 +5553,34 @@ msgstr "Phiên bản Ứng dụng"
 msgid "page_title_credits"
 msgstr "Công trạng"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "Các tiện ích Thử nghiệm"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
+msgstr "H�i �áp Thư�ng Gặp"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Câu h�i Thư�ng gặp v� Tạo mốt cho Firefox của bạn"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "Chính sách v� Tiện ích"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Chính sách Riêng tư của Mozilla"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Hướng dẫn �ánh giá"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "Hệ thống �ánh giá Hộp cát"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Trợ giúp Gửi lên"
 
@@ -3565,6 +5599,7 @@ msgstr ""
 "í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:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3572,6 +5607,8 @@ 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:92
 msgid "pages_appversions_required_files_link"
 msgstr "ở đây"
@@ -3580,7 +5617,6 @@ msgstr "ở đây"
 msgid "pages_appversions_versions"
 msgstr "Phiên bản"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "Trở v� trang trước"
 
@@ -3592,7 +5628,7 @@ 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
+#. %1 is page number, %2 is total page count
 #: views/helpers/pagination.php:199
 #, php-format
 msgid "pagination_page_number_title"
@@ -3616,16 +5652,16 @@ msgstr "Nhập câu trả l�i của bạn ở đây:"
 msgid "recaptcha_enter_whatyouhear"
 msgstr "Vui lòng gõ những gì bạn nghe thấy."
 
-# %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 ""
 "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
+#. %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 ""
@@ -3640,7 +5676,7 @@ msgstr "Bạn có phải là ngư�i?"
 msgid "recaptcha_whatsthis"
 msgstr "�ây là gì?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Lỗi khi gán c� hiệu cho đánh giá này!"
 
@@ -3665,7 +5701,7 @@ 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:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: 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."
 
@@ -3679,7 +5715,7 @@ 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
+#. %1 is the URL of the support section, %2 for the review guidelines
 #: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3697,22 +5733,22 @@ msgstr ""
 "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 addon name
+#. %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 "�ánh giá cho %s"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "Tiện ích được �� cao"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "Tiện ích Mới nhất"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "Tiện ích được Cập nhật"
 
@@ -3749,6 +5785,7 @@ msgstr "Tất cả Bộ máy Tìm kiếm"
 msgid "search_landing_browse_search_engines"
 msgstr "Duyệt các Máy tìm kiếm"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3768,12 +5805,13 @@ msgstr "Tìm kiếm Tiện ích"
 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:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Kết quả tìm kiếm cho: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Công cụ Quản trị"
 
@@ -3781,7 +5819,7 @@ msgstr "Công cụ Quản trị"
 msgid "sidebar_navlink_developer_tools"
 msgstr "Công cụ Nhà phát triển"
 
-#: views/addons/home.thtml:166
+#: 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"
 
@@ -3789,6 +5827,7 @@ msgstr "Công cụ Biên tập viên"
 msgid "sidebar_navlink_welcome"
 msgstr "Chào mừng"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3826,6 +5865,7 @@ msgstr "Giao diện"
 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/editversion.thtml:58
 #: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
 #: views/addons/dictionaries.thtml:88
@@ -3837,7 +5877,7 @@ msgstr "%1$s kB"
 msgid "stars_not_yet_rated"
 msgstr "Chưa được xếp hạng"
 
-# %1 is the number of stars this add-on has
+#. %1 is the number of stars this add-on has
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3855,24 +5895,32 @@ msgstr "Công cụ Nhà phát triển"
 msgid "statistics_addon_switch"
 msgstr "Chuyển Tiện �ch"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 tháng %m"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 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:147 views/statistics/addon.thtml:158
+#: 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3914,10 +5962,9 @@ msgstr "Bảng Thống Kê"
 msgid "statistics_index_view_button"
 msgstr "Xem Thống Kê"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
-#, fuzzy
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
-msgstr "View this table in CSV format"
+msgstr "Xem bảng này trong dạng CSV"
 
 #: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
@@ -3928,119 +5975,120 @@ msgid "statistics_js_dropdowns_removeplot"
 msgstr "Xóa b� đồ thị này"
 
 #: controllers/statistics_controller.php:224
-#, fuzzy
 msgid "statistics_js_groupby_selector_date"
-msgstr "Group by: Day"
+msgstr "Nhóm theo: Ngày"
 
-#: controllers/statistics_controller.php:226
-#, fuzzy
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
-msgstr "Group by: Month"
+msgstr "Nhóm theo: Tháng"
 
 #: controllers/statistics_controller.php:225
-#, fuzzy
 msgid "statistics_js_groupby_selector_week"
-msgstr "Group by: Week"
+msgstr "Nhóm theo: Tuần"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "So sánh theo: Tuần"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s được tìm thấy trong khoảng"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Thêm �ồ Thị"
 
-#: controllers/statistics_controller.php:246
+#: 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:236
+#: 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:237
+#: 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:238
+#: 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:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Xem Dữ Liệu (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: 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"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Ẩn Sự Kiện %s"
 
-#: controllers/statistics_controller.php:243
+#: 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:244
+#: 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:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Ẩn Sự Kiện Firefox"
 
-#: controllers/statistics_controller.php:240
+#: 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:241
+#: 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:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Thu g�n Biểu đồ"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Mở rộng Biểu đồ"
 
-#: controllers/statistics_controller.php:249
+#: 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:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Ngư�i dùng Mỗi ngày"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Ứng dụng"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Tùy biến"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Số lần tải"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Hệ đi�u hành"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Trạng thái Tiện ích"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Tóm tắt"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Phiên bản Tiện ích"
 
@@ -4064,11 +6112,11 @@ msgstr "Không rõ"
 msgid "statistics_longnames_version"
 msgstr "Phiên bản Tiện ích"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr "Không đủ dữ liệu để hiển thị biểu đồ này. Vui lòng kiểm tra lại sau."
 
-#: views/statistics/addon.thtml:116
+#: 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 "
@@ -4081,11 +6129,11 @@ msgstr ""
 "đâ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:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "Bảng Thống Kê hiện đang bị vô hiệu hóa. Vui lòng kiểm tra lại sau."
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "JavaScript cần có để xem biểu đồ Bảng Thống Kê."
 
@@ -4100,36 +6148,36 @@ msgstr "Thiết lập của bạn đã được cập nhật!"
 msgid "statistics_pagetitle"
 msgstr "Bảng Thống Kê"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "Ngư�i dùng Mỗi ngày"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "Số lần tải Mỗi ngày"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "Phóng To"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "Phóng to một tháng"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "Thu Nh�"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Thu nh� một tháng"
 
-#: controllers/statistics_controller.php:258
+#: 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/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "RSS feed của dữ liệu tóm tắt"
 
@@ -4169,23 +6217,23 @@ msgstr "Công cộng"
 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:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Thay đổi Thiết lập"
 
-#: views/statistics/addon.thtml:241
+#: 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:233
+#: 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:229
+#: 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:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "�ã khóa"
 
@@ -4202,7 +6250,7 @@ msgstr "Lưu Thiết Lập"
 msgid "statistics_settings_title"
 msgstr "Thiết lập Bảng Thống Kê cho %1$s"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Không khóa"
 
@@ -4226,7 +6274,7 @@ msgstr "Ko.rõ"
 msgid "statistics_shortnames_version"
 msgstr "P.bản"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: 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"
 
@@ -4234,37 +6282,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:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149 views/statistics/addon.thtml:169
+#: 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:70 views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: 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"
@@ -4273,17 +6321,17 @@ 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:143
+#: 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:147
+#: 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/addon.thtml:65 controllers/statistics_controller.php:177
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Thống kê %1$s"
@@ -4308,7 +6356,7 @@ msgstr "Thay đổi mật khẩu"
 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
+#. %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 ""
@@ -4327,7 +6375,7 @@ msgstr "Xác nhận Mật khẩu"
 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
+#. %1 is the URL of the user's info page
 #: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4336,7 +6384,7 @@ msgstr ""
 "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
+#. %1 is a link to the amo-editors mailing list
 #: 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ợ."
@@ -4351,7 +6399,7 @@ msgstr ""
 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
+#. %1 is a link to the amo-admins mailing list
 #: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4363,7 +6411,7 @@ msgstr ""
 msgid "user_del_header_confirm_deletion"
 msgstr "Xác nhận xóa tài khoản"
 
-# %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Xóa Tài Khoản %1$s"
@@ -4388,7 +6436,7 @@ 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
+#. %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4404,7 +6452,7 @@ msgstr "Tôi hiểu rằng bước này sẽ không thể hoàn tác được."
 msgid "user_deleted_nickname"
 msgstr "Ngư�i dùng �ã bị xóa"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4416,9 +6464,9 @@ msgstr ""
 msgid "user_edit_delete_user"
 msgstr "Xóa tài khoản ngư�i dùng"
 
-# 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4437,7 +6485,7 @@ msgstr ""
 "Cảm ơn đã tham gia Tiện �ch %2$s\n"
 "-- �ội ngũ Tiện �ch %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4461,8 +6509,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 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
+#. 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"
@@ -4489,7 +6537,7 @@ msgstr "Khôi phục mật khẩu Tiện �ch %s"
 msgid "user_emailchange_error"
 msgstr "Lá»—i!"
 
-# %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4499,7 +6547,7 @@ msgstr "Vuil lòng xác nhận thay đổi địa chỉ email trên Tiện �ch
 msgid "user_emailchange_success"
 msgstr "Thành công!"
 
-# %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4668,7 +6716,7 @@ msgstr "Gửi liên kết khôi phục mật khẩu"
 msgid "user_register_amo_link"
 msgstr "Tiện ích %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"
@@ -4677,7 +6725,7 @@ msgstr ""
 "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
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4694,7 +6742,7 @@ msgstr "gửi lại thư xác nhận"
 msgid "user_register_congratulations"
 msgstr "Chúc mừng! Tài khoản của bạn đã được tạo thành công."
 
-# %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"
@@ -4703,7 +6751,7 @@ msgstr ""
 "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
+#. %1 is the link to the Mozilla Add-ons front page
 #: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
@@ -4763,7 +6811,7 @@ msgstr "Tên nick"
 msgid "users_info_pagetitle"
 msgstr "Thông tin Ngư�i dùng cho %1$s"
 
-# %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "�ánh giá bởi %s"
@@ -4772,8 +6820,8 @@ msgstr "�ánh giá bởi %s"
 msgid "users_login_pagetitle"
 msgstr "Ngư�i dùng �ăng nhập"
 
-# %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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4782,8 +6830,8 @@ msgstr ""
 "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
+#. %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"
@@ -4799,3 +6847,34 @@ msgstr "Khôi phục Mật khẩu Ngư�i dùng"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "�ăng kí Ngư�i dùng Mới"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Phiên bản gần nhất tương thích với"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
diff --git a/site/app/locale/vi/pages/about.thtml b/site/app/locale/vi/pages/about.thtml
new file mode 100644
index 0000000..0fbd02d
--- /dev/null
+++ b/site/app/locale/vi/pages/about.thtml
@@ -0,0 +1,66 @@
+<h2>addons.mozilla.org là gì?</h2>
+<p>
+  addons.mozilla.org (AMO) là nơi chính thức để chứa những tiện ích cho các chương trình
+  của Mozilla.  Tiện ích cho phép bạn thêm các tính năng mới vào Firefox, Thunderbird,
+  SeaMonkey, và Sunbird.  Từ AMO, bạn có thể duyệt và tải xuống hàng nghìn
+  tiện ích để thay đổi cách thức mà bạn sử dụng internet.
+</p>
+
+<h2>Ai tạo ra những tiện ích này?</h2>
+<p>
+  Hàng nghìn nhà phát triển tiện ích, từ cá nhân riêng lẻ cho đến các tập đoàn
+  lớn.  Tất cả tiện ích công cộng được đánh giá bởi một nhóm nhân viên tình nguyện
+  trước khi chúng được phát hành.  Những tiện ích thử nghiệm sẽ được đánh dấu và
+  chưa được đánh giá.
+</p>
+
+<h2>Làm thế nào để tôi biết chuyện gì đang diễn ra trên AMO?</h2>
+<p>
+  <a href="http://blog.mozilla.com/addons/">Blog</a> của chúng tôi được cập nhật thư�ng xuyên,
+  và chúng tôi cũng thư�ng giới thiệu các bài viết từ cộng đồng chung.  Chúng tôi cũng có một
+  <a href="https://addons.mozilla.org/newsletter">há»™p thÆ° tin</a> gá»­i thÆ°
+  hàng tháng.
+</p>
+
+<h2>Nghe thật tuyệt!  Vậy tôi có thể tham gia như thế nào?</h2>
+<p>
+  Có rất nhi�u cách để tham gia:
+</p>
+<ul>
+  <li>
+    <a href="https://wiki.mozilla.org/AMO:Editors/Applying">Hãy trở thành một
+    biên tập viên</a>.  Các biên tập viên của chúng tôi là những ngư�i có hiểu biết kĩ thuật và hâm mộ
+    AMO, h� sẽ đánh giá chất lượng và sự ổn định của các tiện ích.
+  </li>
+  <li>
+    <a href="http://developer.mozilla.org/">Tạo ra tiện ích của riêng bạn</a>.  AMO
+    cung cấp dịch vụ cập nhật và lưu trữ miễn phí, và có thể giúp bạn tiếp cận một
+    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/">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>
+    Báo lỗi và gửi bản sửa.
+    <a href="https://bugzilla.mozilla.org/buglist.cgi?quicksearch=addons">Bugzilla</a>
+    có nói tới tất cả các lỗi AMO hiện tại.  Bạn có thể báo thêm những lỗi chưa được
+    phát hiện hoặc đóng góp các bản vá.
+  </li>
+</ul>
+
+<h2>Tôi có một câu h�i.</h2>
+<p>
+  Một nơi tốt để bắt đầu là
+  <a href="https://addons.mozilla.org/pages/faq"><abbr title="H�i �áp Thư�ng Gặp">FAQ</abbr></a> của
+  chúng tôi.  Nếu bạn không tìm thấy câu trả l�i ở đó, hãy dùng thông tin liên hệ ở cuối trang này.  �ối
+  với các câu h�i v� một tiện ích nào đó, hãy dùng thông tin liên hệ trên trang giới thiệu của nó.
+</p>
+
+<h2>Liên hệ Chúng tôi</h2>
+<dl>
+  <dt>Mozilla Việt Nam: <a href="http://vi.mozdev.org">vi.mozdev.org</a></dt>
+  <dt>Sử dụng <abbr title="Internet Relay Chat">IRC</abbr> (tiếng Anh):</dt>
+  <dd><a href="irc://irc.mozilla.org/#addons">#addons</a> trên irc.mozilla.org cho các câu h�i thông thư�ng và liên quan đến đánh giá</dd>
+  <dd><a href="irc://irc.mozilla.org/#amo">#amo</a> trên irc.mozilla.org cho các mối quan tâm v� việc phát triển hoặc quản trị</dd>
+</dl>
diff --git a/site/app/locale/vi/pages/experimental_addons.thtml b/site/app/locale/vi/pages/experimental_addons.thtml
deleted file mode 100644
index 7ce6dcb..0000000
--- a/site/app/locale/vi/pages/experimental_addons.thtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<h1>Tiện ích Thử nghiệm</h1>
-
-
-<h2>Tiện ích thử nghiệm là gì?</h2>
-
-<p>Tiện ích thử nghiệm dành cho ngư�i dùng cấp cao thử nghiệm tiện ích trước khi chúng
-có thể hiện hữu và được đánh giá cho việc sử dụng thông thư�ng. Nhi�u tiện ích có thể là
-dạng mẫu đầu tiên. Các tiện ích thử nghiệm có thể ở mức alpha, beta hoặc phát hành thử v� mặt
-chất lượng, hiệu suất và tính năng.</p>
-
-<p>Cần cẩn tr�ng khi cài đặt các tiện ích thử nghiệm, vì chúng chưa
-được kiểm tra bởi một biên tập viên và có thể gây hại đến cấu hình máy tính của bạn.</p>
-
-
-<h2>Làm sao tôi biết đó là một tiện ích thử nghiệm khi tôi nhìn thấy nó trên trang?</h2>
-
-<p>Tiện ích thử nghiệm được dán nhãn "thử nghiệm" và yêu cầu đăng nhập
-trước khi bạn có thể cài đặt chúng.</p>
-
-
-<h2>Tại sao tôi phải đăng nhập khi cài đặt tiện ích thử nghiệm?</h2>
-
-<p>Trang tiện ích yêu cầu ngư�i dùng đăng nhập khi cài đặt tiện ích thử nghiệm nhằm 
-nhắc nhở rằng bạn sắp thực hiện một bước mạo hiểm.</p>
-
-
-<h2>Tôi có phải đăng nhập hay cần có tài khoản khi cài đặt tiện ích công cộng không?</h2>
-
-<p>Không. Trang tiện ích không yêu cầu tài khoản hoặc đăng nhập
-khi cài đặt tiện ích công cộng.</p>
-
diff --git a/site/app/locale/vi/pages/faq.thtml b/site/app/locale/vi/pages/faq.thtml
new file mode 100644
index 0000000..eb38ff5
--- /dev/null
+++ b/site/app/locale/vi/pages/faq.thtml
@@ -0,0 +1,56 @@
+<h1>H�i �áp Thư�ng Gặp</h1>
+
+<p>Bản FAQ cho <a href="http://addons.mozilla.org">trang AMO</a> đưa ra một số chủ đ� chưa được nhắc tới trên trang web Hỗ Trợ Firefox. Trang web Hỗ Trợ bao gồm thông tin giới thiệu v� <a href="http://support.mozilla.com/kb/Customizing+Firefox+with+add-ons">tùy biến Firefox với tiện ích</a> cũng như các bài viết khác trên:</p>
+
+<ul>
+    <li> Khắc phục vấn đ� <a href="http://support.mozilla.com/kb/Unable+to+install+add-ons">cài đặt tiện ích</a>, <a href="http://support.mozilla.com/kb/Troubleshooting+plugins">phần bổ trợ</a> &amp; <a href="http://support.mozilla.com/kb/Troubleshooting+extensions+and+themes">các vấn đ� thông thư�ng</a>.</li>
+    <li> <a href="http://support.mozilla.com/kb/Uninstalling+add-ons">Làm thế nào để gỡ b� tiện ích</a> và <a href="http://support.mozilla.com/kb/Cannot+uninstall+an+add-on">khắc phục vấn đ� gỡ b�</a>.</li>
+    <li> <a href="http://support.mozilla.com/kb/Gray+bar+below+the+status+bar">Xử lí các tiện ích trục trặc / vấn đ� Thanh Bị Xám</a></li>
+</ul>
+
+<p></p>
+
+<h2>Câu h�i v� Tiện ích</h2>
+<dl>
+<dt>What is an Add-on?</dt>
+<dd>Add-ons let you add features which aren't part of the standard application. Themes change appearance without changing functionality. Search Plugins and Dictionaries/Language Packs add additional search engines and language support. Extensions add more extensive features to the browser; some add simple toolbars while others can add a wide range of new features.</dd>
+
+<dt>Are add-ons easy to install?</dt>
+<dd>Yes! Add-ons are very easy to install. They're generally much smaller than a normal application and download very quickly. If you don't like one, they are just as easy to remove or disable. Also, if an update is available for one of your add-ons, Firefox will inform you and let you upgrade with one click.</dd>
+
+<dt>How do I manage an add-on?</dt>
+<dd>In Firefox, go to "Add-ons" in the Tools menu to manage Themes and Extensions. If your Extension has special options, you can see them in the Extensions section of the Add-ons window. From here, you can also disable and uninstall add-ons. Dictionaries are installed as Extensions. Search Plugins can be managed in the Search Bar.</dd>
+
+<dt>Can add-ons make Firefox slower?</dt>
+<dd>In most cases, add-ons do not cause a perceivable slowdown in Firefox. However, since they are applications some may affect the performance of Firefox depending on your system configuration. If you suspect that an add-on is affecting the way Firefox runs on your machine try disabling it.</dd>
+
+<dt>Why would I disable an add-on?</dt> 
+<dd>Disabling an add-on prevents it from loading when you start Firefox, but it doesn't remove the add-on or any of its settings. Enabling the add-on again will bring it back to where it was when you disabled it. For add-ons that you want to turn off without removing, disabling is the way to go.</dd>
+
+<dt>How do I backup all of the add-ons and themes that I've installed?</dt> 
+<dd>You can backup your profile directory which will also backup your add-ons and themes. A third party application like MozBackup can help you with this.</dd>
+</dl>
+
+<h2>Website questions</h2>
+<dl>
+<dt>I see several add-ons which provide the same capabilities. How do I decide which one is best?</dt> 
+<dd>In general, you can look at ratings and downloads which will give you an idea. Good add-ons tend to be downloaded more than bad ones. However, it's also easy to install both add-ons and decide which one you want to use. You may decide after trying them that you want to use both!</dd>
+
+<dt>I see a great add-on but it says that it's only compatible with Firefox 2.x. Can I still install it in Firefox 3.x?</dt> 
+<dd>In general, no. Firefox 3.x has a number of new features and a large majority of add-on developers have updated their add-ons to support 3.x. If the add-on only supports Firefox 2, try searching for that add-on's title. In many cases there will be a new version that supports Firefox 3 with the same or similar title.</dd>
+
+<dt>I installed a new theme but would like to revert back to the Firefox default theme. How do I do that?</dt> 
+<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 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.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>What are experimental add-ons?</dt> 
+<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>
+</dl>
diff --git a/site/app/locale/zh_CN/LC_MESSAGES/messages.po b/site/app/locale/zh_CN/LC_MESSAGES/messages.po
index 55cf542..233ae3f 100644
--- a/site/app/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/site/app/locale/zh_CN/LC_MESSAGES/messages.po
@@ -20,6 +20,10 @@ msgstr ""
 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 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
@@ -48,38 +52,35 @@ msgstr "公开"
 msgid "a_header_sandbox"
 msgstr "沙盒"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "已添加 %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "已更新 %s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "版本 %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "总下载�"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
@@ -96,22 +97,24 @@ msgstr "个结果�页"
 msgid "addon_list_sortby"
 msgstr "排���:"
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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: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: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
@@ -121,6 +124,7 @@ 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -139,6 +143,7 @@ msgstr "��:"
 msgid "addon_review_add_submit"
 msgstr "�交你的��"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -172,21 +177,24 @@ msgstr "是"
 msgid "addon_review_delete_header"
 msgstr "删除��"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "���功删除。"
 
+#. %s is the name of the add-on
 #: 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:534
+#. %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 个字符。"
 
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr "请注�：你的����过编辑审核以��能显示在公开网站上。"
@@ -196,6 +204,7 @@ 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:135
 #, php-format
 msgid "addon_review_others_by_user"
@@ -204,15 +213,17 @@ msgstr[0] "查看 %2$s 以�对该附加组件�表的 %1$s �评论."
 msgstr[1] "查看 %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
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -226,13 +237,14 @@ msgstr "开�者回�:"
 msgid "addon_review_saved_successfully"
 msgstr "你的��已��功�存。谢谢�"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, php-format
@@ -255,11 +267,16 @@ msgstr "�一个附加组件"
 msgid "addon_version_permalink"
 msgstr "该版本的永久链接"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-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:118
+#, fuzzy
+msgid "addon_versions_getlatestversion"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "�交"
 
@@ -268,19 +285,23 @@ msgid "addons_author_tooltip"
 msgstr "查看作者介�"
 
 # %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
-#: controllers/addons_controller.php:671
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
@@ -289,7 +310,7 @@ msgstr "Browse %1$s Themes :: %2$s Add-ons"
 msgid "addons_display_add_review"
 msgstr "新增��"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "更多详情"
 
@@ -297,11 +318,11 @@ msgstr "更多详情"
 msgid "addons_display_categories"
 msgstr "分类"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "��详情"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "�喜欢"
@@ -310,66 +331,73 @@ msgstr "�喜欢"
 msgid "addons_display_edit_review"
 msgstr "编辑你的��"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "该附加组件有自己的��策略。"
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "开�者留言"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "主页"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "��"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "技术支�"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "喜欢"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "详细�述"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 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:421
+#. %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
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "%1$s 的其他附加组件"
 msgstr[1] "Other add-ons by these authors"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -379,7 +407,9 @@ msgstr ""
 "件地�，所以他们也就无法�系你获�更进一步的信�，在未�版本中修�缺陷的时候"
 "也无法通知你。"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -389,7 +419,8 @@ msgstr ""
 "者�能看到你的电�邮件地�，所以他们也就无法�系你获�更进一步的信�，在未�"
 "版本中修�缺陷的时候也无法通知你。"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -399,66 +430,69 @@ msgstr ""
 "件地�，所以他们也就无法�系你获�更进一步的信�，在未�版本中修�缺陷的时候"
 "也无法通知你。"
 
-#: views/addons/display.thtml:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "评分"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: 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:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "查阅 <a href=\"%1$s\">支�相关的章节</a> 以了解从何处获�有关该附加组件的帮"
 "助。"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "�存"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "查阅所有�� (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "查看所有版本"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "完整的版本历�"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "查看�代�"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "查看统计"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "你觉得怎样？"
 
@@ -468,7 +502,7 @@ msgstr "兼容于:"
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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 "作者"
@@ -479,10 +513,11 @@ msgstr "作者"
 msgid "addons_home_feature_head"
 msgstr "推�"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -497,7 +532,9 @@ msgstr "最新的:"
 msgid "addons_home_other_applications"
 msgstr "其他应用程�"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -507,19 +544,20 @@ msgstr "其他应用程�"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -612,6 +650,7 @@ msgstr "Mac OS X 平�"
 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"
@@ -629,12 +668,13 @@ msgstr ""
 "�件能帮助�览器实现特定的功能，诸如显示特殊格�的图片或者播放多媒体文件。这"
 "与扩展有所��，�者是用于改�或者加强现有的功能。"
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "%1$s 常用�件"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "�件"
 
@@ -645,29 +685,31 @@ msgstr "�件"
 msgid "addons_plugins_support_documentation"
 msgstr "说明文档: "
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr "安装 %s 之�，你必须接�以下《最终用户许��议》。"
 
 # %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s 的预览图"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 msgid "addons_recommended_introduction"
 msgstr ""
 "这里有数�众多的附加组件，其中一些适�大多数人。下�列出了一些最热门的，你�"
 "以开始用用看�"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "推�的附加组件"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "推�的附加组件"
 
@@ -676,6 +718,7 @@ msgid "addons_searchengines_additional_resources"
 msgstr "附加资�"
 
 # link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla 开�者中心"
@@ -692,33 +735,39 @@ msgstr ""
 
 # %1 is "make your own" link
 # %2 is MDC link
+#. %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 "访问 %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: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: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: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:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "�索引擎"
 
@@ -730,7 +779,7 @@ msgstr "特别感谢Mycroft项目团队在Firefox �索引擎方�的贡献"
 msgid "addons_status_disabled"
 msgstr "�用"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "未完�版本"
 
@@ -767,11 +816,12 @@ msgid "addons_versions_careful_introduction"
 msgstr ""
 "显示这些版本是为了�考和测试目的，如果是正常使用，请安装最新版本的附加组件。"
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "版本历�记录"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s 版本历�"
@@ -784,6 +834,7 @@ msgstr "添加组"
 msgid "admin_group_delete_pagetitle"
 msgstr "删除组"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -909,16 +960,20 @@ msgstr "忽略版本检查"
 msgid "app_compat_older_firefox_only"
 msgstr "这是一个针对旧版本Firefox的附加组件"
 
+#. %1$s and %2$s are URLs
 #: 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: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:64
 msgid "app_compat_unreleased_version"
 msgstr "这个附加组件需�尚未�布的 <a href=\"%1$s\">Firefox %2$s</a>"
@@ -927,23 +982,23 @@ msgstr "这个附加组件需�尚未�布的 <a href=\"%1$s\">Firefox %2$s</a
 msgid "app_compat_update_firefox"
 msgstr "<a href=\"http://getfirefox.com\">�级 Firefox</a> 以便使用该附加组件"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "按�称排�"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "最新附加组件"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "热门附加组件"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "按评分排�"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "最近更新的附加组件"
 
@@ -976,6 +1031,7 @@ msgid "category_extra_mostpopular"
 msgstr "最热门的在�"
 
 # %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"
@@ -985,11 +1041,19 @@ msgstr "查看所有的 %1$s"
 msgid "collection_not_found"
 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"
+
 #: 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:46
 msgid "compatibility_dashboard_intro"
 msgstr "为 %1$s 的�布准备了以下工具和信�供 %2$s 社区使用。"
@@ -1020,6 +1084,8 @@ msgstr "�上传校正最大版本�"
 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:130
 msgid "compatibility_developers_login_first"
 msgstr ""
@@ -1043,6 +1109,10 @@ msgstr "附加组件状�检查结果"
 msgid "compatibility_developers_retrieving"
 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:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s 用户 ( �用户总数的 %3$s&#37; )"
@@ -1056,6 +1126,8 @@ msgstr ""
 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:69
 msgid "compatibility_report_intro"
 msgstr ""
@@ -1066,6 +1138,7 @@ msgstr ""
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha 版本"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "兼容 %1$s alpha 版本的附加组件"
@@ -1074,6 +1147,7 @@ msgstr "兼容 %1$s alpha 版本的附加组件"
 msgid "compatibility_report_legend_beta"
 msgstr "Beta 版本"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "兼容 %1$s 的 beta 版本或预览版的附加组件"
@@ -1082,6 +1156,7 @@ msgstr "兼容 %1$s 的 beta 版本或预览版的附加组件"
 msgid "compatibility_report_legend_latest"
 msgstr "最新版本"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "最新支� %1$s 最新版本的附加组件"
@@ -1090,6 +1165,7 @@ msgstr "最新支� %1$s 最新版本的附加组件"
 msgid "compatibility_report_legend_other"
 msgstr "其他版本"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "该附加组件�兼容 %1$s 的任何版本"
@@ -1107,12 +1183,13 @@ msgstr "供附加组件用户查看的信�"
 msgid "compatibility_view_report"
 msgstr "查看兼容性报告"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "有关贡献的更多信�，请查阅我们的 %s 。"
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "维基页�"
 
@@ -1151,18 +1228,27 @@ msgstr ""
 "\">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: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>."
+
 # 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/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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
@@ -1170,7 +1256,10 @@ 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
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 #: views/admin/addons_status.thtml:57
 msgid "datetime"
 msgstr "%Y 年 %m 月 %e 日 %H:%M"
@@ -1196,14 +1285,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1249,36 +1366,36 @@ msgstr "第五步：�功"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "上传说明"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "�功�用附加组件"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "编辑附加组件"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "�功�用附加组件"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "附加组件�述"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "许��议"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "附加组件主页"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "附加组件�称"
 
@@ -1287,40 +1404,300 @@ msgstr "附加组件�称"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "预览图片说明"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "��策略"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "附加组件摘�"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "技术支�邮箱"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "技术支�网站"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "版本信�"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "�请批准附加组件"
 
-#: controllers/developers_controller.php:2729
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1341,6 +1718,7 @@ msgstr ""
 "邮件通知你。"
 
 # %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"
@@ -1351,6 +1729,7 @@ 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"
@@ -1370,16 +1749,17 @@ msgstr "你的上传已��功进行完毕。"
 msgid "devcp_addon_submission_trusted_public"
 msgstr "因为你的附加组件是被信任的，该版本已�自动获得核准�布到公开网站。"
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "上传附加组件"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1390,6 +1770,7 @@ 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"
@@ -1418,10 +1799,102 @@ msgstr "下一步"
 msgid "devcp_change_addontype"
 msgstr "更改附加组件类型："
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "开�者评论已更新。"
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "添加预览图"
@@ -1514,6 +1987,7 @@ msgstr "开�者未�供技术支�网站"
 msgid "devcp_details_trusted"
 msgstr "�信任的"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1542,6 +2016,7 @@ msgstr ""
 "�能为客户端�供更新检测。附加组件将会处于一�被删除的效果，尽管你�以很方便"
 "地回到这里�新�用它。"
 
+#. %s is the name of an add-on
 #: views/developers/disable.thtml:55
 #, php-format
 msgid "devcp_disable_disable_title"
@@ -1561,11 +2036,65 @@ 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 "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "增加作者"
@@ -1578,10 +2107,297 @@ msgstr "作者的电�邮件："
 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 "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+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 "作者"
@@ -1647,6 +2463,206 @@ msgstr "本地化目标"
 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: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 "æ›´æ–°"
@@ -1657,11 +2673,67 @@ 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"
+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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+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
 #, php-format
@@ -1671,6 +2743,7 @@ msgstr[0] "待审查�� (%s)"
 msgstr[1] "待审查�� (%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
 #, php-format
@@ -1680,6 +2753,7 @@ msgstr[0] "�请审查的附加组件 (%s)"
 msgstr[1] "�请审查的附加组件 (%s)"
 
 # %1 is the update count
+#. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
 #, php-format
@@ -1694,6 +2768,8 @@ 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"
@@ -1719,52 +2795,67 @@ msgstr "建议者说明"
 msgid "devcp_editversion_submit_update"
 msgstr "æ›´æ–°"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
 msgid "devcp_error_addon_field_summary_toolong"
 msgstr "摘��制在250字符以内。（你输入了 %s 个字符）"
 
-#: controllers/developers_controller.php:1907
+#: 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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "相关说明请查阅 %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 "本页"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+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 "选定的附加组件�类��许这个文件扩展�(%s)，请使用下列扩展�之一：%s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "文件GUID�完全匹�。"
 
@@ -1793,18 +2884,21 @@ msgstr "超过许�的最大上传体积。"
 msgid "devcp_error_http_nofile"
 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:401
 #, php-format
 msgid "devcp_error_icon_extension"
 msgstr "图标�能使用这个文件扩展�(%s)。请选用下列扩展�之一：%s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "install.rdf 文件�存在。"
 
@@ -1812,21 +2906,26 @@ msgstr "install.rdf 文件�存在。"
 msgid "devcp_error_install_manifest"
 msgstr "install.rdf 中�现以下错误："
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "请选择一个有效的附加组件类型。"
 
+#. %$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 "%s �是 %s 的有效版本"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "这个附加组件的ID无效：%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"
@@ -1843,6 +2942,7 @@ msgstr ""
 msgid "devcp_error_invalid_version_spaces"
 msgstr "这个附加组件的版本无效：版本中�能包�空格。"
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1852,6 +2952,7 @@ msgstr "解� install.rdf 时�生以下错误： %s"
 msgid "devcp_error_move_file"
 msgstr "无法移动文件"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1874,15 +2975,15 @@ msgstr "install.rdf 中未找到这个附加组件的ID。"
 msgid "devcp_error_no_platform"
 msgstr "未选择系统平�。"
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "你必须�供推�时所�求的细节。"
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "你�能推�预�行版本的附加组件。"
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "你�能推�当�在沙盒中的附加组件。"
 
@@ -1894,18 +2995,20 @@ msgstr "请至少选择一个分类。"
 msgid "devcp_error_one_user"
 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"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
 msgid "devcp_error_saving"
 msgstr "�存数�时�生错误。"
 
-#: controllers/developers_controller.php:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "你没有更新这个附加组件的�利。"
 
@@ -1918,7 +3021,7 @@ msgid "devcp_error_updateurl"
 msgstr ""
 "附加组件�能使用一个外部的更新地�，请从 install.rdf 中删除它并�次�试。"
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "请上传一个文件。"
@@ -2138,6 +3241,7 @@ 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"
@@ -2180,11 +3284,26 @@ msgstr "�交附加组件"
 msgid "devcp_myaddons_title"
 msgstr "开�者工具"
 
+#. %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 "返回附加组件详情"
 
 # %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
@@ -2192,11 +3311,33 @@ msgid "devcp_nominate_submit_nominate"
 msgstr "�请审核 %s"
 
 # %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: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 "删除该预览图片将会使其他预览图片自动��默认的。"
@@ -2205,6 +3346,10 @@ msgstr "删除该预览图片将会使其他预览图片自动��默认的。
 # %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"
@@ -2217,9 +3362,14 @@ msgstr ""
 msgid "devcp_notice_makedefault"
 msgstr "这样�默认的预览图片将会去掉默认状�。"
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2248,6 +3398,60 @@ msgstr "编辑预览图片。"
 msgid "devcp_preview_updated_successfully"
 msgstr "预览图片更新�功。"
 
+#: 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 ""
@@ -2258,10 +3462,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "增加预览图片"
 
+#: 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 "编辑预览图片"
 
+#: 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 "预览图片文件"
@@ -2270,6 +3484,34 @@ msgstr "预览图片文件"
 msgid "devcp_previews_label_makedefault"
 msgstr "设置为默认预览图片"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "删除预览图片"
@@ -2286,55 +3528,170 @@ msgstr "编辑预览图片"
 msgid "devcp_previews_submit_upload"
 msgstr "上传预览图片"
 
+#: 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 "�正确？"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "你确认�删除这个文件？"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
+
+#: 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 "�更新我当�的附加组件信�"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "<em>%s</em> �日活动用户"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "总计下载 <em>%s</em> 次"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "本周下载 <em>%s</em> 次"
 
-#: controllers/developers_controller.php:1481
+#: 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 "目��能�交附加组件，请���试。"
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "我接�"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "我�接�"
 
@@ -2350,11 +3707,12 @@ msgstr "�用"
 msgid "devcp_summary_header_trusted"
 msgstr "�信任的"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2365,6 +3723,7 @@ 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"
@@ -2374,30 +3733,674 @@ msgstr "请确认该主题已� %s 。"
 msgid "devcp_theme_upload_preview_link"
 msgstr "上传预览图片"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "请查阅 %s 获�说明。"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "本页"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "编辑版本"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "版本更新�功。"
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "附加组件已�用。"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "过滤器"
@@ -2406,7 +4409,7 @@ msgstr "过滤器"
 msgid "editorcp_logs_filter_by"
 msgstr "以类型/�作过滤"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "事件日志"
 
@@ -2458,6 +4461,7 @@ msgstr "��评论"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "显示评论"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2467,7 +4471,7 @@ msgstr "显示 %s 到 %s 之间的记录"
 msgid "editorcp_reviewlog_none_found"
 msgstr "这段时间未找到评论。"
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "审查日志"
 
@@ -2491,24 +4495,24 @@ msgstr "最近编辑活动"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "��汇总"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "审查附加组件。"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "请完整填写以下字段："
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "请至少选择一个文件审查。"
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "��许自审查。"
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "外部软件"
 
@@ -2520,39 +4524,39 @@ msgstr "增加特性"
 msgid "editors_featured_add_feature_submit"
 msgstr "增加"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "增加特性�功。"
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "删除特性失败。"
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "删除特性�功。"
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "特定的附加组件"
 
@@ -2585,38 +4589,41 @@ msgid "editors_notice_filter_session"
 msgstr "这些过滤器将�留在适当的�置直到本次会�结�或者被清除。"
 
 # %1 is the queue mode
+#. %1 is the queue mode
 #: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "目�没有�审查的附加组件。"
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "一天"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "一�时"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "一分钟"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "编辑工具"
 
-#: controllers/editors_controller.php:286
+#. %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 "�适用 %s"
 
-#: controllers/editors_controller.php:301
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "预�布"
 
 # %1 is the app name
+#. %1 is the app name
 #: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2630,21 +4637,26 @@ msgstr "清除"
 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."
 "目�所有审查队列都�用。请���试。"
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "进行审查"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "�布到公共网站"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "�求特别审查"
 
@@ -2652,29 +4664,37 @@ msgstr "�求特别审查"
 msgid "editors_review_action_sandbox"
 msgstr "�留在沙盒中"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "审查评论"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "这会将该附加组件和他的最新版本�文件�布到公共网站。其�续版本将会进入沙盒知"
 "�有编辑对其进行审查。"
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "这会将附加组件�留在沙盒中。"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr "这会将附加组件的沙盒版本放到公开区域。"
 
-#: views/editors/review.thtml:162
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "这会将附加组件的沙盒版本�留在沙盒中。"
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "如果你觉得这个附加组件有安全�版�或者其他方�的问题需�管�员处�，在下�输"
@@ -2701,15 +4721,15 @@ msgstr "分类:"
 msgid "editors_review_header_compatibility"
 msgstr "兼容性:"
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "�述"
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "开�者评论"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "许��议"
 
@@ -2717,85 +4737,112 @@ msgstr "许��议"
 msgid "editors_review_header_files"
 msgstr "文件:"
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "项目历�"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "�交说明"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "预览图片"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "审查 %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "给审查者的说明"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "摘�"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "版本说明"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "交管�员审查"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "已通过审查/公开区域"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "拒�通过/沙盒区域"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "未找到更早的审查记录。"
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "交管�员审查"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "已通过/公开区域"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "拒�通过/沙盒区域"
 
-#: views/editors/review.thtml:198
+#. 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 "应用程�:"
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "或者选择预定的回�信�:"
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "评论:"
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "�作系统:"
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "回顶端"
 
@@ -2803,7 +4850,7 @@ msgstr "回顶端"
 msgid "editors_review_next_link"
 msgstr "下一� &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "未找到预览图片。"
 
@@ -2811,41 +4858,49 @@ msgstr "未找到预览图片。"
 msgid "editors_review_previous_link"
 msgstr "&laquo; 上一�"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
 msgid "editors_review_rank_in_queue"
 msgstr "队列中 <strong># %1$s</strong> of %2$s"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "处�动作"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "动作"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "评论"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "日期"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "建议者"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "版本/文件"
 
-#: controllers/editors_controller.php:411
+#: 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 "��已�功处�。"
 
@@ -2869,7 +4924,7 @@ msgstr "动作"
 msgid "editors_reviews_in_reply_to"
 msgstr "回�:"
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "审查�功完��"
 
@@ -2881,23 +4936,23 @@ msgstr "目�没有需�审查的项目。"
 msgid "editors_reviews_submit_process_reviews"
 msgstr "进行审查"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "针对特定网站"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "新组件"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "已更新"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "已测试的应用程�"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "�过测试的�作系统环境"
 
@@ -2938,17 +4993,20 @@ msgstr "平�"
 msgid "editors_th_submissiontypes"
 msgstr "�交的类别"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s 天"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s �时"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s 分钟"
@@ -2957,8 +5015,8 @@ msgstr "%s 分钟"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "�止访问"
 
@@ -2966,12 +5024,13 @@ msgstr "�止访问"
 msgid "error_access_denied_message"
 msgstr "你无�查看此页。"
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -2981,18 +5040,19 @@ msgstr "你无�查看此页。"
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "附加组件未找到�"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "此附加组件在这里无法查看。"
 
@@ -3000,7 +5060,7 @@ msgstr "此附加组件在这里无法查看。"
 msgid "error_addon_selfreview"
 msgstr "你�能审查自己的附加组件"
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "本类无附加组件。"
 
@@ -3022,24 +5082,25 @@ msgstr "这�是一个有效的电�邮件地�。"
 msgid "error_field_required"
 msgstr "该项目�能为空。"
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "文件未找到�"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "文件错误: %s �存在。"
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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 "表�有错误，请更正��新�交。"
@@ -3054,16 +5115,18 @@ msgstr "验��无效�请�试。"
 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3081,7 +5144,7 @@ msgstr "注�"
 msgid "error_preview_notfound"
 msgstr "Preview not found!"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "你必须选择一个评分。"
 
@@ -3131,8 +5194,8 @@ msgstr "请根�你的邮件中收到的代�先确认你的用户��。"
 msgid "error_username_or_pw_wrong"
 msgstr "错误的用户�或密��"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "版本未找到�"
 
@@ -3145,12 +5208,14 @@ msgid "feature_learnmore"
 msgstr "了解更多"
 
 # %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "了解有关 %1$s 的更多内容"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3162,6 +5227,45 @@ msgstr[1] "%1$s ���"
 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "所有�利�留"
@@ -3196,7 +5300,7 @@ msgstr "其他语言:"
 msgid "footer_privacy_policy"
 msgstr "��策略"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "�存"
 
@@ -3205,6 +5309,7 @@ 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:110
 msgid "general_addontype_dict_plural"
 msgstr "å­—å…¸"
@@ -3214,6 +5319,7 @@ 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:108
 msgid "general_addontype_extension_plural"
 msgstr "扩展"
@@ -3223,6 +5329,7 @@ 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "语言包（附加组件）"
@@ -3232,6 +5339,7 @@ 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:112
 msgid "general_addontype_lpapp_plural"
 msgstr "语言包（应用程�）"
@@ -3241,6 +5349,7 @@ 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "�件"
@@ -3250,6 +5359,7 @@ 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:111
 msgid "general_addontype_search_plural"
 msgstr "�索引擎"
@@ -3259,10 +5369,12 @@ 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:109
 msgid "general_addontype_theme_plural"
 msgstr "主题"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3293,12 +5405,12 @@ msgid "header_navlink_addons"
 msgstr "附加组件"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "注销"
 
@@ -3306,36 +5418,43 @@ msgstr "注销"
 msgid "header_navlink_myaccount"
 msgstr "我的�户"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "注册"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: 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
+#. %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 "<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/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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3358,7 +5477,7 @@ msgid "langtools_download_langpack"
 msgstr "下载语言包"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "字典和语言包"
 
@@ -3414,7 +5533,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3448,6 +5571,7 @@ 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:214
 msgid "other_users"
 msgstr "其他"
@@ -3460,36 +5584,35 @@ msgstr "应用程�版本"
 msgid "page_title_credits"
 msgstr "贡献者"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "试验性的"
 
-#: controllers/pages_controller.php:113
+#: controllers/pages_controller.php:111
 #, fuzzy
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "常�问答之定制自己的Firefox"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "附加组件策略"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Mozilla ��策略"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "评论指导"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "沙盒评论系统"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "�交说明"
 
@@ -3507,6 +5630,7 @@ msgstr ""
 "�交到Mozilla Add-ons的附加组件必须带有 install.rdf 文件，其中至少�支�以下"
 "应用之一。对于这些应用，�有以下列出的版本是�以使用的。"
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
@@ -3514,6 +5638,8 @@ 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:92
 msgid "pages_appversions_required_files_link"
 msgstr "这里"
@@ -3522,7 +5648,6 @@ msgstr "这里"
 msgid "pages_appversions_versions"
 msgstr "版本"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "返回�一页"
 
@@ -3535,6 +5660,7 @@ 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"
@@ -3558,6 +5684,8 @@ 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 ""
@@ -3566,6 +5694,8 @@ msgstr ""
 
 # %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
 msgid "recaptcha_hardtoread_text"
 msgstr ""
@@ -3580,7 +5710,7 @@ msgstr "你是人类?"
 msgid "recaptcha_whatsthis"
 msgstr "这是什么?"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "该评论标记错误!"
 
@@ -3605,7 +5735,7 @@ msgid "review_flag_reason_spam"
 msgstr "�水或其他�评论内容"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "谢谢；该评论以被编辑标记为批准。"
 
@@ -3618,6 +5748,7 @@ 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:48
 msgid "review_guidelines_short"
 msgstr ""
@@ -3630,21 +5761,22 @@ msgstr ""
 "德的语言，���露任何�人信�。</li></ul><p>请阅读<a href=\"%2$s\">评论指�"
 "</a>获�有关评价附加组件的更多介�。</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 "对 %s 的��"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "特别推�"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "最新附加组件"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "更新的附加组件"
 
@@ -3681,6 +5813,7 @@ msgstr "所有�索引擎"
 msgid "search_landing_browse_search_engines"
 msgstr "�览�索引擎"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3700,12 +5833,13 @@ msgstr "�索附加组件"
 msgid "search_rss_description"
 msgstr "�索结果收�点"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "�索结果: %s"
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "管�员工具"
 
@@ -3713,7 +5847,7 @@ msgstr "管�员工具"
 msgid "sidebar_navlink_developer_tools"
 msgstr "开�者工具"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "编辑工具"
 
@@ -3721,6 +5855,7 @@ msgstr "编辑工具"
 msgid "sidebar_navlink_welcome"
 msgstr "欢迎"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3758,6 +5893,7 @@ msgstr "主题"
 msgid "sidebar_pitch_updated_addons"
 msgstr "更新的附加组件"
 
+#. %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
@@ -3770,6 +5906,7 @@ 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3787,24 +5924,32 @@ msgstr "开�者工具"
 msgid "statistics_addon_switch"
 msgstr "切�附加组件"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "%m 月 %e 日"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "%Y 年 %m 月 %e 日"
 
+#. 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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3846,7 +5991,7 @@ msgstr "统计信�"
 msgid "statistics_index_view_button"
 msgstr "显示统计"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
@@ -3864,7 +6009,7 @@ msgstr "删除此图"
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:226
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
@@ -3874,103 +6019,108 @@ msgstr "Group by: Month"
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "范围内找到 %s 个"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "新增图"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "为该图表增加图"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "��总计"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "显示总计"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "图表中图的数�"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "查看数�（CSV）"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "获�此数�的逗�分隔文件"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "�� %s 事件"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "显示 %s 事件"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "�置此图的附加组件�布日期"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "��Firefox事件"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "显示Firefox事件"
 
-#: controllers/statistics_controller.php:241
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "�置此图的Firefox�布日期"
 
-#: controllers/statistics_controller.php:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "折�图表"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "展开图表"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "调整图表尺寸"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "日访问用户"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "应用程�"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "自定义"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "下载"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "�作系统"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "附加组件状�"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "汇总"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "附加组件版本"
 
@@ -3994,11 +6144,11 @@ msgstr "未知"
 msgid "statistics_longnames_version"
 msgstr "附加组件版本"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr "没有足够的数�显示图表，请���看。"
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr "你的附加组件还没有任何数�，请过几天��。"
 
@@ -4008,11 +6158,11 @@ msgstr ""
 "附加组件统计数�正在更新，由于我们的脚本正在更新这些信�，所以近期数��能�"
 "准确。请过几分钟��试。"
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "�用统计信�，请����。"
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "�用JavaScript�能查阅统计信�图表。"
 
@@ -4027,36 +6177,36 @@ msgstr "你的设置已更新。"
 msgid "statistics_pagetitle"
 msgstr "统计信�"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "日活跃用户"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "日下载"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "缩�"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "缩�到一个月"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "放大"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "放大到一个月"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "%1$s 的�日统计汇总"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "统计数�收�点"
 
@@ -4095,23 +6245,23 @@ msgstr "公开"
 msgid "statistics_settings_access_public_description"
 msgstr "任何人都�以查阅这个附加组件的统计"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "更改设置"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "请将这些信��密。"
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "本��目�处于<b>�有</b>状�。"
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "本��目�处于<b>公开</b>状�。"
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "�定"
 
@@ -4128,7 +6278,7 @@ msgstr "�存设置"
 msgid "statistics_settings_title"
 msgstr "%1$s 的统计��设置"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "解�"
 
@@ -4152,7 +6302,7 @@ msgstr "未知"
 msgid "statistics_shortnames_version"
 msgstr "版本"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "平�日下载�"
 
@@ -4160,37 +6310,37 @@ msgstr "平�日下载�"
 msgid "statistics_summary_downloads_heading"
 msgstr "下载�"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "尚无数�"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s 在 %2$s"
@@ -4199,17 +6349,17 @@ msgstr "%1$s 在 %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "日活跃用户"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: 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:147
+#: 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:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s 统计"
@@ -4235,6 +6385,7 @@ 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:49
 msgid "user_del_account_deleted"
 msgstr ""
@@ -4254,6 +6405,7 @@ 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:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4262,6 +6414,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:69
 msgid "user_del_error_addons_more_questions"
 msgstr "如果你有其他问题，请�系 %1$s 获得帮助。"
@@ -4275,6 +6428,7 @@ 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:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4286,6 +6440,7 @@ 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:93
 msgid "user_del_header_delete_account"
 msgstr "删除用户�户 %1$s"
@@ -4307,6 +6462,7 @@ 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:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4322,6 +6478,7 @@ msgid "user_deleted_nickname"
 msgstr "已删除用户"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4335,6 +6492,9 @@ 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4353,6 +6513,7 @@ msgstr ""
 "-- %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4377,6 +6538,8 @@ msgstr "感谢�与 %s Add-ons"
 
 # 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
 #, php-format
 msgid "user_email_pwreset"
@@ -4403,6 +6566,7 @@ msgid "user_emailchange_error"
 msgstr "错误!"
 
 # %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4413,6 +6577,7 @@ msgid "user_emailchange_success"
 msgstr "�功�"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4578,6 +6743,7 @@ 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"
@@ -4586,6 +6752,7 @@ msgstr ""
 "�你�能登录到附加组件 %2$s 。"
 
 # %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4602,6 +6769,7 @@ msgid "user_register_congratulations"
 msgstr "�贺你�你的用户��已��功建立。"
 
 # %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"
@@ -4610,6 +6778,7 @@ msgstr ""
 "广告邮件。如果需�，你�以�求我们 %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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4670,6 +6839,7 @@ msgid "users_info_pagetitle"
 msgstr "%1$s 的用户信�"
 
 # %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "%s �布"
@@ -4680,6 +6850,8 @@ 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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4689,6 +6861,8 @@ msgstr ""
 
 # %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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4703,3 +6877,34 @@ msgstr "用户密��置"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "新用户注册"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "兼容的最新版本"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
diff --git a/site/app/locale/zh_TW/LC_MESSAGES/messages.po b/site/app/locale/zh_TW/LC_MESSAGES/messages.po
index 4ecc952..8b6a298 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: 2008-12-23 02:52+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"
@@ -16,6 +16,10 @@ msgstr ""
 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 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
@@ -44,38 +48,35 @@ msgstr "公開"
 msgid "a_header_sandbox"
 msgstr "沙箱"
 
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "added"
-msgstr "已新增 %s"
-
-#: views/elements/addon_listitem.thtml:145 views/elements/feature.thtml:111
-#: views/addons/display.thtml:103 views/addons/browse_thumbs.thtml:87
+#. %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 "更新時間：%s"
 
+#. %s is the version of the add-on.  Example:  3.2a1
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:95
 #, php-format
 msgid "addon_display_header_version"
 msgstr "版本 %s"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:115 views/addons/browse_thumbs.thtml:94
+#: 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:119
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "總下載次數"
 
-#: views/elements/addon_listitem.thtml:136 views/elements/feature.thtml:103
-#: views/addons/display.thtml:114 views/addons/display.thtml:118
+#: 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:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
@@ -91,22 +92,24 @@ msgstr "��顯示"
 msgid "addon_list_sortby"
 msgstr "排��照："
 
-#: views/elements/addon_listitem.thtml:69 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/elements/addon_listitem.thtml:72 views/addons/browse_thumbs.thtml:70
+#: 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: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: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
@@ -116,6 +119,7 @@ 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:58 views/reviews/add.thtml:127
 #: views/reviews/review_added.thtml:52
 #, php-format
@@ -134,6 +138,7 @@ msgstr "�見："
 msgid "addon_review_add_submit"
 msgstr "�出�見"
 
+#. %s is the name of the add-on
 #: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
@@ -167,23 +172,26 @@ msgstr "是"
 msgid "addon_review_delete_header"
 msgstr "刪除�見"
 
-#: controllers/reviews_controller.php:444
+#: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "�見已�功刪除。"
 
+#. %s is the name of the add-on
 #: 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:534
+#. %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。"
 
 # Removing an extra comma
+#. Removing an extra comma
 #: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr "請注�：您的�見會先經審核通�後�會顯示在網站上公開。"
@@ -193,6 +201,7 @@ 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:135
 #, php-format
 msgid "addon_review_others_by_user"
@@ -200,15 +209,17 @@ 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
-#: controllers/reviews_controller.php:344
-#: controllers/reviews_controller.php:423
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
 #, php-format
 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:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
@@ -222,13 +233,14 @@ msgstr "開發者回覆："
 msgid "addon_review_saved_successfully"
 msgstr "您的�見已�功儲存，感��"
 
-#: views/addons/display.thtml:285 views/addons/display.thtml:288
+#: 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:77 views/reviews/delete.thtml:49
 #, php-format
@@ -251,11 +263,16 @@ msgstr "上一個附加元件"
 msgid "addon_version_permalink"
 msgstr "到此版本的固定��"
 
-#: views/addons/versions.thtml:123 views/addons/versions.thtml:124
-msgid "addon_versions_getlatesttext"
-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:118
+#, fuzzy
+msgid "addon_versions_getlatestversion"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:431
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "�"
 
@@ -264,28 +281,31 @@ msgid "addons_author_tooltip"
 msgstr "檢視作者個人檔案"
 
 # %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:951
-#, fuzzy
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1080
 msgid "addons_browse_all_themes_title"
-msgstr "Browse all Themes :: %1$s Add-ons"
+msgstr "�覽所有佈景主題 :: %1$s 附加元件"
 
-#: controllers/addons_controller.php:671
+# %s is the name of the category
+#. %s is the name of the category
+#: controllers/addons_controller.php:800
 #, 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:384
-#, fuzzy
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:513
 msgid "addons_browse_categories_header_theme"
-msgstr "Browse %1$s Themes :: %2$s Add-ons"
+msgstr "�覽%1$s佈景主題 :: %2$s 附加元件"
 
 #: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "新增�見"
 
-#: views/addons/display.thtml:312
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "詳細資訊"
 
@@ -293,11 +313,11 @@ msgstr "詳細資訊"
 msgid "addons_display_categories"
 msgstr "分類"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "填寫詳細�見"
 
-#: views/addons/display.thtml:368 views/reviews/add.thtml:103
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "�喜歡"
@@ -306,139 +326,150 @@ msgstr "�喜歡"
 msgid "addons_display_edit_review"
 msgstr "編輯您的�見"
 
-#: views/addons/display.thtml:143
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "本元件有自己的隱�政策。"
 
-#: views/addons/display.thtml:367 views/reviews/add.thtml:101
+#: 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:315
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "開發者留言"
 
-#: views/addons/display.thtml:208 views/addons/display.thtml:211
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "網站首�"
 
-#: views/addons/display.thtml:264
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "�見"
 
-#: views/addons/display.thtml:225 views/addons/display.thtml:228
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "技術支�"
 
-#: views/addons/display.thtml:369 views/reviews/add.thtml:105
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "喜歡"
 
-#: views/addons/display.thtml:186
+#: views/addons/display.thtml:210
 msgid "addons_display_long_description"
 msgstr "完整敘述"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:109
+#: 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:156
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 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:421
-#, fuzzy
+#. %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] "%1$s 的其他作�"
-msgstr[1] "Other add-ons by these authors"
 
-#: controllers/addons_controller.php:154
-#: controllers/addons_controller.php:1086
+#. %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:147 controllers/addons_controller.php:283
+#: controllers/addons_controller.php:1215
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:255
+#. %s is an email address
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "此套件由作者於 %s �供 Email 技術支�"
 
-#: views/addons/display.thtml:238
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr "此套件由作者於 %s 與 %s �供技術支�"
 
-#: views/addons/display.thtml:247
+#. %s is a URL
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "此套件由作者於 %s �供技術支�"
 
-#: views/addons/display.thtml:365
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "評分"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:107
+#: 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:387 views/addons/display.thtml:390
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "請勿在此回報程�錯誤。因為我們並�會記錄您的 Email 地�，若開發者想得知進一步"
 "的細節以解決�題時就無法與您�絡了。"
 
 # %1 is the review guidelines link
-#: views/addons/display.thtml:405
+#. %1 is the review guidelines link
+#: 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:396 views/addons/display.thtml:400
+#. %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 ""
 "請見 <a href=\"%1$s\">技術支�</a> 一節了解如何�得此元件的進一步�助。"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "儲存"
 
-#: views/addons/display.thtml:415
+#: 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:302
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "查看所有�見 (%1$s)"
 
-#: views/addons/display.thtml:195 views/addons/display.thtml:197
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "看看所有版本"
 
-#: views/addons/display.thtml:196
+#: views/addons/display.thtml:220
 msgid "addons_display_version_history"
 msgstr "所有版本歷�記錄"
 
-#: views/addons/display.thtml:335 views/addons/versions.thtml:103
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "檢視原始碼"
 
-#: views/addons/display.thtml:338
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "檢視統計資訊"
 
-#: views/addons/display.thtml:358
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "留下您的�見？"
 
@@ -448,7 +479,7 @@ msgstr "相容於："
 
 #: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:95
+#: 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 "作者："
@@ -459,10 +490,11 @@ msgstr "作者："
 msgid "addons_home_feature_head"
 msgstr "推薦元件"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:254 controllers/addons_controller.php:391
-#: controllers/addons_controller.php:528 controllers/addons_controller.php:758
-#: controllers/addons_controller.php:897 controllers/addons_controller.php:953
+#: controllers/search_controller.php:211 controllers/addons_controller.php:198
+#: controllers/addons_controller.php:383 controllers/addons_controller.php:520
+#: controllers/addons_controller.php:657 controllers/addons_controller.php:887
+#: controllers/addons_controller.php:1026
+#: controllers/addons_controller.php:1082
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -477,7 +509,9 @@ msgstr "最新元件:"
 msgid "addons_home_other_applications"
 msgstr "其他應用程�"
 
-#: controllers/developers_controller.php:64
+#. %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:610
 #: controllers/statistics_controller.php:60
@@ -487,19 +521,20 @@ msgstr "其他應用程�"
 #: 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:345
-#: controllers/reviews_controller.php:424
-#: controllers/search_controller.php:178 controllers/addons_controller.php:154
-#: controllers/addons_controller.php:214 controllers/addons_controller.php:387
-#: controllers/addons_controller.php:530 controllers/addons_controller.php:674
-#: controllers/addons_controller.php:689 controllers/addons_controller.php:756
-#: controllers/addons_controller.php:776 controllers/addons_controller.php:895
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
-#: controllers/addons_controller.php:1086
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1176
-#: controllers/editors_controller.php:58 controllers/pages_controller.php:123
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:153
+#: controllers/addons_controller.php:283 controllers/addons_controller.php:343
+#: controllers/addons_controller.php:516 controllers/addons_controller.php:659
+#: controllers/addons_controller.php:803 controllers/addons_controller.php:818
+#: controllers/addons_controller.php:885 controllers/addons_controller.php:905
+#: controllers/addons_controller.php:1024
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
+#: controllers/addons_controller.php:1215
+#: controllers/addons_controller.php:1250
+#: controllers/addons_controller.php:1305
+#: 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
@@ -592,6 +627,7 @@ msgstr "Mac OS X 作業系統"
 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"
@@ -609,12 +645,13 @@ msgstr ""
 "外掛程�能讓�覽器�到顯示特殊圖片格��播放多媒體檔案等功能。和擴充套件改變"
 "或加強已有的功能��，外掛程��讓�覽器支�全新的格�。"
 
-#: controllers/addons_controller.php:777
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:906
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "%1$s 常用外掛程�"
 
-#: controllers/components/amo.php:724 controllers/addons_controller.php:776
+#: controllers/components/amo.php:724 controllers/addons_controller.php:905
 msgid "addons_plugins_pagetitle"
 msgstr "外掛程�"
 
@@ -625,29 +662,31 @@ msgstr "外掛程�"
 msgid "addons_plugins_support_documentation"
 msgstr "說明文件："
 
+#. %s is the name of the add-on
 #: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr "%s 需�您在安��接�下�的「終端使用者授權�約��能繼續："
 
 # %1 is the addon name
-#: controllers/addons_controller.php:1120
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1249
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s 的�覽圖片"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1018
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147
 msgid "addons_recommended_introduction"
 msgstr ""
 "這裡有�堆的附加元件，其中有些大家都該試試。您�以從下列我們推薦的附加元件開"
 "始玩玩看�"
 
-#: controllers/addons_controller.php:1010
-#: controllers/addons_controller.php:1017
+#: controllers/addons_controller.php:1139
+#: controllers/addons_controller.php:1146
 msgid "addons_recommended_pagetitle"
 msgstr "推薦附加元件"
 
-#: controllers/addons_controller.php:1013
+#: controllers/addons_controller.php:1142
 msgid "addons_recommended_title"
 msgstr "推薦附加元件"
 
@@ -656,6 +695,7 @@ msgid "addons_searchengines_additional_resources"
 msgstr "其他資�"
 
 # link text devmo
+#. link text devmo
 #: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla 開發者中心網站"
@@ -672,34 +712,40 @@ msgstr ""
 
 # %1 is "make your own" link
 # %2 is MDC link
+#. %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 "到 %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: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: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: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:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:755 controllers/addons_controller.php:765
+#: controllers/addons_controller.php:884 controllers/addons_controller.php:894
 msgid "addons_searchengines_pagetitle"
 msgstr "�尋引擎"
 
@@ -711,7 +757,7 @@ msgstr "特別感� Mycroft 專案於 Firefox �尋引擎所努力的�果。
 msgid "addons_status_disabled"
 msgstr "已�用"
 
-#: controllers/components/amo.php:191
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "未完�版本"
 
@@ -748,11 +794,12 @@ msgid "addons_versions_careful_introduction"
 msgstr ""
 "這裡列出的舊版本僅供�考�測試之用。若無特別需求，請安�最新版的附加元件。"
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1184
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1313
 msgid "addons_versions_history"
 msgstr "版本歷�記錄"
 
-#: controllers/addons_controller.php:1173
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1302
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s 版本記錄"
@@ -765,6 +812,7 @@ msgstr "新增群組"
 msgid "admin_group_delete_pagetitle"
 msgstr "刪除群組"
 
+#. %s is a number to identify the group
 #: controllers/groups_controller.php:117
 #, php-format
 msgid "admin_group_deleted"
@@ -890,16 +938,20 @@ msgstr "忽略版本檢查"
 msgid "app_compat_older_firefox_only"
 msgstr "此元件僅�用於舊版的 Firefox"
 
+#. %1$s and %2$s are URLs
 #: 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: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:64
 msgid "app_compat_unreleased_version"
 msgstr "這個附加元件需�尚未發行的 <a href=\"%1$s\">Firefox %2$s</a>"
@@ -908,23 +960,23 @@ msgstr "這個附加元件需�尚未發行的 <a href=\"%1$s\">Firefox %2$s</a
 msgid "app_compat_update_firefox"
 msgstr "<a href=\"http://getfirefox.com\">�級 Firefox</a> �能使用此元件"
 
-#: controllers/addons_controller.php:667
+#: controllers/addons_controller.php:796
 msgid "browse_addons_name"
 msgstr "��稱排�"
 
-#: controllers/addons_controller.php:665
+#: controllers/addons_controller.php:794
 msgid "browse_addons_newest"
 msgstr "最新元件"
 
-#: controllers/addons_controller.php:663
+#: controllers/addons_controller.php:792
 msgid "browse_addons_popular"
 msgstr "熱門元件"
 
-#: controllers/addons_controller.php:666
+#: controllers/addons_controller.php:795
 msgid "browse_addons_rated"
 msgstr "�評分排�"
 
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:793
 msgid "browse_addons_updated"
 msgstr "最近更新元件"
 
@@ -957,6 +1009,7 @@ msgid "category_extra_mostpopular"
 msgstr "下載越多優先"
 
 # %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"
@@ -966,166 +1019,156 @@ msgstr "看看所有 %1$s 類元件"
 msgid "collection_not_found"
 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"
+
 #: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
-#, fuzzy
 msgid "compatibility_dashboard_center_header"
-msgstr "Add-on Compatibility Center"
+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: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."
+"使用以下�供於 %2$ 附加元件開發社群的工具與資訊，�先準備版本 %1$s 的推出。"
 
 #: views/compatibility/dashboard.thtml:107
-#, fuzzy
 msgid "compatibility_dashboard_loading"
-msgstr "Loading data..."
+msgstr "載入資料..."
 
 #: views/compatibility/dashboard.thtml:41
-#, fuzzy
 msgid "compatibility_dashboard_main_link"
-msgstr "Back to Main"
+msgstr "回到主��"
 
 #: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
-#, fuzzy
 msgid "compatibility_dashboard_report"
-msgstr "Add-on Compatibility Report"
+msgstr "附加元件相容性報告"
 
 #: 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"
+msgstr "给附加元件開發者的資訊"
 
 #: views/compatibility/developers.thtml:64
-#, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
-msgstr "Adjust maxVersion without uploading"
+msgstr "調整 maxVersion 而��新上傳"
 
 #: views/compatibility/dashboard.thtml:128
-#, fuzzy
 msgid "compatibility_developers_check_status"
-msgstr "Check Status of My Add-ons"
+msgstr "檢查我的附加元件的狀態"
 
+#. %1$s is a URL
+#. %2$s is an application and version.  Example:  Firefox 3.0
 #: 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."
+"若您有放在 Mozilla 附加元件網站的附加元件，請<a href=\"%1$s\">登入</a>已分�"
+"您的附加元件與版本 %2$s 的相容性。"
 
 #: views/compatibility/dashboard.thtml:118
-#, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
 #: views/compatibility/developers.thtml:71
-#, fuzzy
 msgid "compatibility_developers_no_addons"
-msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
+msgstr "您沒有任何放在 Mozilla 附加元件網站的附加元件。"
 
 #: views/compatibility/dashboard.thtml:137
 #: views/compatibility/developers.thtml:53
-#, fuzzy
 msgid "compatibility_developers_results"
-msgstr "Add-on Status Check Results"
+msgstr "附加元件狀態檢查�果"
 
 #: views/compatibility/dashboard.thtml:141
-#, fuzzy
 msgid "compatibility_developers_retrieving"
-msgstr "Retrieving status of hosted add-ons..."
+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:63
-#, fuzzy
 msgid "compatibility_developers_user_count"
-msgstr "%1$s %2$s users (%3$s&#37; of total)"
+msgstr "%1$s %2$s 使用者 (佔總數的 %3$s&#37;)"
 
 #: 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."
+"以下的附加元件代表 Mozilla 知�的附加元件使用的 95%，以他們的使用大�排列。"
 
 #: views/compatibility/dashboard.thtml:98
-#, fuzzy
 msgid "compatibility_report_detailed_link"
-msgstr "View Detailed Report"
+msgstr "檢視詳細報告"
 
+#. %1$s and %2$s are numbers
+#. %3$s is an application name and version.  Example: Firefox 3.1
 #: 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."
+"%1$s 個附加元件，代表 95&#37; Mozilla 已知附加元件使用�，目�共有 <b>%2"
+"$s&#37;</b> 與 %3$s 最新版本相容。"
 
 #: views/compatibility/dashboard.thtml:85
-#, fuzzy
 msgid "compatibility_report_legend_alpha"
-msgstr "Alpha Versions"
+msgstr "Alpha 版本"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:85
-#, fuzzy
 msgid "compatibility_report_legend_alpha_description"
-msgstr "Add-ons compatible with an alpha version of %1$s"
+msgstr "和 %1$s 的 Alpha 版本相容的附加元件"
 
 #: views/compatibility/dashboard.thtml:89
-#, fuzzy
 msgid "compatibility_report_legend_beta"
-msgstr "Beta Versions"
+msgstr "Beta 版本 (測試版)"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: 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"
+msgstr "與 %1$s 的測試版或是 RC 版相容的附加元件"
 
 #: views/compatibility/dashboard.thtml:93
-#, fuzzy
 msgid "compatibility_report_legend_latest"
-msgstr "Latest Version"
+msgstr "最新版"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: 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"
+msgstr "已經更新到與 %1$s 最新版相容的附加元件"
 
 #: views/compatibility/dashboard.thtml:81
-#, fuzzy
 msgid "compatibility_report_legend_other"
-msgstr "Other Versions"
+msgstr "其它版本"
 
+#. %1$s is an application name and version.  Example: Firefox 3.1
 #: views/compatibility/dashboard.thtml:81
-#, fuzzy
 msgid "compatibility_report_legend_other_description"
-msgstr "Add-ons not compatible with any version of %1$s"
+msgstr "與任何版本的 %1$s 皆�相容的附加元件"
 
 #: views/compatibility/dashboard.thtml:66
-#, fuzzy
 msgid "compatibility_report_title"
-msgstr "Add-on Compatibility Report"
+msgstr "附加元件相容性報告"
 
 #: 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"
+msgstr "給附加元件使用者的資訊"
 
 #: views/compatibility/dashboard.thtml:48
-#, fuzzy
 msgid "compatibility_view_report"
-msgstr "View Compatibility Report"
+msgstr "顯示相容性報告"
 
-#: views/pages/credits.thtml:139
+#. %s is a URL
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "想瞭解他們的貢�，您�以�考 Mozilla 上的 %s。"
 
-#: views/pages/credits.thtml:139
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "Wiki ��"
 
@@ -1164,18 +1207,27 @@ msgstr ""
 "\">famfamfam Silk 圖示集</a>，以 <a href=\"http://creativecommons.org/"
 "licenses/by/2.5/\">創用 CC 姓�標示 2.5 通用版</a> 授權�款發佈。"
 
+#: 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>."
+
 # 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/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:96
-#: views/elements/addon_listitem.thtml:147 views/elements/feature.thtml:112
+#: 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:104 views/addons/display.thtml:286
-#: views/addons/display.thtml:290 views/addons/browse_thumbs.thtml:89
+#: 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
@@ -1183,7 +1235,10 @@ 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
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 #: views/admin/addons_status.thtml:57
 msgid "datetime"
 msgstr "%Y 年 %m 月 %e 日 %H:%M"
@@ -1209,14 +1264,42 @@ msgstr "Edit Previews"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
+#: views/developers/dashboard.thtml:73
 msgid "devcp_actionbar_link_stats"
 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: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: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: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:1318
+#, fuzzy
+msgid "devcp_add_previews_success_upload"
+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"
@@ -1262,36 +1345,36 @@ msgstr "步驟 5：完�"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "上傳說明"
 
-#: controllers/developers_controller.php:2661
+#: controllers/developers_controller.php:2746
 msgid "devcp_addon_disabled_successfully"
 msgstr "�用附加元件�功"
 
-#: controllers/developers_controller.php:2283
-#: controllers/developers_controller.php:2284
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
 msgid "devcp_addon_edit_pagetitle"
 msgstr "編輯附加元件"
 
-#: controllers/developers_controller.php:2656
+#: controllers/developers_controller.php:2741
 msgid "devcp_addon_enabled_successfully"
 msgstr "啟用附加元件�功"
 
-#: controllers/developers_controller.php:2196
-#: controllers/developers_controller.php:2484
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "附加元件敘述"
 
-#: controllers/developers_controller.php:2206
-#: controllers/developers_controller.php:2494
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "授權�約"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "附加元件首�"
 
-#: controllers/developers_controller.php:2169
-#: controllers/developers_controller.php:2439
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "附加元件�稱"
 
@@ -1300,40 +1383,300 @@ msgstr "附加元件�稱"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "�覽圖片說明"
 
-#: controllers/developers_controller.php:2216
-#: controllers/developers_controller.php:2504
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "隱�政策"
 
-#: controllers/developers_controller.php:2185
-#: controllers/developers_controller.php:2473
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "附加元件摘�"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2540
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "技術支� Email ��"
 
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2549
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "技術支�網�"
 
-#: controllers/developers_controller.php:2226
-#: controllers/developers_controller.php:2611
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "版本資訊"
 
-#: controllers/developers_controller.php:2683
-#: controllers/developers_controller.php:2684
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "�交批准附加元件"
 
-#: controllers/developers_controller.php:2729
+#: 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:136
+#, fuzzy
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+#: 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:182
+#, fuzzy
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+#: 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:144
+#, fuzzy
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+#: 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:140
+#, fuzzy
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+#: 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:148
+#, fuzzy
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+#: 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: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."
+
+#: 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>."
+
+#: 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."
+
+#: views/developers/addon_status.thtml:102
+#, fuzzy
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+#: views/developers/addon_status.thtml:101
+#, fuzzy
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+#: views/developers/addon_status.thtml:99
+#, fuzzy
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+#: 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 "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 "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 "Add-on Status: %s"
+
+#: views/developers/addon_status.thtml:153
+#, fuzzy
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+#: views/developers/addon_status.thtml:169
+#, fuzzy
+msgid "devcp_addon_status_header_active"
+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:165
+#, fuzzy
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+#: views/developers/addon_status.thtml:117
+#, fuzzy
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+#: 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: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."
+
+#: 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: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."
+
+#: views/developers/addon_status.thtml:64
+#, fuzzy
+msgid "devcp_addon_status_public"
+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 ""
+"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
+#, fuzzy
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+#: 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"
@@ -1354,6 +1697,7 @@ msgstr ""
 "通�時您會收到 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"
@@ -1364,6 +1708,7 @@ 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"
@@ -1383,16 +1728,17 @@ msgstr "您的附加元件上傳已完�。"
 msgid "devcp_addon_submission_trusted_public"
 msgstr "因為您的附加元件已�信任，此版本將自動��並�到「公開��。"
 
-#: controllers/developers_controller.php:1475
-#: controllers/developers_controller.php:1476
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
 msgid "devcp_addon_submit_pagetitle"
 msgstr "上傳附加元件"
 
-#: controllers/developers_controller.php:2375
+#: 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"
@@ -1403,6 +1749,7 @@ 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"
@@ -1431,10 +1778,102 @@ msgstr "下一步"
 msgid "devcp_change_addontype"
 msgstr "變更附加元件種類："
 
-#: controllers/developers_controller.php:1402
+#: controllers/developers_controller.php:1487
 msgid "devcp_comments_updated"
 msgstr "開發者留言已更新。"
 
+#: views/developers/dashboard.thtml:68
+#, fuzzy
+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>
+#: 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 "
+"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 "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: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."
+
 #: views/developers/details.thtml:120
 msgid "devcp_details_addpreview_link"
 msgstr "新增�覽圖片"
@@ -1527,6 +1966,7 @@ msgstr "開發者沒有�供技術支�網�。"
 msgid "devcp_details_trusted"
 msgstr "已�信任"
 
+#. %s is a version number.  Example:  3.0
 #: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
@@ -1554,6 +1994,7 @@ msgstr ""
 "此元件被�用後，就無法被�尋或列在元件清單中，也無法被使用者下載或更新。事實"
 "上�用元件很�被刪除，但是您�以隨時回到這一��新啟用此元件。"
 
+#. %s is the name of an add-on
 #: views/developers/disable.thtml:55
 #, php-format
 msgid "devcp_disable_disable_title"
@@ -1571,11 +2012,65 @@ msgstr "您確定�啟用此附加元件嗎？"
 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 "Add Reply"
+
+#: views/developers/discuss.thtml:57
+#, fuzzy
+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
+#: 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."
+
+#. %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
+#, fuzzy
+msgid "devcp_discuss_submit_reply"
+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 "written by %1$s on %2$s"
+
 #: views/developers/edit.thtml:65 views/developers/edit.thtml:71
 msgid "devcp_edit_author_add"
 msgstr "新增作者"
@@ -1588,10 +2083,297 @@ msgstr "作者 Email 地�"
 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 "Add Author"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+#: 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
+#, 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:61
+#, fuzzy
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. 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
+#, fuzzy
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+#: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+#: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
+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).
+#: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+#: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+#: 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
+#, fuzzy
+msgid "devcp_edit_categories_label_category_num"
+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 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
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+#: views/developers/addon_edit.thtml:46
+#, fuzzy
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+#: views/developers/addon_edit.thtml:48
+#, fuzzy
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+#: views/developers/addon_edit.thtml:50
+#, fuzzy
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+#: views/developers/addon_edit.thtml:52
+#, fuzzy
+msgid "devcp_edit_dt_manage_properties"
+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 "作者"
@@ -1657,6 +2439,206 @@ msgstr "目標語言"
 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: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 "æ›´æ–°"
@@ -1667,11 +2649,67 @@ 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 "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 "Change Status"
+
+#: views/elements/developers/editbox.thtml:48
+#, fuzzy
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+#: views/elements/developers/editbox.thtml:43
+#, fuzzy
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+#: views/elements/developers/editbox.thtml:57
+#, fuzzy
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+#: views/elements/developers/editbox.thtml:49
+#, fuzzy
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+#: views/elements/developers/editbox.thtml:60
+#, fuzzy
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+#: views/elements/developers/editbox.thtml:53
+#, fuzzy
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+#: views/elements/developers/editbox.thtml:54
+#, fuzzy
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+#: views/elements/developers/editbox.thtml:42
+#, fuzzy
+msgid "devcp_editbox_view_listing"
+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
 #, php-format
@@ -1680,6 +2718,7 @@ 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
 #, php-format
@@ -1688,6 +2727,7 @@ 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
 #, php-format
@@ -1701,6 +2741,8 @@ 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"
@@ -1726,55 +2768,70 @@ msgstr "給審核者的說明"
 msgid "devcp_editversion_submit_update"
 msgstr "æ›´æ–°"
 
-#: controllers/developers_controller.php:1387
-#: controllers/developers_controller.php:2262
-#: controllers/developers_controller.php:2288
-#: controllers/developers_controller.php:2544
-#: controllers/developers_controller.php:2648
-#: controllers/developers_controller.php:2698
+#: 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:336
+#: 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:2191
-#: controllers/developers_controller.php:2479
+#: 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:1907
+#: 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
 #, php-format
 msgid "devcp_error_appversion_reference_link"
 msgstr "請�考 %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 "此��"
 
-#: controllers/developers_controller.php:2013
+#: 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, php-format
+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 ""
 "所�的元件類型�接�此類副檔� (%s) 上傳。�有下�列出的副檔���許上傳: %s"
 
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:1739
 msgid "devcp_error_file_guids_dont_match"
 msgstr "�些檔案的 GUID �符"
 
@@ -1803,18 +2860,21 @@ msgstr "上傳大�超�最大值"
 msgid "devcp_error_http_nofile"
 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:401
 #, php-format
 msgid "devcp_error_icon_extension"
 msgstr "圖示檔案�接�此類副檔� (%s) 上傳。�有下�列出的副檔���許上傳: %s"
 
-#: controllers/developers_controller.php:1723
+#. %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:448
-#: controllers/developers_controller.php:1664
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "找�到 install.rdf 檔案。"
 
@@ -1822,21 +2882,26 @@ msgstr "找�到 install.rdf 檔案。"
 msgid "devcp_error_install_manifest"
 msgstr "install.rdf 中�有下列錯誤："
 
-#: controllers/developers_controller.php:1607
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "請�擇有效的附加元件種類。"
 
+#. %$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 "%s 是無效的 %s 版本號"
 
+#. %s is a string
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
 msgstr "此附加元件的 ID 無效：%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"
@@ -1852,6 +2917,7 @@ msgstr ""
 msgid "devcp_error_invalid_version_spaces"
 msgstr "此附加元件的版本號無效：版本號�能有空白。"
 
+#. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
@@ -1861,6 +2927,7 @@ msgstr "解� install.rdf 時發生下列錯誤：%s"
 msgid "devcp_error_move_file"
 msgstr "無法移動檔案"
 
+#. %s is the name of a file
 #: controllers/components/developers.php:650
 #: controllers/components/developers.php:662
 #: controllers/components/developers.php:667
@@ -1883,15 +2950,15 @@ msgstr "此附加元件的 install.rdf 中找�到 ID。"
 msgid "devcp_error_no_platform"
 msgstr "未�擇作業系統"
 
-#: controllers/developers_controller.php:2718
+#: controllers/developers_controller.php:2803
 msgid "devcp_error_nominate_message"
 msgstr "您必須填寫�交批准所�求的詳細訊�。"
 
-#: controllers/developers_controller.php:2712
+#: controllers/developers_controller.php:2797
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "您無法將發行�版本 (Pre-release) 的附加元件�交批准。"
 
-#: controllers/developers_controller.php:2704
+#: controllers/developers_controller.php:2789
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "您�能將「沙箱��的附加元件�交批准。"
 
@@ -1903,18 +2970,20 @@ msgstr "請至少�一項分類。"
 msgid "devcp_error_one_user"
 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"
 
-#: controllers/developers_controller.php:1899
-#: controllers/developers_controller.php:1914
-#: controllers/developers_controller.php:2379
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
 msgid "devcp_error_saving"
 msgstr "嘗試儲存您的資料時發生錯誤。"
 
-#: controllers/developers_controller.php:1696
+#: controllers/developers_controller.php:1781
 msgid "devcp_error_update_access_denied"
 msgstr "您沒有權�更新此附加元件。"
 
@@ -1927,7 +2996,7 @@ msgid "devcp_error_updateurl"
 msgstr ""
 "附加元件�能使用外部的 updateURL，請將其從 install.rdf 中移除後�試一次。"
 
-#: controllers/developers_controller.php:409
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "請上傳檔案。"
@@ -2147,6 +3216,7 @@ 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"
@@ -2188,11 +3258,26 @@ msgstr "上傳附加元件"
 msgid "devcp_myaddons_title"
 msgstr "開發者工具"
 
+#. %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 "回到元件詳細資訊"
 
 # %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
@@ -2200,11 +3285,33 @@ msgid "devcp_nominate_submit_nominate"
 msgstr "�交批准 %s"
 
 # %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: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 "移除�設�覽圖片將會使其他�覽圖片自動�為�設圖片。"
@@ -2213,6 +3320,10 @@ msgstr "移除�設�覽圖片將會使其他�覽圖片自動�為�設圖
 # %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"
@@ -2225,9 +3336,14 @@ msgstr ""
 msgid "devcp_notice_makedefault"
 msgstr "將此圖片設為�設�覽圖片將會�消先�的�設圖片設定。"
 
-#: controllers/developers_controller.php:64
-#: controllers/developers_controller.php:74
+#: 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
@@ -2256,6 +3372,60 @@ msgstr "編輯�覽圖片"
 msgid "devcp_preview_updated_successfully"
 msgstr "�覽圖片更新�功。"
 
+#: 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 ""
@@ -2266,10 +3436,20 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "新增�覽圖片"
 
+#: 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 "編輯�覽圖片"
 
+#: 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 "�覽圖片檔案"
@@ -2278,6 +3458,34 @@ msgstr "�覽圖片檔案"
 msgid "devcp_previews_label_makedefault"
 msgstr "設為�設�覽圖片"
 
+#: views/developers/previews.thtml:101
+#, fuzzy
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+#: views/developers/previews.thtml:119
+#, fuzzy
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+#: 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:46
+#, fuzzy
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+#: 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 "刪除�覽圖片"
@@ -2294,55 +3502,170 @@ msgstr "編輯�覽圖片"
 msgid "devcp_previews_submit_upload"
 msgstr "上傳�覽圖片"
 
+#: 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 "��？"
 
-#: controllers/developers_controller.php:2632
+#: controllers/developers_controller.php:2717
 msgid "devcp_question_delete_file"
 msgstr "您確定�刪除此檔案嗎？"
 
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: 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."
+
+#: 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 "略�更新已存的附加元件資訊"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:76
+#: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "�日有效使用者：<em>%s</em>"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:72
+#: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "總下載次數：<em>%s</em>"
 
+#. %s is a number
 #: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:74
+#: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "本週下載數：<em>%s</em>"
 
-#: controllers/developers_controller.php:1481
+#: 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 "附加元件的上傳已暫時�用，請�後�試試看。"
 
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "我接�"
 
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "我拒絕"
 
@@ -2358,11 +3681,12 @@ msgstr "已�用"
 msgid "devcp_summary_header_trusted"
 msgstr "已�信任"
 
-#: views/developers/dashboard.thtml:82 views/developers/index.thtml:82
+#: 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"
@@ -2373,6 +3697,7 @@ 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"
@@ -2382,30 +3707,674 @@ msgstr "請確定您已為此佈景主題 %s。"
 msgid "devcp_theme_upload_preview_link"
 msgstr "上傳�覽圖片"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. %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
+#, fuzzy
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+#: 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
+#, fuzzy
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+#: 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 "請�覽 %s 閱讀�考資訊。"
 
-#: controllers/developers_controller.php:447
-#: controllers/developers_controller.php:1663
+#. 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 "此��"
 
-#: controllers/developers_controller.php:2527
-#: controllers/developers_controller.php:2528
+#: 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 "編輯版本"
 
-#: controllers/developers_controller.php:2572
+#: controllers/developers_controller.php:2657
 msgid "devcp_version_updated_successfully"
 msgstr "版本更新�功。"
 
+#: 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
+#, fuzzy
+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.
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+#: 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
+#, fuzzy
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+#: views/developers/versions.thtml:49
+#, fuzzy
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+#: views/developers/versions.thtml:87
+#, fuzzy
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %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
+#, 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:90
 msgid "downloads_disable_warning"
 msgstr "此附加元件已�用"
 
+#: controllers/components/editors.php:57
+#, fuzzy
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+#: controllers/components/editors.php:213
+#, fuzzy
+msgid "editor_review_error_file_not_pending"
+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 "Please select a review action."
+
+#: controllers/components/editors.php:192
+#, fuzzy
+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.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+#: controllers/components/editors.php:161
+#, fuzzy
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+#: controllers/components/editors.php:197
+#, fuzzy
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
 msgstr "�濾�件"
@@ -2414,7 +4383,7 @@ msgstr "�濾�件"
 msgid "editorcp_logs_filter_by"
 msgstr "�類型╱動作�濾"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:788
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "事件記錄"
 
@@ -2466,6 +4435,7 @@ msgstr "隱�留言"
 msgid "editorcp_reviewlog_comments_show"
 msgstr "顯示留言"
 
+#. %1$s and %2$s are full <input> tags for dates
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
@@ -2475,7 +4445,7 @@ msgstr "檢視 %s 到 %s 間的記錄"
 msgid "editorcp_reviewlog_none_found"
 msgstr "此日期間無審核記錄。"
 
-#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:814
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "審核記錄"
 
@@ -2499,24 +4469,24 @@ msgstr "最近審核者動態"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "所有審核"
 
-#: controllers/editors_controller.php:369
-#: controllers/editors_controller.php:370
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "審核附加元件"
 
-#: controllers/editors_controller.php:460
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "請完�下�的欄�："
 
-#: controllers/editors_controller.php:461
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "請至少�一個檔案審核。"
 
-#: controllers/editors_controller.php:395
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "��許自己審核自己。"
 
-#: controllers/editors_controller.php:305
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "外部軟體支�"
 
@@ -2528,39 +4498,39 @@ msgstr "新增精�元件"
 msgid "editors_featured_add_feature_submit"
 msgstr "新增"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:656
-#: controllers/editors_controller.php:672
+#: 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:675
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "新增精�元件�功。"
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:663
-#: controllers/editors_controller.php:692
-#: controllers/editors_controller.php:710
+#: 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:712
+#: 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:685
+#: 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:730
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "移除精�元件失敗。"
 
-#: controllers/editors_controller.php:725
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "移除精�元件�功。"
 
-#: controllers/editors_controller.php:739
-#: controllers/editors_controller.php:741
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "精�附加元件"
 
@@ -2593,38 +4563,41 @@ msgid "editors_notice_filter_session"
 msgstr "這些�濾�件會�留到關閉�覽器或手動清除。"
 
 # %1 is the queue mode
+#. %1 is the queue mode
 #: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "目�沒有 %s 附加元件待審核。"
 
-#: controllers/editors_controller.php:258
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 天"
 
-#: controllers/editors_controller.php:266
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 �時"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 分"
 
-#: controllers/editors_controller.php:58 controllers/editors_controller.php:67
-#: controllers/editors_controller.php:71
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "審核者工具"
 
-#: controllers/editors_controller.php:286
+#. %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 "%s 專用"
 
-#: controllers/editors_controller.php:301
+#: 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:78
 #, php-format
 msgid "editors_queue_app_compatibility"
@@ -2638,19 +4611,24 @@ msgstr "清除"
 msgid "editors_queue_submit_filter"
 msgstr "�濾�件"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "所有審核佇列目�已�用，請�後�回來查看。"
 
-#: controllers/editors_controller.php:456
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "審核動作"
 
+#: views/editors/review.thtml:153
+#, fuzzy
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
 #: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "�至「公開��"
 
-#: views/editors/review.thtml:153
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "�交管�員審核"
 
@@ -2658,29 +4636,37 @@ msgstr "�交管�員審核"
 msgid "editors_review_action_sandbox"
 msgstr "退回「沙箱��"
 
-#: controllers/editors_controller.php:457
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "審核者留言"
 
-#: views/editors/review.thtml:167
+#: 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 ""
 "這個�項會讓附加元件最新版本和其檔案放上「公開��，但後續更新版本還是會先�"
 "到「沙箱��等待審核者批准。"
 
-#: views/editors/review.thtml:170
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "這個�項會將附加元件留在「沙箱��。"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr "這個�項會附加元件在「沙箱��的待審核版本放上「公開��。"
 
-#: views/editors/review.thtml:162
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "這個�項會讓附加元件在「沙箱��的待審核版本留在「沙箱��。"
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "如果您覺得此附加元件有安全上�版權上的疑慮或其他需�管�員處�的�題，請在下"
@@ -2706,15 +4692,15 @@ msgstr "分類："
 msgid "editors_review_header_compatibility"
 msgstr "相容於："
 
-#: views/editors/review.thtml:234
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "敘述："
 
-#: views/editors/review.thtml:258
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "開發者留言"
 
-#: views/editors/review.thtml:246
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "授權�約"
 
@@ -2722,138 +4708,170 @@ msgstr "授權�約"
 msgid "editors_review_header_files"
 msgstr "檔案："
 
-#: views/editors/review.thtml:267
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "項目歷�"
 
-#: views/editors/review.thtml:215
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "�交批准訊�"
 
-#: views/editors/review.thtml:323
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "�覽圖片"
 
-#: views/editors/review.thtml:252
+#: 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:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "審核 %s"
 
-#: views/editors/review.thtml:222
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "給審核者的留言"
 
-#: views/editors/review.thtml:228
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "摘�"
 
-#: views/editors/review.thtml:240
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "版本資訊"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:295
+#. 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 "Reply"
+
+#: 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 "�管�員審核"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:289
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "批准通��公開�"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:292
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "批准失敗�沙箱�"
 
-#: views/editors/review.thtml:315
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "找�到先�的審核記錄。"
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:306
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "�管�員審核"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:300
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "已���公開�"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:303
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "已拒絕�沙箱�"
 
-#: views/editors/review.thtml:198
+#. 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 "應用程�："
 
-#: views/editors/review.thtml:186
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "或�一個回覆訊�："
 
-#: views/editors/review.thtml:180
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "留言："
 
-#: views/editors/review.thtml:194
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "作業系統："
 
-#: views/editors/review.thtml:268 views/editors/review.thtml:324
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "回頂端"
 
 #: views/editors/review.thtml:45
-#, fuzzy
 msgid "editors_review_next_link"
-msgstr "next &raquo;"
+msgstr "下一� &raquo;"
 
-#: views/editors/review.thtml:334
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "無�覽圖片。"
 
 #: views/editors/review.thtml:44
-#, fuzzy
 msgid "editors_review_previous_link"
-msgstr "&laquo; prev"
+msgstr "&laquo; 上一�"
 
-#: controllers/editors_controller.php:146
-#: controllers/editors_controller.php:148
+#: 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:43
-#, fuzzy
 msgid "editors_review_rank_in_queue"
-msgstr "<strong># %1$s</strong> of %2$s in queue"
+msgstr "在 %2$s 篇中排行 <strong># %1$s</strong>"
 
-#: views/editors/review.thtml:206
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "處�動作"
 
-#: views/editors/review.thtml:276
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "動作"
 
-#: views/editors/review.thtml:277
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "留言"
 
-#: views/editors/review.thtml:274
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "日期"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "審核者"
 
-#: views/editors/review.thtml:273
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "版本�檔案"
 
-#: controllers/editors_controller.php:411
+#: 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 "審核已�功。"
 
@@ -2877,7 +4895,7 @@ msgstr "動作"
 msgid "editors_reviews_in_reply_to"
 msgstr "回覆："
 
-#: controllers/editors_controller.php:572
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "審核已�功處��"
 
@@ -2889,23 +4907,23 @@ msgstr "目�沒有待審核項目。"
 msgid "editors_reviews_submit_process_reviews"
 msgstr "處�審核"
 
-#: controllers/editors_controller.php:297
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "為特定網站設計"
 
-#: controllers/editors_controller.php:228
+#: controllers/editors_controller.php:231
 msgid "editors_submissiontype_new"
 msgstr "新進元件"
 
-#: controllers/editors_controller.php:229
+#: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "後續更新"
 
-#: controllers/editors_controller.php:459
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "已測試應用程�"
 
-#: controllers/editors_controller.php:458
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "已測試作業系統"
 
@@ -2946,17 +4964,20 @@ msgstr "作業系統"
 msgid "editors_th_submissiontypes"
 msgstr "上傳種類"
 
-#: controllers/editors_controller.php:254
+#. %s is a number
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s 天"
 
-#: controllers/editors_controller.php:262
+#. %s is a number
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s �時"
 
-#: controllers/editors_controller.php:270
+#. %s is a number
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s 分"
@@ -2965,8 +4986,8 @@ msgstr "%s 分"
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83 controllers/components/amo.php:610
 #: controllers/components/amo.php:611 controllers/components/amo.php:612
-#: controllers/reviews_controller.php:352
-#: controllers/reviews_controller.php:480
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
 msgid "error_access_denied"
 msgstr "存�被拒絕"
 
@@ -2974,12 +4995,13 @@ msgstr "存�被拒絕"
 msgid "error_access_denied_message"
 msgstr "您未經授權檢視此��。"
 
-#: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:532
-#: controllers/developers_controller.php:950
-#: controllers/developers_controller.php:1407
-#: controllers/developers_controller.php:2385
-#: controllers/developers_controller.php:2692
+#: 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
@@ -2989,18 +5011,19 @@ msgstr "您未經授權檢視此��。"
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:123
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/api_controller.php:894
-#: controllers/api_controller.php:925 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1059
-#: controllers/addons_controller.php:1109
-#: controllers/addons_controller.php:1113
-#: controllers/editors_controller.php:386
+#: controllers/api_controller.php:925 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:219
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1238
+#: controllers/addons_controller.php:1242
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "找�到附加元件�"
 
-#: controllers/files_controller.php:83 controllers/files_controller.php:185
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "此附加元件無法在此�覽。"
 
@@ -3008,13 +5031,13 @@ msgstr "此附加元件無法在此�覽。"
 msgid "error_addon_selfreview"
 msgstr "您無法�您自己的附加元件發表�見。"
 
-#: controllers/addons_controller.php:624
+#: controllers/addons_controller.php:753
 msgid "error_browse_no_addons"
 msgstr "此分類無附加元件�"
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr ""
+msgstr "沒有找到附加元件的消�來�。"
 
 #: views/users/register.thtml:60 views/users/edit.thtml:176
 #: views/developers/add_step2.thtml:117 controllers/api_controller.php:907
@@ -3030,24 +5053,25 @@ msgstr "Email 地�無效。"
 msgid "error_field_required"
 msgstr "此欄��能留空。"
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:152
-#: controllers/files_controller.php:165 controllers/files_controller.php:174
-#: controllers/files_controller.php:192 controllers/editors_controller.php:509
+#: 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 "找�到檔案�"
 
-#: controllers/editors_controller.php:527
+#. %s is a filename
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "檔案錯誤：%s �存在。"
 
 #: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1594
-#: controllers/developers_controller.php:1869
-#: controllers/developers_controller.php:2008
-#: controllers/developers_controller.php:2016
-#: controllers/developers_controller.php:2307
+#: 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 "此表單中有錯誤，請更正後��出一次。"
@@ -3062,16 +5086,18 @@ msgstr "錯誤的圖形檢核碼，請�試一次�"
 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: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:324
-#: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:900
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1033
-#: controllers/addons_controller.php:1099
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475 controllers/api_controller.php:900
+#: controllers/addons_controller.php:206
+#: controllers/addons_controller.php:1162
+#: controllers/addons_controller.php:1228
 #: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
@@ -3089,7 +5115,7 @@ msgstr "注�"
 msgid "error_preview_notfound"
 msgstr "找�到�覽圖片�"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:112
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "您必須�一個評分。"
 
@@ -3139,8 +5165,8 @@ msgstr "請先用您收到的確�碼確�您的使用者帳號。"
 msgid "error_username_or_pw_wrong"
 msgstr "使用者�稱或密碼錯誤�"
 
-#: controllers/developers_controller.php:2539
-#: controllers/editors_controller.php:381
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "找�到版本�"
 
@@ -3153,12 +5179,14 @@ msgid "feature_learnmore"
 msgstr "詳細資訊"
 
 # %1 is the add-on name
+#. %1 is the add-on name
 #: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "%1$s 的詳細資訊"
 
-#: views/elements/addon_listitem.thtml:132 views/elements/feature.thtml:99
+#. %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"
@@ -3169,6 +5197,45 @@ msgstr[0] "%1$s 篇�見"
 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 "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 "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 "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 :: 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 "+/-"
+
 #: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "�留所有權利。"
@@ -3204,7 +5271,7 @@ msgstr "其他語言："
 msgid "footer_privacy_policy"
 msgstr "隱�政策"
 
-#: views/addons/display.thtml:379
+#: views/addons/display.thtml:403
 msgid "forum_save"
 msgstr "儲存"
 
@@ -3213,15 +5280,17 @@ 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:110
 msgid "general_addontype_dict_plural"
-msgstr "字典套件"
+msgstr "å­—å…¸"
 
 #: 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:108
 msgid "general_addontype_extension_plural"
 msgstr "擴充套件"
@@ -3231,24 +5300,27 @@ 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:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "語言套件 (附加元件)"
 
 #: models/addontype.php:93
 msgid "general_addontype_lpapp"
-msgstr "語言套件 (程�)"
+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:112
 msgid "general_addontype_lpapp_plural"
-msgstr "語言套件 (程�)"
+msgstr "語言套件 (應用程�)"
 
 #: 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:114
 msgid "general_addontype_plugin_plural"
 msgstr "外掛程�"
@@ -3258,6 +5330,7 @@ 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:111
 msgid "general_addontype_search_plural"
 msgstr "�尋引擎"
@@ -3267,10 +5340,12 @@ 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:109
 msgid "general_addontype_theme_plural"
 msgstr "佈景主題"
 
+#. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
@@ -3301,12 +5376,12 @@ msgid "header_navlink_addons"
 msgstr "附加元件"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:360
+#: 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:147
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "登出"
 
@@ -3314,14 +5389,15 @@ msgstr "登出"
 msgid "header_navlink_myaccount"
 msgstr "我的帳號"
 
-#: views/elements/header.thtml:150
+#: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "註冊"
 
+#. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
 #: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:81 views/elements/feature.thtml:84
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
@@ -3329,23 +5405,29 @@ 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/install.thtml:229
 msgid "install_a_login_to_install"
 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/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/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/install.thtml:158
 #, php-format
 msgid "install_download"
@@ -3368,7 +5450,7 @@ msgid "langtools_download_langpack"
 msgstr "下載語言套件"
 
 #: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:701 controllers/addons_controller.php:894
+#: controllers/components/amo.php:701 controllers/addons_controller.php:1023
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "字典�語言套件"
 
@@ -3424,7 +5506,11 @@ msgstr "Firefox"
 
 #: config/bootstrap.php:277
 msgid "main_prettyname_seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
@@ -3458,6 +5544,7 @@ 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:214
 msgid "other_users"
 msgstr "其他使用者"
@@ -3470,36 +5557,34 @@ msgstr "應用程�版本"
 msgid "page_title_credits"
 msgstr "感�"
 
-#: controllers/pages_controller.php:94
 msgid "page_title_experimental_addons"
 msgstr "實驗中附加元件"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
+#: controllers/pages_controller.php:111
 msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
+msgstr "常見�題集 (FAQ)"
 
-#: controllers/pages_controller.php:96
+#: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:103
+#: controllers/pages_controller.php:101
 msgid "page_title_policy"
 msgstr "附加元件使用�款"
 
-#: controllers/pages_controller.php:105
+#: controllers/pages_controller.php:103
 msgid "page_title_privacy"
 msgstr "Mozilla 隱�權�護政策"
 
-#: controllers/pages_controller.php:107
+#: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "�見撰寫指�"
 
-#: controllers/pages_controller.php:109
+#: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
 msgstr "沙箱審核系統"
 
-#: controllers/pages_controller.php:111
+#: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "上傳說明"
 
@@ -3517,12 +5602,15 @@ msgstr ""
 "上傳到 Mozilla 附加元件的元件必須�有 install.rdf 檔案，並至少支�下�其中之"
 "一的應用程�。�有下�列出的應用程�版本�許上傳。"
 
+#. %s is a full <a> tag
 #: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 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:92
 msgid "pages_appversions_required_files_link"
 msgstr "這裡"
@@ -3531,7 +5619,6 @@ msgstr "這裡"
 msgid "pages_appversions_versions"
 msgstr "版本"
 
-#: views/pages/experimental_addons.thtml:56
 msgid "pages_experimental_addons_backbutton"
 msgstr "回到上一�"
 
@@ -3544,6 +5631,7 @@ 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"
@@ -3569,6 +5657,8 @@ 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 ""
@@ -3577,6 +5667,8 @@ msgstr ""
 
 # %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
 msgid "recaptcha_hardtoread_text"
 msgstr ""
@@ -3591,7 +5683,7 @@ msgstr "您是人類嗎？"
 msgid "recaptcha_whatsthis"
 msgstr "這是什麼？"
 
-#: controllers/reviews_controller.php:556
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "回報此�見發生錯誤�"
 
@@ -3616,7 +5708,7 @@ msgid "review_flag_reason_spam"
 msgstr "廣告訊�或是其他無關的內容"
 
 #: views/reviews/display.thtml:95 views/reviews/display.thtml:179
-#: controllers/reviews_controller.php:551
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "��您，此�見已經標記為需�審核。"
 
@@ -3629,34 +5721,36 @@ 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: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:54 views/reviews/display.thtml:54
 #: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "� %s 的�見"
 
-#: controllers/addons_controller.php:261
+#: controllers/addons_controller.php:390
 msgid "rss_featuredaddons"
 msgstr "推薦附加元件"
 
-#: controllers/addons_controller.php:259
+#: controllers/addons_controller.php:388
 msgid "rss_newestaddons"
 msgstr "最新附加元件"
 
-#: controllers/addons_controller.php:260
+#: controllers/addons_controller.php:389
 msgid "rss_updatedaddons"
 msgstr "最近更新元件"
 
@@ -3693,6 +5787,7 @@ msgstr "所有�尋引擎"
 msgid "search_landing_browse_search_engines"
 msgstr "�覽�尋引擎"
 
+#. %s is a number
 #: views/search/index.thtml:70
 #, php-format
 msgid "search_matching_addons_number"
@@ -3711,12 +5806,13 @@ msgstr "�尋附加元件"
 msgid "search_rss_description"
 msgstr "�尋�果消�來�"
 
+#. %s is the terms the user is searching for (a string)
 #: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "�尋�果：%s "
 
-#: views/addons/home.thtml:172
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "管�員工具"
 
@@ -3724,7 +5820,7 @@ msgstr "管�員工具"
 msgid "sidebar_navlink_developer_tools"
 msgstr "開發者工具"
 
-#: views/addons/home.thtml:166
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "審核者工具"
 
@@ -3732,6 +5828,7 @@ msgstr "審核者工具"
 msgid "sidebar_navlink_welcome"
 msgstr "æ­¡è¿Ž"
 
+#. %s is the user's name
 #: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
@@ -3769,6 +5866,7 @@ msgstr "佈景主題"
 msgid "sidebar_pitch_updated_addons"
 msgstr "最近更新元件"
 
+#. %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
@@ -3781,6 +5879,7 @@ 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/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -3798,24 +5897,32 @@ msgstr "開發者工具"
 msgid "statistics_addon_switch"
 msgstr "切�元件"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#. 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 "%m 月 %e 日"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#. 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 "%Y 年 %m 月 %e 日"
 
+#. 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:147 views/statistics/addon.thtml:158
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 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: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:498
 #, php-format
 msgid "statistics_events_app_released"
@@ -3857,10 +5964,9 @@ msgstr "統計資訊顯示�"
 msgid "statistics_index_view_button"
 msgstr "檢視統計資訊"
 
-#: views/statistics/addon.thtml:210 controllers/statistics_controller.php:223
-#, fuzzy
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
-msgstr "View this table in CSV format"
+msgstr "下載此表格 (CSV 格�)"
 
 #: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
@@ -3871,117 +5977,119 @@ msgid "statistics_js_dropdowns_removeplot"
 msgstr "移除這一點"
 
 #: controllers/statistics_controller.php:224
-#, fuzzy
 msgid "statistics_js_groupby_selector_date"
-msgstr "Group by: Day"
+msgstr "分類�據: 日期"
 
-#: controllers/statistics_controller.php:226
-#, fuzzy
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
-msgstr "Group by: Month"
+msgstr "分類�據: 月份"
 
 #: controllers/statistics_controller.php:225
-#, fuzzy
 msgid "statistics_js_groupby_selector_week"
-msgstr "Group by: Week"
+msgstr "分類�據: 星期"
 
-#: controllers/statistics_controller.php:235
+#: controllers/statistics_controller.php:226
+#, fuzzy
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "在此範�找到%s"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "新增座標點"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "新增此圖表的其他座標點"
 
-#: controllers/statistics_controller.php:236
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "隱�總計數"
 
-#: controllers/statistics_controller.php:237
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "顯示總計數"
 
-#: controllers/statistics_controller.php:238
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "在此圖形�繪總數"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "檢視資料 (CSV)"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "�得此資料的逗點分隔檔案"
 
-#: controllers/statistics_controller.php:242
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "隱� %s 事件"
 
-#: controllers/statistics_controller.php:243
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "顯示 %s 事件"
 
-#: controllers/statistics_controller.php:244
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "於座標點上顯示元件發行日期"
 
-#: controllers/statistics_controller.php:239
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "隱� Firefox 事件"
 
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "顯示 Firefox 事件"
 
-#: controllers/statistics_controller.php:241
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "於座標點上顯示 Firefox 發行日期"
 
-#: controllers/statistics_controller.php:247
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "收起圖表"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "展開圖表"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "縮放圖表"
 
-#: controllers/statistics_controller.php:229
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "�日有效使用者"
 
-#: controllers/statistics_controller.php:231
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "應用程�"
 
-#: controllers/statistics_controller.php:234
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "自訂"
 
-#: controllers/statistics_controller.php:228
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "下載"
 
-#: controllers/statistics_controller.php:233
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "作業系統"
 
-#: controllers/statistics_controller.php:232
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "元件狀態"
 
-#: controllers/statistics_controller.php:227
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "摘�"
 
-#: controllers/statistics_controller.php:230
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "元件版本"
 
@@ -4005,11 +6113,11 @@ msgstr "未知"
 msgid "statistics_longnames_version"
 msgstr "元件版本"
 
-#: views/statistics/addon.thtml:104
+#: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
 msgstr "所�資訊�足以產生此圖表，請�候�回來檢查。"
 
-#: views/statistics/addon.thtml:116
+#: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr "我們還沒有任何關於此附加元件的資料，請�幾天後�回來檢查。"
 
@@ -4019,11 +6127,11 @@ msgstr ""
 "附加元件統計資訊正在更新中，因程�碼正在更新相關資訊的緣故，最近的資料�能會"
 "�完整。請�幾分�後�回來檢查。"
 
-#: views/statistics/addon.thtml:122
+#: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr "統計資訊顯示�已�用，請�候�回來檢查。"
 
-#: views/statistics/addon.thtml:109
+#: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
 msgstr "檢視統計資訊顯示�中的圖表需�開啟 JavaScript。"
 
@@ -4038,36 +6146,36 @@ msgstr "您的設定已更新�"
 msgid "statistics_pagetitle"
 msgstr "統計資訊顯示�"
 
-#: views/statistics/addon.thtml:85
+#: views/statistics/addon.thtml:99
 msgid "statistics_plot_legend_adu"
 msgstr "�日有效使用者"
 
-#: views/statistics/addon.thtml:81
+#: views/statistics/addon.thtml:95
 msgid "statistics_plot_legend_downloads"
 msgstr "�日下載次數"
 
-#: views/statistics/addon.thtml:93
+#: views/statistics/addon.thtml:107
 msgid "statistics_plot_options_zoomin_alt"
 msgstr "放大"
 
-#: views/statistics/addon.thtml:92
+#: views/statistics/addon.thtml:106
 msgid "statistics_plot_options_zoomin_title"
 msgstr "放大到一個月"
 
-#: views/statistics/addon.thtml:96
+#: views/statistics/addon.thtml:110
 msgid "statistics_plot_options_zoomout_alt"
 msgstr "縮�"
 
-#: views/statistics/addon.thtml:95
+#: views/statistics/addon.thtml:109
 msgid "statistics_plot_options_zoomout_title"
 msgstr "縮�到一個月"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "%1$s 的�日統計資訊摘�"
 
-#: views/statistics/addon.thtml:200
+#: views/statistics/addon.thtml:214
 msgid "statistics_rss_icon_title"
 msgstr "摘�資料的 RSS 消�來�"
 
@@ -4106,23 +6214,23 @@ msgstr "公開"
 msgid "statistics_settings_access_public_description"
 msgstr "任何人都�以看到統計資訊"
 
-#: views/statistics/addon.thtml:239
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "變更設定"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "請將此資訊視為機密資料。"
 
-#: views/statistics/addon.thtml:233
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "顯示�目�設為 <b>�人</b>。"
 
-#: views/statistics/addon.thtml:229
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "顯示�目�設為 <b>公開</b>。"
 
-#: views/statistics/addon.thtml:234
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "已上鎖"
 
@@ -4139,7 +6247,7 @@ msgstr "儲存設定"
 msgid "statistics_settings_title"
 msgstr "%1$s 的統計資訊顯示�設定"
 
-#: views/statistics/addon.thtml:230
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "已解鎖"
 
@@ -4163,7 +6271,7 @@ msgstr "未知"
 msgid "statistics_shortnames_version"
 msgstr "版本"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "�日平�下載數"
 
@@ -4171,37 +6279,37 @@ msgstr "�日平�下載數"
 msgid "statistics_summary_downloads_heading"
 msgstr "下載"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: 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:197
+#: 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:137
+#: 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:138
+#: 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:149 views/statistics/addon.thtml:169
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "尚無資料"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: 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:163
+#: 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:167
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s æ–¼ %2$s"
@@ -4210,17 +6318,17 @@ msgstr "%1$s æ–¼ %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "�日有效使用者"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: 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:147
+#: 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:257
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s 統計資訊"
@@ -4246,6 +6354,7 @@ 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:49
 msgid "user_del_account_deleted"
 msgstr ""
@@ -4265,6 +6374,7 @@ 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:62
 msgid "user_del_error_addons"
 msgstr ""
@@ -4273,6 +6383,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:69
 msgid "user_del_error_addons_more_questions"
 msgstr "如果您有其他，請�絡 %1$s 尋求�助。"
@@ -4286,6 +6397,7 @@ 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:83
 msgid "user_del_error_unknown"
 msgstr ""
@@ -4297,6 +6409,7 @@ 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:93
 msgid "user_del_header_delete_account"
 msgstr "刪除使用者帳號 %1$s"
@@ -4318,6 +6431,7 @@ 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:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -4333,6 +6447,7 @@ msgid "user_deleted_nickname"
 msgstr "刪除使用者帳號"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -4347,6 +6462,9 @@ 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
 #: views/users/email/confirm_plain.thtml:6
 #, php-format
 msgid "user_email_confirm_account_nopass"
@@ -4365,6 +6483,7 @@ msgstr ""
 "-- %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:6
 #: views/users/email/emailchange_plain.thtml:8
 #, php-format
@@ -4390,6 +6509,8 @@ 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
 #, php-format
 msgid "user_email_pwreset"
@@ -4416,6 +6537,7 @@ msgid "user_emailchange_error"
 msgstr "錯誤�"
 
 # %1 is the application name
+#. %1 is the application name
 #: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
@@ -4426,6 +6548,7 @@ msgid "user_emailchange_success"
 msgstr "�功�"
 
 # %1 is the new email address
+#. %1 is the new email address
 #: views/users/emailchange.thtml:52
 #, php-format
 msgid "user_emailchange_successful_description"
@@ -4590,6 +6713,7 @@ 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"
@@ -4598,6 +6722,7 @@ msgstr ""
 "按下該��以啟動帳號。"
 
 # %1 is the user's email address
+#. %1 is the user's email address
 #: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
@@ -4614,6 +6739,7 @@ msgid "user_register_congratulations"
 msgstr "�喜您�您的使用者帳號已�功建立。"
 
 # %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"
@@ -4622,6 +6748,7 @@ msgstr ""
 "如果您需�的話，�以%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:52
 #, php-format
 msgid "user_register_welcome"
@@ -4682,10 +6809,10 @@ msgid "users_info_pagetitle"
 msgstr "%1$s 的使用者資訊"
 
 # %1 is the user's name
+#. %1 is the user's name
 #: views/users/info.thtml:110
-#, fuzzy
 msgid "users_info_reviews_by_user"
-msgstr "Reviews by %s"
+msgstr "%s 撰寫的�見"
 
 #: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
@@ -4693,6 +6820,8 @@ 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
 #, php-format
 msgid "users_login_sandbox_display_warning"
@@ -4702,6 +6831,8 @@ msgstr ""
 
 # %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
 #, php-format
 msgid "users_login_sandbox_page_warning"
@@ -4716,3 +6847,34 @@ msgstr "使用者密碼�設"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "新使用者註冊"
+
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "此元件最新版本相容於"
+
+#, fuzzy
+#~ msgid "addons_share_button_text"
+#~ msgstr "Share this"
+
+#, fuzzy
+#~ msgid "addons_share_label_delicious"
+#~ msgstr "Add to Delicious"
+
+#, fuzzy
+#~ msgid "addons_share_label_digg"
+#~ msgstr "Digg this!"
+
+#, fuzzy
+#~ msgid "addons_share_label_facebook"
+#~ msgstr "Post to Facebook"
+
+#, fuzzy
+#~ msgid "addons_share_label_friendfeed"
+#~ msgstr "Share on FriendFeed"
+
+#, fuzzy
+#~ msgid "addons_share_label_myspace"
+#~ msgstr "Post to MySpace"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
diff --git a/site/app/models/addon.php b/site/app/models/addon.php
index b7a6418..aaa09c9 100644
--- a/site/app/models/addon.php
+++ b/site/app/models/addon.php
@@ -388,7 +388,7 @@ class Addon extends AppModel
                 $orderby .= 'datestatuschanged';
                 break;
             case 'rated':
-                $orderby .= 'Addon.averagerating';
+                $orderby .= 'Addon.bayesianrating';
                 break;
             case 'newest':
                 $orderby .= 'Addon.created';
diff --git a/site/app/models/editor_subscription.php b/site/app/models/editor_subscription.php
new file mode 100644
index 0000000..76dbe2f
--- /dev/null
+++ b/site/app/models/editor_subscription.php
@@ -0,0 +1,94 @@
+<?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
+ * Frederic Wenzel <fwenzel@mozilla.com>
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
+
+class EditorSubscription extends AppModel
+{
+    var $name = 'EditorSubscription';
+    var $useTable = 'editor_subscriptions';
+    var $belongsTo = array('Addon', 'User');
+
+    var $recursive = -1;
+    
+    /**
+     * Sign editor up for an email the next time an add-on is updated.
+     * @param int $userid User's ID to be signed up for the next update
+     * @param int $addonid Addon's ID to subscribe the user to
+     * @return void
+     */
+    function subscribeToUpdates($userid, $addonid) {
+        $this->query("
+            INSERT INTO editor_subscriptions
+            SET
+                user_id = '{$userid}',
+                addon_id = '{$addonid}';");
+    }
+    
+    /**
+     * Do not notify editor the next time an add-on is updated.
+     * @param int $userid User's ID to be signed up for the next update
+     * @param int $addonid Addon's ID to subscribe the user to
+     * @return void
+     */
+    function cancelUpdates($userid, $addonid) {
+        $this->query("
+            DELETE FROM editor_subscriptions
+            WHERE
+                user_id = '{$userid}' AND
+                addon_id = '{$addonid}';");
+    }
+    
+    /**
+     * get list of subscribers for a given add-on
+     * @param int $addonid ID of the add-on whose subscribers are required
+     * @return array user IDs for all subscribers of the add-on
+     */
+    function getSubscribers($addonid) {
+        $_result = $this->query("
+            SELECT user_id
+            FROM editor_subscriptions
+            WHERE addon_id = '{$addonid};'");
+        if (empty($_result)) return array();
+        
+        $_ids = array();
+        foreach ($_result as &$_id) {
+            $_ids[] = $_id['editor_subscriptions']['user_id'];
+        }
+        
+        return $_ids;
+    }
+}
+?>
diff --git a/site/app/models/review.php b/site/app/models/review.php
index 8c53304..96ad236 100644
--- a/site/app/models/review.php
+++ b/site/app/models/review.php
@@ -231,6 +231,78 @@ class Review extends AppModel
         }
         return $results;
     }
+    
+    /**
+     * Update the bayesian rating (cf. bug 477343) for a single (or multiple) add-on(s).
+     * Also updates average rating and total review count.
+     *
+     * Note that similar code exists in the reviews/ratings sections of bin/maintenance.php
+     *
+     * @param array addonids add-on IDs whose bayesian ratings to update.
+     * @return boolean success
+     */
+    function updateBayesianRating($addonids = array()) {
+        if (empty($addonids)) return false;
+        
+        // get average review count and average rating
+        $rows = $this->query("
+            SELECT AVG(a.cnt) AS avg_cnt 
+            FROM (
+                SELECT COUNT(*) AS cnt
+                FROM reviews AS r
+                INNER JOIN versions AS v ON (r.version_id = v.id)
+                WHERE reply_to IS NULL
+                    AND rating > 0
+                GROUP BY v.addon_id
+                ) AS a
+        ");
+        $avg_num_votes = $rows[0][0]['avg_cnt'];
+        
+        $rows = $this->query("
+            SELECT AVG(a.addon_rating) AS avg_rating 
+            FROM (
+                SELECT AVG(rating) AS addon_rating
+                FROM reviews AS r
+                INNER JOIN versions AS v ON (r.version_id = v.id)
+                WHERE reply_to IS NULL
+                    AND rating > 0
+                GROUP BY v.addon_id
+                ) AS a
+        ");
+        $avg_rating = $rows[0][0]['avg_rating'];
+        
+        // update total review count and average rating
+        $this->query("
+            UPDATE addons AS a
+            INNER JOIN (
+                SELECT
+                    versions.addon_id as addon_id,
+                    COUNT(*) as count,
+                    AVG(rating) as avg_rating
+                FROM reviews 
+                INNER JOIN versions ON reviews.version_id = versions.id 
+                WHERE reviews.reply_to IS NULL
+                    AND versions.addon_id IN (".(implode(',',$addonids)).")
+                    AND reviews.rating > 0
+                GROUP BY versions.addon_id 
+            ) AS c ON (a.id = c.addon_id)
+            SET a.totalreviews = c.count,
+            a.averagerating = ROUND(c.avg_rating, 2)
+            WHERE a.id IN (".(implode(',',$addonids)).")
+        ");
+        
+        // calculate and store bayesian rating
+        $this->query("
+            UPDATE addons AS a
+            SET a.bayesianrating =
+                IF (a.totalreviews > 0, (
+                    ( ({$avg_num_votes} * {$avg_rating}) + (a.totalreviews * a.averagerating) ) /
+                    ({$avg_num_votes} + a.totalreviews)
+                ), 0)
+            WHERE a.id IN (".(implode(',',$addonids)).")
+        ");
+        return true;
+    }
 
 }
 ?>
diff --git a/site/app/tests/controllers/users_controller.test.php b/site/app/tests/controllers/users_controller.test.php
index a28daf5..c81ebb6 100644
--- a/site/app/tests/controllers/users_controller.test.php
+++ b/site/app/tests/controllers/users_controller.test.php
@@ -73,7 +73,13 @@ class UsersTest extends UnitTestCase {
         $this->controller = $this->helper->getController('Users', $this);
         $this->helper->mockComponents($this->controller, $this);
         $this->controller->User->cacheQueries = false; // important! Otherwise cake doesn't realize when we changed the user data.
-        $this->controller->User->caching = false; // improtant! Otherwise memcache will break stuff.
+        $this->controller->User->caching = false; // important! Otherwise memcache will break stuff.
+
+        // Prevent exceptions in other parts of the world.
+        $this->controller->Amo->setReturnValue('getApplicationVersions',
+                                               array(1 =>  array(1.5, 2.0, 3.0),
+                                                     18 => array(1.5, 2.0, 3.0)));
+        $this->controller->params['url'] = array();
     }
 
     /**
diff --git a/site/app/tests/languageConfig.test.php b/site/app/tests/languageConfig.test.php
index a9d87c1..56fe679 100644
--- a/site/app/tests/languageConfig.test.php
+++ b/site/app/tests/languageConfig.test.php
@@ -100,6 +100,22 @@ class LanguageConfigTest extends WebTestHelper {
     }
 
     /**
+     * Our msgids should conform to the AMO L10n standards. Details at
+     * https://wiki.mozilla.org/Update:Remora_Localization#L10n_standards
+     *
+     * We'll only check en-US here, but the others are built off en-US so it should be a good indicator.
+     */
+    function testLangFileIsValid() {
+        $_language_file = "{$this->language_config->text_domain}/en_US/LC_MESSAGES/messages.po";
+
+        $_language_file_contents = file_get_contents($_language_file);
+
+        // If this test fails there is a string with spaces in it which is most likely an English string or 
+        // sentence.  This should be fixed before merging en-US -> all locales
+        $this->assertEqual(preg_match('/^msgid\ ".*?\ .*?"$/m', $_language_file_contents), 0);
+    }
+
+    /**
      * Checks and makes sure index pages will load with all valid languages
      */
     function testLocalizedPagesLoad()
diff --git a/site/app/tests/services/update.test.php b/site/app/tests/services/update.test.php
index 5209233..edd3957 100644
--- a/site/app/tests/services/update.test.php
+++ b/site/app/tests/services/update.test.php
@@ -60,7 +60,7 @@
 // Require update function file.
 require_once(APP.'webroot/services/functions.php');
 
-class UpdateServiceTest extends WebTestCase {
+class UpdateServiceTest extends WebTestHelper {
 	
     var $_args;
     var $_noUpdatesXml;
@@ -105,24 +105,13 @@ NoUpdateXml;
 	}
 
     /**
-     * Build an update URI based on _args.
-     * @param array $args update URI arguments
-     * @return string resulting URI
-     */
-    function _buildUpdateUri($args=array()) {
-        $_buf = array();
-        foreach ($args as $key=>$val) {
-            $_buf[] = $key.'='.$val;
-        }
-        return SERVICE_URL.'/update.php?test=1&'.implode('&',$_buf);
-    }
-
-    /**
      * Retrieve XML document based on _args.
      * @param array $args update URI arguments
      * @return string resulting XML document as a string
      */
     function _getXml($args=array()) {
+        // Use the test db.
+        $args['test'] = 1;
         return $this->get(SERVICE_URL.'/update.php',$args);
     }
 
diff --git a/site/app/tests/test_helper_unit.php b/site/app/tests/test_helper_unit.php
index 49903a5..f88f691 100644
--- a/site/app/tests/test_helper_unit.php
+++ b/site/app/tests/test_helper_unit.php
@@ -193,7 +193,7 @@ class UnitTestHelper
          * Since there is nothing we can do to prevent those, we are going to filter them
          * out and add the $realErrors back into the queue later on.
          */
-        $queue = &SimpleErrorQueue::instance();        
+        $queue = &SimpleTest::getContext()->get('SimpleErrorQueue');
         $realErrors = array();
        
         while ($error = $queue->extract())
diff --git a/site/app/tests/test_helper_web.php b/site/app/tests/test_helper_web.php
index 9b2211e..9791a71 100644
--- a/site/app/tests/test_helper_web.php
+++ b/site/app/tests/test_helper_web.php
@@ -1,6 +1,13 @@
 <?php
 
 class WebTestHelper extends WebTestCase {
+
+    function before($method) {
+        // The test browser is created in parent::before.
+        parent::before($method);
+        $this->addHeader('X-Amo-Test: damn right');
+    }
+
     /* Compute protocol and hostname prefix, no trailing slash. */
     function hostPrefix() {
         $http = (!empty($_SERVER["HTTP_MOZ_REQ_METHOD"]) && $_SERVER["HTTP_MOZ_REQ_METHOD"] == 'HTTPS') ? 'https://' : 'http://';
@@ -8,6 +15,15 @@ class WebTestHelper extends WebTestCase {
         return $uriBase;
     }
 
+    /**
+     * The default SimpleBrowser tries to parse all responses, even when
+     * they're not HTML.  That fails.  We need a better browser.
+     */
+    function &createBrowser() {
+        $browser =& new BetterBrowser();
+        return $browser;
+    }
+
     /* Compute the URI for the given action, accounting for us possibly not
      * being at the root of the web space.
      */
@@ -84,4 +100,20 @@ class WebTestHelper extends WebTestCase {
     }
 }
 
+class BetterBrowser extends SimpleBrowser {
+
+    /**
+     * Overrides _buildPage to only parse responses when the Content Type
+     * looks like HTML.
+     */
+    function &_buildPage($response) {
+        $headers = $response->getHeaders()->getRaw();
+        if (preg_match('#^Content-Type: (text/html|application/xhtml+xml)#m', $headers)) {
+            $page =& parent::_buildPage($response);
+        } else {
+            $page =& new SimplePage($response);
+        }
+        return $page;
+    }
+}
 ?>
diff --git a/site/app/tests/test_manager.php b/site/app/tests/test_manager.php
index aca4703..01428ef 100644
--- a/site/app/tests/test_manager.php
+++ b/site/app/tests/test_manager.php
@@ -42,18 +42,12 @@
  * @subpackage tests.lib
  * @since      CakePHP Test Suite v 1.0.0.0
  */
+
+DATABASE_CONFIG::useTestConfig();
+
 class TestManager {
 	var $_testExtension = array('.test.php', '.test.thtml', '.test.thtml.php');
 
-	function TestManager() {
-	    /* @TODO: implement this so the tests consistently use the test db, including web tests
-	    ConnectionManager::loadDataSource("test");
-	    $dataSourceTest =& ConnectionManager::getDataSource("test");
-	    $dataSourceDefault =& ConnectionManager::getDataSource("default");
-	    $dataSourceDefault = $dataSourceTest;
-	    */
-	}
-
 	function runAllTests(&$reporter) {
 		$manager =& new TestManager();
 
diff --git a/site/app/views/addons/browse.thtml b/site/app/views/addons/browse.thtml
index 0fd3b23..7c7dc29 100644
--- a/site/app/views/addons/browse.thtml
+++ b/site/app/views/addons/browse.thtml
@@ -43,7 +43,7 @@
 <div id="content" class="category">
 
 <?php
-if (!empty($type))
+if (!empty($type) && array_key_exists('Tag', $this_tag))
     echo $this->renderElement('search', array('category' => 
         array($type, $this_tag['Tag']['id'])));
 else
@@ -78,7 +78,7 @@ foreach ($addons as $val) {
 </div><!-- /#content-main -->
 
 <?php
-if (!empty($type))
+if (!empty($type) && array_key_exists('Tag', $this_tag))
     echo $this->renderElement('sidebar', array('highlight' => 
         array($type, $this_tag['Tag']['id'])));
 else
diff --git a/site/app/views/addons/display.thtml b/site/app/views/addons/display.thtml
index c06b389..8a110f2 100644
--- a/site/app/views/addons/display.thtml
+++ b/site/app/views/addons/display.thtml
@@ -96,6 +96,30 @@ if (in_array($addon['Addon']['status'], $experimental_status)) {
     <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="<?php echo $_SERVER['REQUEST_URI'] . '/share?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
@@ -453,7 +477,10 @@ if (in_array($addon['Addon']['status'], $experimental_status)) {
 
 </div>
 <script type="text/javascript" charset="utf-8">
-    $(function(){ $('.stars').rating(<?php if(!$loggedIn) { ?> {readOnly:true}<?php } ?>); });
+    $(function(){ 
+        $('.stars').rating(<?php if(!$loggedIn) { ?> {readOnly:true}<?php } ?>); 
+        $('.rollover-reveal').rolloverReveal();
+    });
 </script>
 <!-- /#content -->
 
diff --git a/site/app/views/addons/share.thtml b/site/app/views/addons/share.thtml
new file mode 100644
index 0000000..9cfad8d
--- /dev/null
+++ b/site/app/views/addons/share.thtml
@@ -0,0 +1,24 @@
+<?php
+
+        $url = FULL_BASE_URL . $html->url("/addon/{$addon_id}");
+
+        $description = $html->truncateChars(250, $description);
+
+        $title = $share_title;
+
+        // Grab the URL template for the link sharing service and fill in the 
+        // placeholders with the strings composed above.
+        $link_data = compact('url', 'title', 'description');
+        foreach ($link_data as $name => $value) {
+            $service_url = str_replace(
+                '{'.strtoupper($name).'}', 
+                rawurlencode($value), 
+                $service_url
+            );
+        }
+
+        // Finally, bounce the user off to the populated sharing URL.
+        header('HTTP/1.1 302 Found');
+        header('Location: ' . $service_url);
+        exit;
+?>
diff --git a/site/app/views/addons/versions.thtml b/site/app/views/addons/versions.thtml
index 15e21eb..7a0c7ae 100644
--- a/site/app/views/addons/versions.thtml
+++ b/site/app/views/addons/versions.thtml
@@ -115,17 +115,8 @@ foreach ($versions as $version):
     </div>
 </div>
 <script type="text/javascript">
-    <?php
-        /*  @partial 5/10/08
-            if get the most recent version of Add-on Name text doesn't exist print Firefox and version number only
-        */
-        $latest_text = " ".APP_PRETTYNAME;
-        if (_('addon_versions_getlatesttext') != 'addon_versions_getlatesttext') {
-            $latest_text = _('addon_versions_getlatesttext').$latest_text;
-        }
-    ?>
-
+    <?php $latest_text = ___('addon_versions_getlatestversion', 'The most recent version compatible with %1$s (%2$s)'); ?>
     setTimeout(function() { 
-        if(gLatestVersionID != null) createLatestVersionElement("<?=$latest_text ?>");
+        if(gLatestVersionID != null) createLatestVersionElement("<?=$latest_text ?>", "<?=APP_PRETTYNAME?>");
     }, 0);
 </script>
diff --git a/site/app/views/admin/groups_edit.thtml b/site/app/views/admin/groups_edit.thtml
index fc504fe..7e8c6a6 100644
--- a/site/app/views/admin/groups_edit.thtml
+++ b/site/app/views/admin/groups_edit.thtml
@@ -58,7 +58,7 @@
             </div>
             <div class="buttonBox">
                 <?=$html->submit('Update Group')?>
-                <?=$html->submit('Delete Group', array('name' => 'delete', 'class' => 'cancel', 'onClick' => 'return confirm(\''._('Are you SURE you wish to delete this group? Please cancel. :(').'\');'))?>
+                <?=$html->submit('Delete Group', array('name' => 'delete', 'class' => 'cancel', 'onClick' => 'return confirm(\'Are you SURE you wish to delete this group? Please cancel. :(\');'))?>
             </div>
         </div>
         </form>
diff --git a/site/app/views/admin/platforms_edit.thtml b/site/app/views/admin/platforms_edit.thtml
index 279d887..e38ca2b 100644
--- a/site/app/views/admin/platforms_edit.thtml
+++ b/site/app/views/admin/platforms_edit.thtml
@@ -50,7 +50,7 @@
             <?=$this->renderElement('developers/localebox')?>
             <div class="buttonBox">
                 <?=$html->submit('Update Platform')?>
-                <?=$html->submit('Delete Platform', array('name' => 'delete', 'class' => 'cancel', 'onClick' => 'return confirm(\''._('Are you SURE you wish to delete this platform?').'\');'))?>
+                <?=$html->submit('Delete Platform', array('name' => 'delete', 'class' => 'cancel', 'onClick' => 'return confirm(\'Are you SURE you wish to delete this platform?\');'))?>
             </div>
         </div>
         </form>
diff --git a/site/app/views/admin/responses_edit.thtml b/site/app/views/admin/responses_edit.thtml
index dd0d2c3..b9a152f 100644
--- a/site/app/views/admin/responses_edit.thtml
+++ b/site/app/views/admin/responses_edit.thtml
@@ -50,7 +50,7 @@
             <?=$this->renderElement('developers/localebox')?>
             <div class="buttonBox">
                 <?=$html->submit('Edit Response')?>
-                <?=$html->submit('Delete Response', array('name' => 'delete', 'class' => 'cancel', 'onClick' => 'return confirm(\''._('Are you SURE you wish to delete this response?').'\');'))?>
+                <?=$html->submit('Delete Response', array('name' => 'delete', 'class' => 'cancel', 'onClick' => 'return confirm(\'Are you SURE you wish to delete this response?\');'))?>
             </div>
         </div>
         </form>
diff --git a/site/app/views/admin/tags_edit.thtml b/site/app/views/admin/tags_edit.thtml
index 8af0138..e252282 100644
--- a/site/app/views/admin/tags_edit.thtml
+++ b/site/app/views/admin/tags_edit.thtml
@@ -62,7 +62,7 @@
             <?=$this->renderElement('developers/localebox')?>
             <div class="buttonBox">
                 <?=$html->submit('Update Category')?>
-                <?=$html->submit('Delete Category', array('name' => 'delete', 'class' => 'cancel', 'onClick' => 'return confirm(\''._('Are you SURE you wish to delete this category?').'\');'))?>
+                <?=$html->submit('Delete Category', array('name' => 'delete', 'class' => 'cancel', 'onClick' => 'return confirm(\'Are you SURE you wish to delete this category?\');'))?>
             </div>
         </div>
         </form>
diff --git a/site/app/views/api/api_addon.thtml b/site/app/views/api/api_addon.thtml
index ab736fb..077f91b 100644
--- a/site/app/views/api/api_addon.thtml
+++ b/site/app/views/api/api_addon.thtml
@@ -147,7 +147,7 @@
           }?>
     </reviews>
 */ ?>
-    <learnmore><?php echo $amo.'/addon/'.$addon['Addon']['id']; ?></learnmore>
+    <learnmore><?php echo $amo.'/addon/'.$addon['Addon']['id']; ?>?src=api</learnmore>
 <?php if ($api_version > 0 ) { 
          foreach($addon['fileinfo'] as $file) {?>
              <install hash='<?php echo $file['File']['hash'];?>'
@@ -156,7 +156,7 @@
                    .$file['File']['filename']; ?></install>          
          <?php } 
       } else { ?>
-    <install hash='<?php echo $addon['File']['hash'];?>'><?php echo $amo.'/downloads/file/'.$addon['File']['id'].'/'.$addon['File']['filename']; ?></install>
+    <install hash='<?php echo $addon['File']['hash'];?>'><?php echo $amo.'/downloads/file/'.$addon['File']['id'].'/'.$addon['File']['filename']; ?>?src=api</install>
 <?php
 } ?>
 <?php 
diff --git a/site/app/views/compatibility/dashboard.thtml b/site/app/views/compatibility/dashboard.thtml
index dc4623e..1792e93 100644
--- a/site/app/views/compatibility/dashboard.thtml
+++ b/site/app/views/compatibility/dashboard.thtml
@@ -55,10 +55,10 @@
         <div id="report-intro">
         <?php
         $percentages = array(
-            COMPAT_OTHER => (($totals[$version][COMPAT_OTHER]['adu'] / $totals['adu95']) * 100),
-            COMPAT_ALPHA => (($totals[$version][COMPAT_ALPHA]['adu'] / $totals['adu95']) * 100),
-            COMPAT_BETA => (($totals[$version][COMPAT_BETA]['adu'] / $totals['adu95']) * 100),
-            COMPAT_LATEST => (($totals[$version][COMPAT_LATEST]['adu'] / $totals['adu95']) * 100),
+            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">
@@ -101,7 +101,7 @@
         <div id="report-details">
             <div class="header">
                 <div class="title">
-                    <?=$html->image('wordmarks/firefox-'.$version.'_small.png')?><?=___('compatibility_dashboard_report', 'Add-on Compatibility Report')?>
+                    <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('compatibility_dashboard_report', 'Add-on Compatibility Report')?>
                 </div>
             </div>
             <div class="loading"><?=___('compatibility_dashboard_loading', 'Loading data...')?></div>
@@ -111,7 +111,7 @@
         <div id="developers-intro">
             <div class="header">
                 <div class="title">
-                    <?=$html->image('wordmarks/firefox-'.$version.'_small.png')?><?=___('compatibility_developer_info', 'Information for Activity Developers')?>
+                    <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('compatibility_developer_info', 'Information for Add-on Developers')?>
                 </div>
             </div>
             <br />
@@ -134,7 +134,7 @@
         <div id="developers-details">
             <div class="header">
                 <div class="title">
-                    <?=$html->image('wordmarks/firefox-'.$version.'_small.png')?><?=___('compatibility_developers_results', 'Add-on Status Check Results')?>
+                    <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('compatibility_developers_results', 'Add-on Status Check Results')?>
                 </div>
             </div>
             
@@ -145,7 +145,11 @@
         <div id="users-intro">
             <div class="header">
                 <div class="title">
+<<<<<<< HEAD:site/app/views/compatibility/dashboard.thtml
                     <?=$html->image('wordmarks/firefox-'.$version.'_small.png')?><?=___('compatibility_user_info', 'Information for Activity Users')?>
+=======
+                    <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('compatibility_user_info', 'Information for Add-on Users')?>
+>>>>>>> svn:site/app/views/compatibility/dashboard.thtml
                 </div>
             </div>
             <br />
@@ -158,7 +162,6 @@
                     $html->url('/'),
                     APP_PRETTYNAME
                 ))?>
-</div>
         </div>
     </div>
 </div>
diff --git a/site/app/views/compatibility/report.thtml b/site/app/views/compatibility/report.thtml
index a747674..c97f37d 100644
--- a/site/app/views/compatibility/report.thtml
+++ b/site/app/views/compatibility/report.thtml
@@ -48,7 +48,7 @@ if ($format != 'ajax'):
         $bar_current_width = 0;
         $i = 0;
         foreach ($addons as $addon) {
-            $class = $addon['classification'][$version];
+            $class = $addon['classification'];
             
             echo '<tr'.($i > 5000 ? ' style="display: none;"' : '').'>';
             echo '<td class="name"><a href="'.$html->url('/addon/'.$addon['id']).'" target="_blank">'.$addon['name'].'</a></td>';
diff --git a/site/app/views/developers/addon_edit.thtml b/site/app/views/developers/addon_edit.thtml
index 1d15fb3..5e0d147 100644
--- a/site/app/views/developers/addon_edit.thtml
+++ b/site/app/views/developers/addon_edit.thtml
@@ -40,17 +40,17 @@
     <?=$this->renderElement('developers/sidebar', array('addons' => $all_addons, 'extra' => 'developers/editbox'));?>
 
     <div id="content-main">
-        <?=$this->renderElement('developers/addonheader', array('title' => "Edit {$addon_name}", 'addon_id' => $addon_id));?>
+        <?=$this->renderElement('developers/addonheader', array('title' => sprintf(___('devcp_title_edit_addon'), $addon_name), 'addon_id' => $addon_id));?>
         
         <dl id="edit-listing" class="actionbar">
-            <dt class="edit-authors"><?=$html->link('Manage Activity Authors', "/developers/addon/edit/{$addon_id}/authors")?></dt>
-            <dd>Add or remove users that can manage this activity.</dd>
-            <dt class="edit-categories"><?=$html->link('Manage Activity Categories', "/developers/addon/edit/{$addon_id}/categories")?></dt>
-            <dd>Select the relevant categories for your activity.</dd>
-            <dt class="edit-descriptions"><?=$html->link('Edit Activity Descriptions', "/developers/addon/edit/{$addon_id}/descriptions")?></dt>
-            <dd>Add and modify translations for your activity's summary, description, end-user license, and privacy policy.</dd>
-            <dt class="edit-properties"><?=$html->link('Edit Activity Properties', "/developers/addon/edit/{$addon_id}/properties")?></dt>
-            <dd>Change your activies's name, homepage, icon, and other flags.</dd>
+            <dt class="edit-authors"><?=$html->link(___('devcp_edit_dt_manage_authors'), "/developers/addon/edit/{$addon_id}/authors")?></dt>
+            <dd><?=___('devcp_edit_dd_manage_authors')?></dd>
+            <dt class="edit-categories"><?=$html->link(___('devcp_edit_dt_manage_categories'), "/developers/addon/edit/{$addon_id}/categories")?></dt>
+            <dd><?=___('devcp_edit_dd_manage_categories')?></dd>
+            <dt class="edit-descriptions"><?=$html->link(___('devcp_edit_dt_manage_descriptions'), "/developers/addon/edit/{$addon_id}/descriptions")?></dt>
+            <dd><?=___('devcp_edit_dd_manage_description')?></dd>
+            <dt class="edit-properties"><?=$html->link(___('devcp_edit_dt_manage_properties'), "/developers/addon/edit/{$addon_id}/properties")?></dt>
+            <dd><?=___('devcp_edit_dd_manage_properties')?></dd>
         </dl>
         
     </div>
diff --git a/site/app/views/developers/addon_edit_authors.thtml b/site/app/views/developers/addon_edit_authors.thtml
index a86dffc..dcfb3f3 100644
--- a/site/app/views/developers/addon_edit_authors.thtml
+++ b/site/app/views/developers/addon_edit_authors.thtml
@@ -40,13 +40,13 @@
     <?=$this->renderElement('developers/sidebar', array('addons' => $all_addons, 'extra' => 'developers/editbox'));?>
 
     <div id="content-main" class="<?=($author_role >= AUTHOR_ROLE_OWNER ? 'privs' : 'no-privs')?>">
-        <?=$this->renderElement('developers/addonheader', array('title' => "Edit {$addon_name}", 'addon_id' => $addon_id));?>
+        <?=$this->renderElement('developers/addonheader', array('title' => sprintf(___('devcp_title_edit_addon'), $addon_name), 'addon_id' => $addon_id));?>
         <?php
             if (!empty($success)) {
-                echo '<div class="notice-success rounded"><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.</div>';
+                echo '<div class="notice-success rounded">'.___('devcp_notice_changes_saved').'</div>';
             }
         ?>
-        <h2>Manage Add-on Authors</h2>
+        <h2><?=___('devcp_edit_authors_header_manage')?></h2>
         
         <?=$this->renderElement('noscript')?>
         <?=$this->renderElement('developers/rolecheck')?>
@@ -54,46 +54,46 @@
         <?=$html->hiddenSession();?>
         
         <div class="graybox field rounded spaced">
-            <h4>Current Authors</h4>
+            <h4><?=___('devcp_edit_authors_header_current')?></h4>
             <table id="author-table" class="pretty-table">
                 <thead><tr>
                     <th></th>
-                    <th>Author</th>
-                    <th>Role</th>
-                    <th>Listed</th>
+                    <th><?=___('devcp_edit_authors_th_author')?></th>
+                    <th><?=___('devcp_edit_authors_th_role')?></th>
+                    <th><?=___('devcp_edit_authors_th_listed')?></th>
                     <th></th>
                 </tr></thead>
                 <tbody></tbody>
             </table>
             <div class="save-changes rounded">
-                <strong>You have unsaved changes.</strong> Click the Update Authors button below to 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">Add New Author</a></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 class="action-button-container centered"><a href="#" onclick="addon_edit_authors.save(); return false;" class="action-button rounded">Update Authors</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;">
-            <h4>Add New Author</h4>
+            <h4><?=___('devcp_edit_authors_add_author')?></h4>
             <br />
-            <p><label>Author Account Email: <input id="add-email" type="text" size="40" /></label></p>
+            <p><label><?=___('devcp_edit_authors_add_email')?> <input id="add-email" type="text" size="40" /></label></p>
             <div id="add-error" class="rounded"></div>
             
-            <p>Select a role for the author:</p>
+            <p><?=___('devcp_edit_authors_select_role')?></p>
             <ul>
-                <li><label><input id="add-role-owner" type="radio" name="role" checked="checked" />&nbsp;<strong>Owner</strong> - Can manage all aspects of the add-on listing, including adding and removing other authors.</label></li>
-                <li><label><input id="add-role-developer" type="radio" name="role" />&nbsp;<strong>Developer</strong> - Can manage all aspects of the add-on listing, except for adding and removing other authors.</label></li>
-                <li><label><input id="add-role-viewer" type="radio" name="role" />&nbsp;<strong>Viewer</strong> - Can view add-on developer listing and statistics, but can't make any changes.</label></li>
+                <li><label><input id="add-role-owner" type="radio" name="role" checked="checked" />&nbsp;</strong><?=___('devcp_edit_authors_label_owner')?></label></li>
+                <li><label><input id="add-role-developer" type="radio" name="role" />&nbsp;</strong><?=___('devcp_edit_authors_label_developer')?></label></li>
+                <li><label><input id="add-role-viewer" type="radio" name="role" />&nbsp;</strong><?=___('devcp_edit_authors_label_viewer')?></label></li>
             </ul>
             
-            <p><label><input id="add-listed" type="checkbox" checked="checked" />&nbsp;List as author in public display pages</label></p>
+            <p><label><input id="add-listed" type="checkbox" checked="checked" />&nbsp;<?=___('devcp_edit_authors_label_add_listed')?></label></p>
             
             <table><tr><td>
-                <div id="add-author-button" class="add-button-container"><a href="#author-table" onclick="return addon_edit_authors.checkAddForm();" class="add-button rounded bigger">Add Author</a></div>
+                <div id="add-author-button" class="add-button-container"><a href="#author-table" onclick="return addon_edit_authors.checkAddForm();" class="add-button rounded bigger"><?=___('devcp_edit_authors_add_author_button')?></a></div>
             </td><td valign="middle">
-                <div id="add-loading"><?=$html->image('ajax_loading.gif', array('alt' => 'Loading'))?>&nbsp;Checking account email...</div>
+                <div id="add-loading"><?=$html->image('ajax_loading.gif', array('alt' => 'Loading'))?>&nbsp;<?=___('devcp_edit_authors_add_loading')?></div>
             </td></tr></table>
         </div>
     </div>
@@ -113,4 +113,4 @@ $(document).ready(function() {
 ?>
 
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/site/app/views/developers/addon_edit_categories.thtml b/site/app/views/developers/addon_edit_categories.thtml
index e9ab173..20e5e22 100644
--- a/site/app/views/developers/addon_edit_categories.thtml
+++ b/site/app/views/developers/addon_edit_categories.thtml
@@ -40,13 +40,13 @@
     <?=$this->renderElement('developers/sidebar', array('addons' => $all_addons, 'extra' => 'developers/editbox'));?>
 
     <div id="content-main" class="<?=($author_role >= AUTHOR_ROLE_DEV ? 'privs' : 'no-privs')?>">
-        <?=$this->renderElement('developers/addonheader', array('title' => "Edit {$addon_name}", 'addon_id' => $addon_id));?>
+        <?=$this->renderElement('developers/addonheader', array('title' => sprintf(___('devcp_title_edit_addon'), $addon_name), 'addon_id' => $addon_id));?>
         <?php
         if (!empty($success)) {
-            echo '<div class="notice-success rounded"><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.</div>';
+            echo '<div class="notice-success rounded">'.___('devcp_notice_changes_saved').'</div>';
         }
         ?>
-        <h2>Manage Add-on Categories</h2>
+        <h2><?=___('devcp_edit_categories_header_manage')?></h2>
         <?=$this->renderElement('noscript')?>
         <?=$this->renderElement('developers/rolecheck')?>
         <?php
@@ -58,15 +58,15 @@
                 
                 echo '<div class="edit-categories-box field graybox rounded spaced app-'.$application_id.'">';
                 echo '<h4 style="border-bottom: none;">'.$html->image('app-icons/'.strtolower($applications[$application_id]).'_small.png', array('alt' => $applications[$application_id]));
-                echo sprintf('%s Categories', $applications[$application_id]).'</h4>';
+                echo sprintf(___('devcp_edit_categories_header_application'), $applications[$application_id]).'</h4>';
                 if (!empty($tags)) {
-                    echo '<p>'.sprintf('Select up to three %s categories for your add-on', $applications[$application_id]).':</p>';
+                    echo '<p>'.sprintf(___('devcp_edit_categories_select_application_categories'), $applications[$application_id]).':</p>';
                     echo '<table style="width: 100%;"><tr><td style="width: 50%;">';
                     for ($i = 1; $i <= 3; $i++) {
                         $selected = false;
-                        echo '<label>'.sprintf('Category %s', $i).':&nbsp;';
+                        echo '<label>'.sprintf(___('devcp_edit_categories_label_category_num'), $i).':&nbsp;';
                         echo '<select name="data[Tag]['.$application_id.'][]"'.($otherSelected ? ' disabled="disabled"' : '').'>';
-                        echo '<option value="" style="color: gray;">(none selected)</option>';
+                        echo '<option value="" style="color: gray;">'.___('devcp_edit_authors_option_empty').'</option>';
                         foreach ($tags as $tag_id => $tag_name) {
                             if ($otherTags[$application_id] == $tag_id)
                                 continue;
@@ -83,25 +83,25 @@
                         echo '</select></label>';
                     }
                     if (!empty($otherTags[$application_id])) {
-                        echo '<label onmouseover="addon_edit_categories.updateDescription('.$application_id.', \''.$html->entities('<strong>'.$sortedTags[$application_id][$otherTags[$application_id]].'</strong><br />Place your add-on into this category only if it does not fit into any other available categories.').'\');">';
+                        echo '<label onmouseover="addon_edit_categories.updateDescription('.$application_id.', \''.$html->entities('<strong>'.$sortedTags[$application_id][$otherTags[$application_id]].'</strong><br />'.___('devcp_edit_categories_other')).'\');">';
                         echo '<input type="checkbox" name="data[Tag]['.$application_id.'][]" value="'.$otherTags[$application_id].'" onclick="addon_edit_categories.toggleDropdowns(this, '.$application_id.');"'.($otherSelected ? ' checked="checked"' : '').' />&nbsp;';
-                        echo 'My add-on doesn\'t fit into any available categories.';
+                        echo ___('devcp_edit_categories_does_not_fit');
                         echo '</label>';
                     }
-                    echo '</td><td id="edit-categories-descriptions'.$application_id.'" style="border-left: 1px solid #CCCCCC;">Hover over a category to see its description.</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>'.'No categories are available for this add-on type and application.'.'</p>';
+                    echo '<p>'.___('devcp_edit_categories_none_available').'</p>';
                 }
                 echo '</div>';
             }
             
-            echo '<div class="action-button-container centered"><a href="#" onclick="addon_edit_categories.save(); return false;" class="action-button rounded">Update Categories</a></div>';
+            echo '<div class="action-button-container centered"><a href="#" onclick="addon_edit_categories.save(); return false;" class="action-button rounded">'.___('devcp_edit_categories_button_update').'</a></div>';
             echo '</form>';
         }
         else {
-            echo '<p>'.'No categories are available for this add-on type and application.'.'</p>';
+            echo '<p>'.___('devcp_edit_categories_none_available').'</p>';
         }
         ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/site/app/views/developers/addon_edit_descriptions.thtml b/site/app/views/developers/addon_edit_descriptions.thtml
index 1214b18..69ad01d 100644
--- a/site/app/views/developers/addon_edit_descriptions.thtml
+++ b/site/app/views/developers/addon_edit_descriptions.thtml
@@ -40,14 +40,14 @@
     <?=$this->renderElement('developers/sidebar', array('addons' => $all_addons, 'extra' => 'developers/editbox'));?>
 
     <div id="content-main"  class="edit-addon <?=($author_role >= AUTHOR_ROLE_DEV ? 'privs' : 'no-privs')?>">
-        <?=$this->renderElement('developers/addonheader', array('title' => "Edit {$addon_name}", 'addon_id' => $addon_id));?>
+        <?=$this->renderElement('developers/addonheader', array('title' => sprintf(___('devcp_title_edit_addon'), $addon_name), 'addon_id' => $addon_id));?>
         <?php
             if (!empty($success)) {
-                echo '<div class="notice-success rounded"><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.</div>';
+                echo '<div class="notice-success rounded">'.___('devcp_notice_changes_saved').'</div>';
             }
         ?>
         
-        <h2>Edit Add-on Descriptions</h2>
+        <h2><?=___('devcp_edit_descriptions_header')?></h2>
         <?=$this->renderElement('noscript')?>
         <?=$this->renderElement('developers/rolecheck')?>
         <form id="addon-edit-descriptions-form" action="" method="post">
@@ -73,24 +73,24 @@
                     'translations' => $translations['summary'],
                     'height' => '60',
                     'maxLength' => '250',
-                    'displayName' => 'Add-on Summary',
-                    'description' => '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>'
+                    'displayName' => ___('devcp_edit_descriptions_transbox_summary_name'),
+                    'description' => ___('devcp_edit_descriptions_transbox_summary_description'),
                 ));
         
         // Description
         echo $this->renderElement('developers/translationbox', array(
                     'field' => 'description',
                     'translations' => $translations['description'],
-                    'displayName' => 'Add-on Description',
-                    'description' => '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.'
+                    'displayName' => ___('devcp_edit_descriptions_transbox_description_name'),
+                    'description' => ___('devcp_edit_descriptions_transbox_description_description'),
                 ));
         
         // Developer Comments
         echo $this->renderElement('developers/translationbox', array(
                     'field' => 'developercomments',
                     'translations' => $translations['developercomments'],
-                    'displayName' => 'Developer Comments',
-                    'description' => '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.'
+                    'displayName' => ___('devcp_edit_descriptions_transbox_comments_name'),
+                    'description' => ___('devcp_edit_descriptions_transbox_comments_description'),
                 ));
         
         // EULA
@@ -98,8 +98,8 @@
                     'field' => 'eula',
                     'translations' => $translations['eula'],
                     'height' => '200',
-                    'displayName' => 'End-User License Agreement',
-                    'description' => '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.'
+                    'displayName' => ___('devcp_edit_descriptions_transbox_eula_name'),
+                    'description' => ___('devcp_edit_descriptions_transbox_eula_description'),
                 ));
         
         // Privacy Policy
@@ -107,12 +107,12 @@
                     'field' => 'privacypolicy',
                     'translations' => $translations['privacypolicy'],
                     'height' => '200',
-                    'displayName' => 'Privacy Policy',
-                    'description' => '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.'
+                    'displayName' => ___('devcp_edit_descriptions_transbox_privacy_name'),
+                    'description' => ___('devcp_edit_descriptions_transbox_privacy_description'),
                 ));
         ?>
-        <div id="edit-error" class="error" style="display: none;">Please correct the errors above indicated in red.</div>
-        <div class="action-button-container centered" style="width: 600px;"><a href="#" onclick="addon_edit_descriptions.save(); return false;" class="action-button rounded">Update Descriptions</a></div>
+        <div id="edit-error" class="error" style="display: none;"><?=___('devcp_edit_description_correct_error')?></div>
+        <div class="action-button-container centered" style="width: 600px;"><a href="#" onclick="addon_edit_descriptions.save(); return false;" class="action-button rounded"><?=___('devcp_edit_description_button_update')?></a></div>
         </form>
     </div>
 </div>
diff --git a/site/app/views/developers/addon_edit_properties.thtml b/site/app/views/developers/addon_edit_properties.thtml
index 6850441..5efd28a 100644
--- a/site/app/views/developers/addon_edit_properties.thtml
+++ b/site/app/views/developers/addon_edit_properties.thtml
@@ -40,16 +40,16 @@
     <?=$this->renderElement('developers/sidebar', array('addons' => $all_addons, 'extra' => 'developers/editbox'));?>
 
     <div id="content-main" class="<?=($author_role >= AUTHOR_ROLE_DEV ? 'privs' : 'no-privs')?>">
-        <?=$this->renderElement('developers/addonheader', array('title' => "Edit {$addon_name}", 'addon_id' => $addon_id));?>
+        <?=$this->renderElement('developers/addonheader', array('title' => sprintf(___('devcp_title_edit_addon'), $addon_name), 'addon_id' => $addon_id));?>
         <?php
         if (!empty($success)) {
-            echo '<div class="notice-success rounded"><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.</div>';
+            echo '<div class="notice-success rounded">'.___('devcp_notice_changes_saved').'</div>';
         }
         if (!empty($errors)) {
-            echo '<div class="notice-error rounded"><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.</div>';
+            echo '<div class="notice-error rounded">'.___('devcp_notice_changes_error').'</div>';
         }
         ?>
-        <h2>Edit Add-on Properties</h2>
+        <h2><?=___('devcp_edit_properties_header')?></h2>
         <?=$this->renderElement('noscript')?>
         <?=$this->renderElement('developers/rolecheck')?>
         <form id="addon-edit-properties-form" action="" method="post" enctype="multipart/form-data">
@@ -74,14 +74,14 @@
                     'field' => 'name',
                     'translations' => $translations['name'],
                     'type' => 'textbox',
-                    'displayName' => 'Add-on Name',
-                    'description' => 'The name of your add-on is displayed everywhere your add-on is listed.'
+                    'displayName' => ___('devcp_edit_properties_transbox_name_name'),
+                    'description' => ___('devcp_edit_properties_transbox_name_description'),
                 ));
         ?>
         
         <div class="field graybox rounded spaced" style="width: 600px;">
-            <h4>Default Locale</h4>
-            <p>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.</p>
+            <h4><?=___('devcp_edit_properties_header_default_locale')?></h4>
+            <p><?=___('devcp_edit_properties_default_locale')?></p>
             <select name="data[Addon][defaultlocale]">
             <?php
             // Retrieve language arrays from bootstrap.
@@ -100,13 +100,13 @@
         </div>
         
         <div class="field graybox rounded spaced<?=(!empty($errors['icon']) ? ' errors' : '')?>" style="width: 600px;">
-            <h4>Add-on Icon</h4>
+            <h4><?=___('devcp_edit_properties_header_icon')?></h4>
             <?=(!empty($errors['icon']) ? '<div class="error-message">'.$errors['icon'].'</div>' : '')?>
-            <p>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: <?=implode(', ', $this->controller->Developers->imageExtensions)?></p>
+            <p><?=sprintf(___('devcp_edit_properties_icon'), implode(', ', $this->controller->Developers->imageExtensions))?></p>
             <table width="100%" id="edit-properties-icon-table">
                 <tr>
-                    <th style="width: 20%;">Current icon:</th>
-                    <th>New icon:</th>
+                    <th style="width: 20%;"><?=___('devcp_edit_properties_current_icon')?></th>
+                    <th><?=___('devcp_edit_properties_new_icon')?></th>
                 </tr>
                 <tr>
                     <td style="text-align: center;">
@@ -114,8 +114,8 @@
                     $addonIconPath = $this->controller->Image->getAddonIconURL($addon_id);
                     echo '<img id="addon-icon" src="'.$addonIconPath.'" alt="" />';
                     if (!empty($addon['Addon']['icontype'])) {
-                        echo '<div id="delete-icon-area" class="require-privs"><a href="#" onclick="addon_edit_properties.deleteIcon(); return false;">Remove Icon</a></div>';
-                        echo '<div id="undelete-icon-area" style="display: none;">Icon will be deleted on save. <a href="#" onclick="addon_edit_properties.undeleteIcon(); return false;">Cancel?</a></div>';
+                        echo '<div id="delete-icon-area" class="require-privs"><a href="#" onclick="addon_edit_properties.deleteIcon(); return false;">'.___('devcp_edit_properties_remove_icon').'</a></div>';
+                        echo '<div id="undelete-icon-area" style="display: none;">'.sprintf(___('devcp_edit_properties_undelete'), 'href="#" onclick="addon_edit_properties.undeleteIcon(); return false;"').'</div>';
                         echo '<input id="delete-icon" type="hidden" name="data[Addon][deleteIcon]" value="0" />';
                     }
                     ?>
@@ -131,8 +131,8 @@
                     'field' => 'homepage',
                     'translations' => $translations['homepage'],
                     'type' => 'textbox',
-                    'displayName' => 'Add-on Homepage',
-                    'description' => '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.'
+                    'displayName' => ___('devcp_edit_properties_transbox_homepage_name'),
+                    'description' => ___('devcp_edit_properties_transbox_homepage_description'),
                 ));
         
         // Support Email
@@ -140,8 +140,8 @@
                     'field' => 'supportemail',
                     'translations' => $translations['supportemail'],
                     'type' => 'textbox',
-                    'displayName' => 'Support Email Address',
-                    'description' => '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.'
+                    'displayName' => ___('devcp_edit_properties_transbox_supportemail_name'),
+                    'description' => ___('devcp_edit_properties_transbox_supportemail_description'),
                 ));
         
         // Support URL
@@ -149,26 +149,27 @@
                     'field' => 'supporturl',
                     'translations' => $translations['supporturl'],
                     'type' => 'textbox',
-                    'displayName' => 'Support Website',
-                    'description' => '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.'
+                    'displayName' => ___('devcp_edit_properties_transbox_supporturl_name'),
+                    'description' => ___('devcp_edit_properties_transbox_supporturl_description'),
                 ));
         ?>
         
         <div class="field graybox rounded spaced" style="width: 600px;">
-            <h4>Other Settings</h4>
-            <h5>View Source Online</h5>
-            <p class="smallmargin">The source of your add-on files can be viewed online by any logged in user if you wish.</p>
-            <label class="indented"><input type="radio" name="data[Addon][viewsource]" value="1" <?=($addon['Addon']['viewsource'] == 0 ? '' : 'checked="checked"')?>/>&nbsp;Allow online source viewing</label>
-            <label class="indented"><input type="radio" name="data[Addon][viewsource]" value="0" <?=($addon['Addon']['viewsource'] == 0 ? 'checked="checked"' : '')?>/>&nbsp;Do not allow online source viewing</label>
+            <h4><?=___('devcp_edit_properties_header_other_settings')?></h4>
+            <h5><?=___('devcp_edit_properties_header_view_source')?></h5>
+            <p class="smallmargin"><?=___('devcp_edit_properties_view_source')?></p>
+            <label class="indented"><input type="radio" name="data[Addon][viewsource]" value="1" <?=($addon['Addon']['viewsource'] == 0 ? '' : 'checked="checked"')?>/>&nbsp;<?=___('devcp_edit_properties_view_source_allow')?></label>
+            <label class="indented"><input type="radio" name="data[Addon][viewsource]" value="0" <?=($addon['Addon']['viewsource'] == 0 ? 'checked="checked"' : '')?>/>&nbsp;<?=___('devcp_edit_properties_view_source_do_not_allow')?></label>
             
             <?php if ($addon['Addon']['addontype_id'] != ADDON_SEARCH): ?>
-            <h5>Add-on Flags</h5>
-            <p class="smallmargin">These flags are used to filter and classify add-ons.</p>
+            <h5><?=___('devcp_edit_properties_header_flags')?></h5>
+            <p class="smallmargin"><?=___('devcp_edit_properties_flags')?></p>
             <label class="indented"><input type="checkbox" name="data[Addon][prerelease]" value="1"  <?=($addon['Addon']['prerelease'] == 1 ? 'checked="checked"' : '')?>/>&nbsp;<?=_('devcp_edit_label_prerelease')?></label>
             <label class="indented"><input type="checkbox" name="data[Addon][sitespecific]" value="1"  <?=($addon['Addon']['sitespecific'] == 1 ? 'checked="checked"' : '')?>/>&nbsp;<?=_('devcp_edit_label_sitespecific')?></label>
             <label class="indented"><input type="checkbox" name="data[Addon][externalsoftware]" value="1" <?=($addon['Addon']['externalsoftware'] == 1 ? 'checked="checked"' : '')?> />&nbsp;<?=_('devcp_edit_label_externalsoftware')?></label>
-            <label class="indented"><input type="checkbox" name="data[Addon][binary]" value="1" <?=($addon['Addon']['binary'] == 1 ? 'checked="checked"' : '')?> />&nbsp;This add-on contains binary components</label>
-            
+            <label class="indented"><input type="checkbox" name="data[Addon][binary]" value="1" <?=($addon['Addon']['binary'] == 1 ? 'checked="checked"' : '')?> />&nbsp;<?=___('devcp_edit_properties_label_binary')?></label>
+            <h5><?=___('devcp_edit_properties_header_guid')?></h5>
+            <p class="smallmargin"><?=___('devcp_edit_properties_guid')?></p>
             <h5>Add-on GUID</h5>
             <p class="smallmargin">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 <?=SITE_NAME?>.</p>
             <label class="indented"><tt><?=$addon['Addon']['guid']?></tt></label>
@@ -177,12 +178,12 @@
         
         <?php if ($this->controller->SimpleAcl->actionAllowed('Admin', 'ConfigureAnyAddon', $this->controller->Session->read('User'))): ?>
         <div class="field graybox rounded spaced" style="width: 600px;">
-            <h4>Admin Settings</h4>
-            <h5>Trusted Add-on?</h5>
-            <p class="smallmargin">Trusted add-ons can become public without Editor review.</p>
-            <label class="indented"><input type="radio" name="data[Addon][trusted]" value="1" <?=($addon['Addon']['trusted'] == 1 ? 'checked="checked"' : '')?>/>&nbsp;Trusted</label>
-            <label class="indented"><input type="radio" name="data[Addon][trusted]" value="0" <?=($addon['Addon']['trusted'] == 1 ? '' : 'checked="checked"')?>/>&nbsp;Not Trusted</label>
-            <h5>Add-on Type</h5>
+            <h4><?=___('devcp_edit_properties_header_admin_settings')?></h4>
+            <h5><?=___('devcp_edit_properties_header_trusted')?></h5>
+            <p class="smallmargin"><?=___('devcp_edit_properties_trusted')?></p>
+            <label class="indented"><input type="radio" name="data[Addon][trusted]" value="1" <?=($addon['Addon']['trusted'] == 1 ? 'checked="checked"' : '')?>/>&nbsp;<?=___('devcp_edit_properties_label_trusted')?></label>
+            <label class="indented"><input type="radio" name="data[Addon][trusted]" value="0" <?=($addon['Addon']['trusted'] == 1 ? '' : 'checked="checked"')?>/>&nbsp;<?=___('devcp_edit_properties_label_not_trusted')?></label>
+            <h5><?=___('devcp_edit_properties_header_addon_type')?></h5>
             <select name="data[Addon][addontype_id]">
             <?php
             if (!empty($addontypes)) {
@@ -193,8 +194,8 @@
             ?>
             </select>
             
-            <h5>Add-on GUID</h5>
-            <p class="smallmargin">Only change if you understand all of the consequences.</p>
+            <h5><?=___('devcp_edit_properties_header_guid')?></h5>
+            <p class="smallmargin"><?=___('devcp_edit_properties_change_guid')?></p>
             <input type="text" name="data[Addon][guid]" value="<?=$addon['Addon']['guid']?>" size="50" />
             
             <?php if (in_array($addon['Addon']['addontype_id'], array(ADDON_DICT, ADDON_LPAPP))): ?>
@@ -208,7 +209,7 @@
         </div>
         <?php endif; ?>
         
-        <div class="action-button-container centered" style="width: 600px;"><a href="#" onclick="addon_edit_properties.save(); return false;" class="action-button rounded">Update Properties</a></div>
+        <div class="action-button-container centered" style="width: 600px;"><a href="#" onclick="addon_edit_properties.save(); return false;" class="action-button rounded"><?=___('devcp_edit_properties_button_update')?></a></div>
         </form>
     </div>
 </div>
diff --git a/site/app/views/developers/addon_status.thtml b/site/app/views/developers/addon_status.thtml
index 7763ea1..0ef7489 100644
--- a/site/app/views/developers/addon_status.thtml
+++ b/site/app/views/developers/addon_status.thtml
@@ -40,13 +40,13 @@
     <?=$this->renderElement('developers/sidebar', array('addons' => $all_addons, 'extra' => 'developers/editbox'));?>
 
     <div id="content-main" class="<?=($author_role >= AUTHOR_ROLE_DEV ? 'privs' : 'no-privs')?>">
-        <?=$this->renderElement('developers/addonheader', array('title' => "{$addon_name} Status", 'addon_id' => $addon_id));?>
+        <?=$this->renderElement('developers/addonheader', array('title' => sprintf(___('devcp_addon_status_title'), $addon_name), 'addon_id' => $addon_id));?>
         <?php
         if (!empty($success)) {
-            echo '<div class="notice-success rounded"><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.</div>';
+            echo '<div class="notice-success rounded"><span>'.___('devcp_notice_changes_saved').'</div>';
         }
         if (!empty($errors)) {
-            echo '<div class="notice-error rounded"><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.</div>';
+            echo '<div class="notice-error rounded"><span>'.___('devcp_notice_changes_error').'</div>';
         }
         ?>
         <?=$this->renderElement('noscript')?>
@@ -55,100 +55,102 @@
         <?=$html->hiddenSession();?>
         
         <div class="field graybox rounded spaced">
-            <h4 class="status">Add-on Status: <span class="status-<?=$addon['Addon']['status']?>"><?=$statuses[$addon['Addon']['status']]?></span></h4>
+            <h4 class="status"><?=sprintf(___('devcp_addon_status_header'), '<span class="status-'.$addon['Addon']['status'].'">'.$statuses[$addon['Addon']['status']].'</span>')?></h4>
             <p>
                 <?php
+                    function status_span($i, $status) { return '<span class="status-'.$i.'">'.$status.'</span>'; }
                     // Add-on Status
+                    $sandbox = status_span(STATUS_SANDBOX, ___('devcp_addon_status_sandbox'));
+                    $public = status_span(STATUS_PUBLIC, ___('devcp_addon_status_public'));
                     switch ($addon['Addon']['status']) {
-                        case STATUS_NULL:
-                            echo '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>.';
-                            break;
-                        
-                        case STATUS_SANDBOX:
-                            echo '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.';
-                            break;
-                        
-                        case STATUS_NOMINATED:
-                            echo '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.';
-                        
-                            echo '</p><p>';
-                            echo 'Your add-on is currently nominated to become <span class="status-4">Public</span> and is awaiting editor review. There are currently '.$nominationCount.' other add-ons in the nomination queue.';
-                            break;
+                    case STATUS_NULL:
+                        echo ___('devcp_addon_status_switch_incomplete');
+                        break;
+
+                    case STATUS_SANDBOX:
+                        ___('devcp_addon_status_switch_sandbox');
+                        break;
                         
-                        case STATUS_PENDING:
-                            echo 'Your add-on is pending. This shouldn\'t have happened. Please e-mail amo-editors@mozilla.org with your add-on ID and state this error.';
-                            break;
+                    case STATUS_NOMINATED:
+                        ___('devcp_addon_status_switch_sandbox');
+                        echo '</p><p>';
+                        echo sprintf(___('devcp_addon_status_switch_nominated'), $nominationCount);
+                        break;
                         
-                        case STATUS_PUBLIC:
-                            echo '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.';
-                            break;
+                    case STATUS_PENDING:
+                        echo sprintf(___('devcp_addon_status_switch_pending'), 'amo-editors@mozilla.org');
+                        break;
+
+                    case STATUS_PUBLIC:
+                        ___('devcp_addon_status_switch_public');
+                        break;
                         
-                        case STATUS_DISABLED:
-                            echo '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 '.ADMIN_EMAIL.'.';
-                            break;
+                    case STATUS_DISABLED:
+                        echo sprintf(___('devcp_addon_status_switch_disabled'), 'amo-admins@mozilla.org');
+                        break;
                     }
                 ?>
             </p>
             
             <?php
             if ($addon['Addon']['status'] == STATUS_NULL) {
-                echo '<h5>Add-on Completion Criteria</h5>';
+                echo '<h5>'.___('devcp_addon_status_header_criteria').'</h5>';
                 echo '<ul class="criteria">';
-                echo '<li class="'.($criteria['name'] ? 'pass' : 'fail').'">Add-on Name required</li>';
-                echo '<li class="'.($criteria['summary'] ? 'pass' : 'fail').'">Add-on Summary required</li>';
-                echo '<li class="'.($criteria['description'] ? 'pass' : 'fail').'">Add-on Description required</li>';
-                echo '<li class="'.($criteria['category'] ? 'pass' : 'fail').'">At least one category selected</li>';
+                echo '<li class="'.($criteria['name'] ? 'pass' : 'fail').'">'.___('devcp_addon_status_criteria_name').'</li>';
+                echo '<li class="'.($criteria['summary'] ? 'pass' : 'fail').'">'.___('devcp_addon_status_criteria_summary').'</li>';
+                echo '<li class="'.($criteria['description'] ? 'pass' : 'fail').'">'.___('devcp_addon_status_criteria_description').'</li>';
+                echo '<li class="'.($criteria['category'] ? 'pass' : 'fail').'">'.___('devcp_addon_status_criteria_category').'</li>';
                 echo '</ul>';
                 
                 $completionEnabled = false;
                 if ($criteria['name'] && $criteria['summary'] && $criteria['description'] && $criteria['category']) {
                     $completionEnabled = true;
-                    echo '<p>You may now complete your add-on and move it to the <span class="status-1">Sandbox</span> by clicking the button below.</p>';
+                    echo '<p>'.sprintf(___('devcp_addon_status_completion_enabled'), $sandbox).'</p>';
                 }
                 else {
-                    echo '<p>Please fulfill the criteria above before you can complete your add-on and move it to the <span class="status-1">Sandbox</span>.</p>';
+                    echo '<p>'.sprintf(___('devcp_addon_status_completion_disabled'), $sandbox).'</p>';
                 }
             }
             
             $nominationEnabled = false;
-            if ($addon['Addon']['status'] == STATUS_SANDBOX && $addon['Addon']['higheststatus'] < STATUS_PUBLIC) {
-                echo '<h5>Public Nomination Criteria</h5>';
+            if ($addon['Addon']['status'] == STATUS_SANDBOX || $addon['Addon']['higheststatus'] < STATUS_PUBLIC) {
+                echo '<h5>'.___('devcp_addon_status_header_nomination').'</h5>';
                 echo '<ul class="criteria">';
-                echo '<li class="'.($criteria['previews'] ? 'pass' : 'fail').'">At least one preview image required for extensions and themes.</li>';
-                echo '<li class="'.($criteria['reviews'] ? 'pass' : 'meh').'">Several user reviews of the add-on (may be external reviews).</li>';
-                echo '<li class="'.($criteria['prerelease'] ? 'pass' : 'fail').'">Add-on is not marked as pre-release.</li>';
+                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>You may now nominate your add-on for <span class="status-4">Public</span> by clicking the button below.</p>';
+                    echo '<p>'.___('devcp_addon_status_nominate_enabled').'</p>';
                 }
                 else {
-                    echo '<p>Please fulfill the criteria above before nominating your add-on to become <span class="status-4">Public</span>.</p>';
+                    echo '<p>'.___('devcp_addon_status_nominate_disabled').'</p>';
                 }
             }
             
             // Actions
             $actions = '';
             if ($addon['Addon']['status'] == STATUS_NULL && $completionEnabled === true) {
-                $actions .= '<tr><td class="action"><a href="'.$html->url("/developers/addon/status/{$addon_id}/complete").'" class="complete add-button rounded">Complete Add-on</a></td>';
-                $actions .= '<td class="description">Complete your add-on and move to the Sandbox</td></tr>';
+                $actions .= '<tr><td class="action"><a href="'.$html->url("/developers/addon/status/{$addon_id}/complete").'" class="complete add-button rounded">'.___('devcp_addon_status_action_complete').'</a></td>';
+                $actions .= '<td class="description">'.___('devcp_addon_status_action_complete_description').'</td></tr>';
             }
             if ($addon['Addon']['status'] == STATUS_SANDBOX && $nominationEnabled === true) {
-                $actions .= '<tr><td class="action"><a href="'.$html->url("/developers/addon/status/{$addon_id}/nominate").'" class="nominate add-button rounded">Nominate for Public</a></td>';
-                $actions .= '<td class="description">Nominate your add-on to become Public</td></tr>';
+                $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>';
             }
             if ($addon['Addon']['status'] == STATUS_PUBLIC) {
-                $actions .= '<tr><td class="action"><a href="'.$html->url("/developers/addon/status/{$addon_id}/sandbox").'" class="to-sandbox add-button rounded">Move to Sandbox</a></td>';
-                $actions .= '<td class="description">Move your add-on back to the Sandbox. This is reversible.</td></tr>';
+                $actions .= '<tr><td class="action"><a href="'.$html->url("/developers/addon/status/{$addon_id}/sandbox").'" class="to-sandbox add-button rounded">'.___('devcp_addon_status_action_move').'</a></td>';
+                $actions .= '<td class="description">'.___('devcp_addon_status_action_move_description').'</td></tr>';
             }
             if ($addon['Addon']['status'] == STATUS_SANDBOX && $addon['Addon']['higheststatus'] == STATUS_PUBLIC) {
-                $actions .= '<tr><td class="action"><a href="'.$html->url("/developers/addon/status/{$addon_id}/public").'" class="to-public add-button rounded">Make Public</a></td>';
-                $actions .= '<td class="description">Make your add-on Public again.</td></tr>';
+                $actions .= '<tr><td class="action"><a href="'.$html->url("/developers/addon/status/{$addon_id}/public").'" class="to-public add-button rounded">'.___('devcp_addon_status_action_public').'</a></td>';
+                $actions .= '<td class="description">'.___('devcp_addon_status_action_public_description').'</td></tr>';
             }
             
             if (!empty($actions)) {
-                echo '<h5>Available Actions</h5>';
+                echo '<h5>'.___('devcp_addon_status_header_actions').'</h5>';
                 echo '<table class="actions"><tbody>';
                 echo $actions;
                 echo '</tbody></table>';
@@ -157,14 +159,15 @@
         </div>
         
         <div class="field graybox rounded spaced">
-            <h4 class="status">Active Status: <span class="inactive-<?=($addon['Addon']['inactive'] == 1 ? '1">Inactive' : '0">Active')?></span></h4>
             <p>
             <?php
             if ($addon['Addon']['inactive'] == 1) {
-            echo '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.';
+                echo '<h4 class="status">'.___('devcp_addon_status_header_inactive').'</h4>';
+                echo ___('devcp_addon_status_inactive');
             }
             else {
-                echo '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.';
+                echo '<h4 class="status">'.___('devcp_addon_status_header_active').'</h4>';
+                echo ___('devcp_addon_status_active');
             }
             ?>
             </p>
@@ -172,12 +175,12 @@
             <table class="actions"><tbody>
             <?php
             if ($addon['Addon']['inactive'] == 1) {
-                echo '<tr><td class="action"><a href="'.$html->url("/developers/addon/status/{$addon_id}/active").'" class="make-active add-button rounded">Make Active</a></td>';
-                echo '<td class="description">Make your add-on active for it to show up in public listings and enable the update check service.</td></tr>';
+                echo '<tr><td class="action"><a href="'.$html->url("/developers/addon/status/{$addon_id}/active").'" class="make-active add-button rounded">'.___('devcp_addon_status_action_activate').'</a></td>';
+                echo '<td class="description">'.___('devcp_addon_status_action_activate_description').'</tr>';
             }
             else {
-                echo '<tr><td class="action"><a href="'.$html->url("/developers/addon/status/{$addon_id}/inactive").'" class="make-inactive add-button rounded">Make Inactive</a></td>';
-                echo '<td class="description">Make your add-on inactive to hide it from all public listings and disable the update check service.</td></tr>';
+                echo '<tr><td class="action"><a href="'.$html->url("/developers/addon/status/{$addon_id}/inactive").'" class="make-inactive add-button rounded">'.___('devcp_addon_status_action_deactivate').'</td>';
+                echo '<td class="description">'.___('devcp_addon_status_action_deactivate_description').'</tr>';
             }
             ?>
             </tbody></table>
@@ -185,9 +188,8 @@
         
         <?php if ($addon['Addon']['trusted'] == 1): ?>
             <div class="field graybox rounded spaced">
-                <h4 class="status">Trusted Status: <span class="status-4">Trusted</span></h4>
-                
-                <p>Your add-on is <span class="status-4">Trusted</span>. This means you can submit updates to your add-on without editor review.</p>
+                <h4 class="status"><?=___('devcp_addon_status_header_trusted')?></h4>
+                <p><?=___('devcp_addon_status_trusted')?></p>
             </div>
         <?php endif; ?>
         </form>
diff --git a/site/app/views/developers/addon_status_confirm.thtml b/site/app/views/developers/addon_status_confirm.thtml
index 0361888..fb3f6a3 100644
--- a/site/app/views/developers/addon_status_confirm.thtml
+++ b/site/app/views/developers/addon_status_confirm.thtml
@@ -40,49 +40,41 @@
     <?=$this->renderElement('developers/sidebar', array('addons' => $all_addons, 'extra' => 'developers/editbox'));?>
 
     <div id="content-main" class="<?=($author_role >= AUTHOR_ROLE_DEV ? 'privs' : 'no-privs')?>">
-        <?=$this->renderElement('developers/addonheader', array('title' => "{$addon_name} Status", 'addon_id' => $addon_id));?>
+        <?=$this->renderElement('developers/addonheader', array('title' => sprintf(___('devcp_addon_status_title'), $addon_name), 'addon_id' => $addon_id));?>
         <?=$this->renderElement('noscript')?>
         <?=$this->renderElement('developers/rolecheck')?>
         <form id="status-form" name="status-form" action="" method="post">
         <?=$html->hiddenSession();?>
         <input type="hidden" name="confirmed" value="true" />
         <div class="graybox field rounded">
-            <h4>Are you sure?</h4>
+            <h4><?=___('devcp_status_confirm_header_sure')?></h4>
             <p>
             <?php
             switch ($subaction) {
-                case 'inactive':
-                    echo '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.';
-                    echo '</p><p>';
-                    echo 'Are you sure you wish to mark this add-on inactive?';
-                    break;
-                
-                case 'active':
-                    echo '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.';
-                    echo '</p><p>';
-                    echo 'Are you sure you wish to mark this add-on active?';
-                    break;
-                
-                case 'sandbox':
-                    echo '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.';
-                    echo '</p><p>';
-                    echo 'Are you sure you wish to move this add-on to the sandbox?';
-                    break;
-                
-                case 'public':
-                    echo 'Making this add-on public will make it available for anyone to download and will begin offering updates to existing users.';
-                    echo '</p><p>';
-                    echo 'Are you sure you wish to make this add-on public?';
-                    break;
+            case 'inactive':
+                echo ___('devcp_status_confirm_inactive').'</p><p>'.___('devcp_status_confirm_inactive_sure');
+                break;
+
+            case 'active':
+                echo ___('devcp_status_confirm_active').'</p><p>'.___('devcp_status_confirm_active_sure');
+                break;
+
+            case 'sandbox':
+                echo ___('devcp_status_confirm_sandbox').'</p><p>'.___('devcp_status_confirm_sandbox_sure');
+                break;
+
+            case 'public':
+                echo ___('devcp_status_confirm_public').'</p><p>'.___('devcp_status_confirm_public_sure');
+                break;
             }
             ?>
             </p>
             <div style="text-align: center;">
-                <a href="#" onclick="addon_status.confirm(); return false;" class="complete add-button rounded">Yes, I'm sure</a>&nbsp;&nbsp;
-                <a href="<?=$html->url("/developers/addon/status/{$addon_id}/")?>" class="button rounded">No, cancel</a>
+                <a href="#" onclick="addon_status.confirm(); return false;" class="complete add-button rounded"><?=___('devcp_status_confirm_yes')?></a>&nbsp;&nbsp;
+                <a href="<?=$html->url("/developers/addon/status/{$addon_id}/")?>" class="button rounded"><?=___('devcp_status_confirm_no')?></a>
             </div>
         </div>
         </form>
-        
+
     </div>
 </div>
\ No newline at end of file
diff --git a/site/app/views/developers/addon_status_nominate.thtml b/site/app/views/developers/addon_status_nominate.thtml
index bdb495d..2373732 100644
--- a/site/app/views/developers/addon_status_nominate.thtml
+++ b/site/app/views/developers/addon_status_nominate.thtml
@@ -40,10 +40,10 @@
     <?=$this->renderElement('developers/sidebar', array('addons' => $all_addons, 'extra' => 'developers/editbox'));?>
 
     <div id="content-main" class="<?=($author_role >= AUTHOR_ROLE_DEV ? 'privs' : 'no-privs')?>">
-        <?=$this->renderElement('developers/addonheader', array('title' => "{$addon_name} Status", 'addon_id' => $addon_id));?>
+        <?=$this->renderElement('developers/addonheader', array('title' => sprintf(___('devcp_addon_status_title'), $addon_name), 'addon_id' => $addon_id));?>
         <?php
         if (!empty($errors)) {
-            echo '<div class="notice-error rounded"><span>A nomination message is required.</span><br />Please fill in the text box with the requested information and try again.</div>';
+            echo '<div class="notice-error rounded">'.___('devcp_status_nominate_error_notice').'</div>';
         }
         ?>
         <?=$this->renderElement('noscript')?>
@@ -52,14 +52,14 @@
         <?=$html->hiddenSession();?>
         <input type="hidden" name="confirmed" value="true" />
         <div class="graybox field rounded">
-            <h4>Add-on Nomination</h4>
+            <h4><?=___('devcp_status_nominate_header')?></h4>
             
             <?=$localization->includeLocalPage('nomination', array($html->url('/pages/policy')))?>
             
             <div style="text-align: center;">
                 <textarea cols="70" rows="5" name="data[Addon][nominationmessage]"><?=(!empty($addon['Addon']['nominationmessage']) ? $addon['Addon']['nominationmessage'] : '')?></textarea>
                 <div><a href="#" onclick="addon_status.confirm(); return false;" class="nominate add-button rounded"><?=sprintf(_('devcp_nominate_submit_nominate'), $addon_name)?></a><br />
-                <a href="<?=$html->url("/developers/addon/status/{$addon_id}/")?>">Cancel and return</a>
+                <a href="<?=$html->url("/developers/addon/status/{$addon_id}/")?>"><?=___('devcp_nominate_cancel')?></a>
                 </div>
             </div>
         </div>
diff --git a/site/app/views/developers/dashboard.thtml b/site/app/views/developers/dashboard.thtml
index 14bd92a..4659ece 100644
--- a/site/app/views/developers/dashboard.thtml
+++ b/site/app/views/developers/dashboard.thtml
@@ -40,7 +40,7 @@
     <?=$this->renderElement('developers/sidebar', array('addons' => $all_addons));?>
     
     <div id="content-main">
-        <h3>Developer Dashboard</h3>
+        <h3><?= ___('devcp_dashboard_header_main') ?></h3>
         
         <div id="summary">
         <?php
@@ -62,10 +62,13 @@
                 echo '<ul class="actionbar index-actions">';
                     // Edit Add-on
                     echo '<li class="edit"><a href="'.$html->url('/developers/addon/edit/'.$addon_id).'" class="view">'._('devcp_actionbar_link_edit').'</a>';
-                    echo '<span class="action-details">'.sprintf('Last edited on %s', strftime(_('date'), strtotime($addon['Addon']['modified']))).'</span></li>';
+                    echo '<span class="action-details">'.sprintf(___('devcp_dashboard_last_edited'), strftime(_('date'), strtotime($addon['Addon']['modified']))).'</span></li>';
                     // Change Status
-                    echo '<li class="status"><a href="'.$html->url('/developers/addon/status/'.$addon_id).'" class="view">Change Status</a>';
-                    echo '<span class="action-details">'.sprintf('%s currently %s and %s', $addontypes[$addon['Addon']['addontype_id']], '<span class="inactive-'.$addon['Addon']['inactive'].'">'.($addon['Addon']['inactive'] == 1 ? 'Inactive' : 'Active').'</span>', '<span class="status-'.$addon['Addon']['status'].'">'.$statuses[$addon['Addon']['status']].'</span>').'</span></li>';
+                    echo '<li class="status"><a href="'.$html->url('/developers/addon/status/'.$addon_id).'" class="view">'.___('devcp_dashboard_change_status').'</a>';
+                    $active = $addon['Addon']['inactive'] == 1 ? ___('devcp_dashboard_inactive') : ___('devcp_dashboard_active');
+                    echo '<span class="action-details">'.sprintf(___('devcp_dashboard_addontype_status'), $addontypes[$addon['Addon']['addontype_id']],
+                                                                 '<span class="inactive-'.$addon['Addon']['inactive'].'">'.$active.'</span>',
+                                                                 '<span class="status-'.$addon['Addon']['status'].'">'.$statuses[$addon['Addon']['status']].'</span>').'</span></li>';
                     // Statistics Dashboard
                     echo '<li class="statistics"><a href="'.$html->url('/statistics/addon/'.$addon_id).'" class="view">'._('devcp_actionbar_link_stats').'</a>';
                     echo '<span class="action-details stats">';
@@ -76,7 +79,7 @@
                     echo sprintf(_('devcp_statsbar_adu'), $html->number_format($addon['Addon']['updatepings'], 0));
                     echo '</span></li>';
                     // Versions and Files
-                    echo '<li class="versions"><a href="'.$html->url('/developers/versions/'.$addon_id).'" class="view">Versions and Files</a>';
+                    echo '<li class="versions"><a href="'.$html->url('/developers/versions/'.$addon_id).'" class="view">'.___('devcp_dashboard_versions').'</a>';
                     echo '<span class="action-details">';
                     if (!empty($latestVersion)) {
                         echo _('devcp_summary_lastversion').' '.$html->link($latestVersion['version'], '/developers/versions/edit/'.$latestVersion['id']).' ('.$this->controller->Amo->describeVersionStatus($latestVersion['File']).')';
@@ -85,7 +88,7 @@
                         }
                     }
                     if ($addon['Addon']['inactive'] != 1) {
-                        echo '<a href="'.$html->url('/developers/versions/add/'.$addon_id).'">Upload a new version</a>';
+                        echo '<a href="'.$html->url('/developers/versions/add/'.$addon_id).'">'.___('devcp_dashboard_versions_new').'</a>';
                     }
                     echo '</span></li>';
 		    // Previews
@@ -94,8 +97,8 @@
             }
             else {
                 // Admin Disabled Add-on
-                echo '<p>Add-on Status: <span class="status-'.STATUS_DISABLED.'">'.$statuses[STATUS_DISABLED].'</span></p>';
-                echo '<p>Your add-on was disabled by an administrator and cannot be used. If you have any questions, please e-mail'.ADMIN_EMAIL.'.</p>';
+                echo '<p>'.sprintf(___('devcp_dashboard_disabled_status'), '<span class ="'.STATUS_DISABLED.'">'.$statuses[STATUS_DISABLED].'</span>').'</p>';
+                echo '<p>'.sprintf(___('devcp_dashboard_disabled_questions'), 'amo-admins@mozilla.org').'</p>';
             }
             ?>
             </div>
@@ -106,6 +109,10 @@
         }
         else {
             echo '<div class="graybox rounded">';
+            echo '<h4>'.___('devcp_dashboard_header_welcome').'</h4>';
+            echo '<p>'.___('devcp_dashboard_learn').'</p>';
+            echo '<div style="text-align: center;"><a href="'.$html->url('/developers/addon/submit').'" class="action-button rounded">'.___('devcp_dashboard_start').'</a></div>';
+
             echo '<h4>Welcome to the Developer Dashboard</h4>';
             echo '<p>You don\'t currently have any add-ons hosted on '.SITE_NAME.'. To learn how the process works and submit your first add-on, click Get Started below.</p>';
             echo '<div style="text-align: center;"><a href="'.$html->url('/developers/addon/submit').'" class="action-button rounded">Get Started</a></div>';
diff --git a/site/app/views/developers/discuss.thtml b/site/app/views/developers/discuss.thtml
new file mode 100644
index 0000000..914ee4b
--- /dev/null
+++ b/site/app/views/developers/discuss.thtml
@@ -0,0 +1,85 @@
+<?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
+ * Frederic Wenzel <fwenzel@mozilla.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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/sidebar', array('addons' => $all_addons));?>
+    
+    <div id="content-main">
+        
+        <h3><?=sprintf(___('devcp_discuss_pagetitle', 'Provide More Information For the Add-on Review of %1$s'), $addonName)?></h3>
+        
+        
+        <p><?=sprintf(___('devcp_discuss_intro', 'A Mozilla Add-ons Editor requested further '
+            .'information from you regarding version %2$s of your add-on %1$s.'), $addonName, $versionno)?></p>
+        
+        <div class="corner-box">
+        <p><?=$inforequest['Approval']['comments']?></p>
+        <cite>
+            <?=sprintf(___('devcp_discuss_writtenby', 'written by %1$s on %2$s'), $html->linkUserFromModel($inforequest['User']), strftime(_('datetime'), strtotime($inforequest['Approval']['created'])))?>
+        </cite>
+        </div>
+          
+        <?php if (!empty($replies)): ?>
+        <h4><?=___('devcp_discuss_allreplies_header', 'Replies')?></h4>
+        <?php foreach ($replies as &$reply): ?>
+            <div class="corner-box">
+            <p><?=$reply['Approval']['comments']?></p>
+            <cite>
+                <?=sprintf(___('devcp_discuss_writtenby', 'written by %1$s on %2$s'), $html->linkUserFromModel($reply['User']), strftime(_('datetime'), strtotime($reply['Approval']['created'])))?>
+            </cite>
+            </div>
+        <?php endforeach; ?>
+        <?php endif; ?>
+        
+        <h4><?=___('devcp_discuss_addreply_header', 'Add Reply')?></h4>
+        <?php if (!empty($error)): ?>
+        <div class="error-notice"><p><?=sprintf(___('devcp_discuss_error_notice', 'There was an error saving your reply. Please contact %1$s about the issue.'), $link->email('amo-editors@mozilla.org'))?></p></div>
+        <?php elseif (!empty($success)): ?>
+        <div><p><?=___('devcp_discuss_success_message', 'Your reply was successfully saved. The other participants of the discussion will be notified by email.')?></p></div>
+        <?php else: ?>
+        <?=$html->formTag()?>
+            <div id="commentsbox">
+            <?=$html->textarea('Approval/comments', array('cols' => '70', 'rows' => '5', 'id' => 'comments', 'class' => 'input'))?>
+            </div>
+            <div id="finish">
+            <?=$html->submit(___('devcp_discuss_submit_reply', 'Submit Reply'), array('id' => 'submit'))?>
+            </div>
+        </form>
+        <?php endif; ?>
+        
+    </div> <!-- content-main -->
+</div> <!-- content -->
diff --git a/site/app/views/developers/previews.thtml b/site/app/views/developers/previews.thtml
index 2c3768d..2cbdccf 100644
--- a/site/app/views/developers/previews.thtml
+++ b/site/app/views/developers/previews.thtml
@@ -40,13 +40,13 @@
     <?=$this->renderElement('developers/sidebar', array('addons' => $all_addons, 'extra' => 'developers/editbox'));?>
 
     <div id="content-main" class="<?=($author_role >= AUTHOR_ROLE_DEV ? 'privs' : 'no-privs')?>">
-        <?=$this->renderElement('developers/addonheader', array('title' => "{$addon_name} Preview Manager", 'addon_id' => $addon_id));?>
+     <?=$this->renderElement('developers/addonheader', array('title' => sprintf(___('devcp_previews_title'), $addon_name), 'addon_id' => $addon_id));?>
         <?php
         if (!empty($messages['success'])) {
-            echo '<div class="notice-success rounded"><span>Your previews have been updated successfully.</span><br /><ul><li>'.implode('</li><li>', $messages['success']).'</li></ul></div>';
+            echo '<div class="notice-success rounded"><span>'.___('devcp_previews_notice_success').'</span><br /><ul><li>'.implode('</li><li>', $messages['success']).'</li></ul></div>';
         }
         if (!empty($messages['errors'])) {
-            echo '<div class="notice-error rounded"><span>One or more of your new previews could not be saved.</span><br /><ul><li>'.implode('</li><li>', $messages['errors']).'</li></ul></div>';
+            echo '<div class="notice-error rounded"><span>'.___('devcp_previews_notice_error').'</span><br /><ul><li>'.implode('</li><li>', $messages['errors']).'</li></ul></div>';
         }
         
         echo $this->renderElement('noscript');
@@ -55,7 +55,7 @@
         echo $html->hiddenSession();
         
         if (!empty($previews)) {
-            echo '<p>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.</p>';
+            echo '<p>'.___('devcp_previews_p_screenshots').'</p>';
             // Retrieve language arrays from bootstrap.
             global $valid_languages, $native_languages;
             foreach (array_keys($valid_languages) as $key) {
@@ -74,9 +74,9 @@
             ?>
                 <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="Thumbnail" />
+                <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;">Preview Caption</h5>
+                <h5 style="margin-top: 0; margin-bottom: 2px;"><?=___('devcp_previews_header_caption')?></h5>
                 <div class="translation-box">
                 <?php
                 echo $this->renderElement('developers/translationbox', array(
@@ -91,22 +91,21 @@
                 
                 <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"' : '')?>/>
-                Default Preview</label>
+                <?=___('devcp_previews_label_default')?></label>
                 </td><td style="text-align: right;">
-                <a href="#" onclick="previews.showReplaceBox(this); return false;" class="edit-button rounded">Replace Preview</a>&nbsp;
-                <a href="#" onclick="previews.deletePreview(this); return false;" class="remove-button rounded">Delete Preview</a>
+                <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>
                 
                 <div class="replace-preview" style="display: none;">
-                <label>New image:
+                <label><?=___('devcp_previews_label_new')?>
                 <input type="file" name="data[Preview][New][<?=$preview['Preview']['id']?>]" /></label>
-                <p>Click the Update Previews button below to save this image. (<a href="#" onclick="previews.cancelReplace(this); return false;">Cancel?</a>)</p>
+                <p><?=sprintf(___('devcp_previews_click_update'), 'href="#" onclick="previews.cancelReplace(this); return false;"')?></p>
                 </div>
                 
                 </td></tr></table>
                 <input type="hidden" class="delete" name="data[Preview][Delete][<?=$preview['Preview']['id']?>]" value="false" />
-                <div class="error-message">This preview will be deleted when Update Previews is clicked below. (<a href="#" onclick="previews.cancelDelete(this); return false;">Cancel?</a>)</div>
-                
+                <div class="error-message"><?=sprintf(___('devcp_previews_error_message'), 'href="#" onclick="previews.cancelDelete(this); return false;"')?></div>
                 </div>
         <?php
             }
@@ -114,18 +113,18 @@
         ?>
         
         <div id="add-preview-box" class="graybox rounded spaced field" style="<?=(!empty($previews) ? 'display: none;' : '')?>">
-            <h4>Add New Preview</h4>
-            <p>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: <?=implode(', ', $this->controller->Developers->imageExtensions)?></p>
+            <h4><?=___('devcp_previews_add_new')?></h4>
+            <p><?=sprintf(___('devcp_previews_add_select'), implode(', ', $this->controller->Developers->imageExtensions))?></p>
             <div id="new-preview-container">
-                <label class="new-preview">Upload Preview: <input type="file" name="data[Preview][New][]" size="40" /></label>
+                <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">Add Another Preview</a></div>
-            <div style="text-align: right;">Click Update Previews below to upload.</div>
+            <div class="add-button-container"><a href="#" onclick="previews.addUploadBox(); return false;" class="add-button rounded"><?=___('devcp_previews_a_another')?></a></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">Add New Preview</a></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>
         
-        <div class="action-button-container centered"><a href="#" onclick="previews.save(); return false;" class="action-button rounded">Update Previews</a></div>
+        <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>
\ No newline at end of file
diff --git a/site/app/views/developers/uploader.thtml b/site/app/views/developers/uploader.thtml
index 7a16fc2..6d5c425 100644
--- a/site/app/views/developers/uploader.thtml
+++ b/site/app/views/developers/uploader.thtml
@@ -47,14 +47,14 @@
     echo '<div id="content-main" class="'.($type != 'new' && $author_role < AUTHOR_ROLE_DEV ? 'no-privs' : 'privs').'">';
     
     if ($type == 'new') {
-        $title = 'Submit New Add-on';
+        $title = ___('devcp_uploader_title_submit');
         $addon_id = 0;
     }
     elseif ($type == 'update') {
-        $title = sprintf('Update %s', $addon_name);
+        $title = sprintf(___('devcp_uploader_title_update'), $addon_name);
     }
     elseif ($type == 'file') {
-        $title = sprintf('Add File to %s', "{$addon_name} {$version}");
+        $title = sprintf(___('devcp_uploader_title_file'), $addon_name, $version);
     }
     echo $this->renderElement('developers/addonheader', array('title' => $title, 'addon_id' => $addon_id));
     ?>
@@ -63,6 +63,10 @@
     <div id="submission-area" class="rounded graybox">
     <?php if ($type == 'new'): ?>
         <div id="step-intro">
+            <h3><?=___('devcp_uploader_header_how')?></h3>
+            <?=___('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>
+
             <h3>How does it all work?</h3>
             <p>Thanks for your interest in submitting your add-on to <?=SITE_NAME?>. Hosting your add-on on <?=SITE_NAME?> is the easiest way to handle distribution of your add-on. Here's what you'll get:</p>
             <ul>
@@ -87,16 +91,16 @@
     <?php endif; ?>
     
         <div id="file-upload"<?=($type == 'new' ? ' style="display: none;"' : '')?>>
-            <h3>Upload Your File</h3>
-            <p>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.</p>
+            <h3><?=___('devcp_uploader_header_upload')?></h3>
+            <p><?=___('devcp_uploader_p_upload')?>
             <br />
             <form id="upload-form" method="post" enctype="multipart/form-data" action="<?=$html->url('/developers/json/fileupload/'.$type)?>" target="upload-frame" onsubmit="return upload.uploadFile();">
             <?=$html->hiddenSession();?>
             <?=(!empty($addon_id) ? '<input type="hidden" name="data[Addon][id]" value="'.$addon_id.'" />' : '')?>
             <?=(!empty($version_id) ? '<input type="hidden" name="data[Version][id]" value="'.$version_id.'" />' : '')?>
-            <label>Add-on File: <input id="upload-field" type="file" name="file" /></label><br />
-            Supported Platforms:&nbsp;&nbsp;<label><input type="radio" name="platformtype" onclick="upload.platformAll();" checked />&nbsp;All</label>&nbsp;&nbsp;
-            <label><input type="radio" name="platformtype" onclick="upload.platformSpecific();" />&nbsp;Specific:</label>
+            <label><?=___('devcp_uploader_label_upload_field')?><input id="upload-field" type="file" name="file" /></label><br />
+        <?=___('devcp_uploader_label_platformtype')?>&nbsp;&nbsp;<label><input type="radio" name="platformtype" onclick="upload.platformAll();" checked />&nbsp;<?=___('devcp_uploader_platformtype_all')?></label>&nbsp;&nbsp;
+            <label><input type="radio" name="platformtype" onclick="upload.platformSpecific();" />&nbsp;<?=___('devcp_uploader_platformtype_specific')?></label>
             <?php
             $platforms = $this->controller->Platform->getNames();
             foreach ($platforms as $platform_id => $platform_name) {
@@ -107,13 +111,13 @@
             <div class="submit">
                 <input type="submit" value="Upload File" class="require-privs" />
             </div>
-            <div id="upload-loading"><?=$html->image('ajax_loading.gif')?>&nbsp;Uploading file...</div>
+            <div id="upload-loading"><?=$html->image('ajax_loading.gif')?>&nbsp;<?=___('devcp_uploader_ajax_loading')?></div>
             </form>
             <div id="upload-error" class="redbox-tr"><div class="redbox-tl">
                 <div id="upload-error-content">
-                    <h4>Oops! There seems to be a problem with this file...</h4>
+                    <h4><?=___('devcp_uploader_header_error')?></h4>
                     <p id="upload-error-text" class="smallmargin"></p>
-                    <p class="smallmargin">Please correct this problem and upload your file again.</p>
+                    <p class="smallmargin"><?=___('devcp_uploader_error_correct')?></p>
                 </div>
                 <div class="redbox-br"><div class="redbox-bl"></div></div>
             </div></div>
@@ -124,33 +128,30 @@
     <div id="upload-success" class="greenbox-tr"><div class="greenbox-tl">
     <?php if ($type == 'new'): ?>
         <div id="addon-created-content">
-            <h3>Add-on Created!</h3>
+            <h3><?=___('devcp_uploader_header_created')?>
             <div id="created-results">
-                <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 id="status-link" href="<?=$html->url('/developers/addon/status/')?>">status page</a>.</p>
-                
-                <div class="action-button-container centered"><a id="complete-link" href="<?=$html->url('/developers/addon/edit/')?>" class="action-button rounded">Edit My Add-on</a></div>
-                <div style="text-align: center;"><a href="<?=$html->url('/developers')?>">I'll complete my add-on later.</a></div>
+                <?=sprintf(___('devcp_uploader_created_results'), 'href="/developers/addon/status/" id="status-link"')?>
+                <div class="action-button-container centered"><a id="complete-link" href="<?=$html->url('/developers/addon/edit/')?>" class="action-button rounded"><?=___('devcp_uploader_button_edit')?></a></div>
+                <div style="text-align: center;"><a href="<?=$html->url('/developers')?>"><?=___('devcp_uploader_button_later')?></a></div>
             </div>
         </div><!-- /#addon-created-content -->
     <?php elseif ($type == 'update'): ?>
         <div id="version-created-content">
-            <h3>Version <span id="new-version-number"></span> Created!</h3>
+            <h3><?=sprintf(___('devcp_uploader_header_update_created'), '<span id="new-version-number"></span>')?></h3>
             <div id="created-results">
-                <p>Your new version has been created and is currently marked as <span id="new-file-status"></span>.</p>
-                <p id="pending-message">The new version will be available to the public as soon as an editor is able to review it. There are currently <span id="queue-count"></span> other add-ons in the queue. Want to be reviewed faster? Consider <a href="http://wiki.sugarlabs.org/go/ActivityTeam/aslo">becoming an editor</a>.</p>
-                <p>View your new version in the <a id="version-link" href="<?=$html->url('/developers/versions/edit/')?>">Versions and Files page</a>, check out your add-on's <a href="<?=$html->url('/developers/addon/status/'.$addon_id)?>">current status</a>, or <b>add release notes</b> by clicking the button below (highly recommended).</p>
-                
-                <div class="action-button-container centered"><a id="complete-link" href="<?=$html->url('/developers/versions/edit/')?>" class="action-button rounded">Add Release Notes</a></div>
+                <p><?=sprintf(___('devcp_uploader_p_update_created'), '<span id="new-file-status"></span>')?></p>
+                <p id="pending-message"><?=sprintf(___('devcp_uploader_p_pending_version'), '<span id="queue-count"></span>', 'href="https://wiki.mozilla.org/Update:Editors"')?></p>
+                <p><?=sprintf(___('devcp_uploader_p_update_version'), '/developers/versions/edit/', '/developers/addon/status/'.$addon_id)?>
+                <div class="action-button-container centered"><a id="complete-link" href="<?=$html->url('/developers/versions/edit/')?>" class="action-button rounded"><?=___('devcp_uploader_button_release')?></a></div>
             </div>
         </div><!-- /#version-created-content -->
     <?php elseif ($type == 'file'): ?>
         <div id="file-created-content">
-            <h3>File Added!</h3>
+            <h3><?=___('devcp_uploader_header_file_added')?></h3>
             <div id="created-results">
-                <p>Your new file has been added to version <?=$version?> and is currently marked as <span id="new-file-status"></span>.</p>
-                <p id="pending-message">The new version will be available to the public as soon as an editor is able to review it. There are currently <span id="queue-count"></span> other add-ons in the queue. Want to be reviewed faster? Consider <a href="http://wiki.sugarlabs.org/go/ActivityTeam/aslo">becoming an editor</a>.</p>
-                <p>View your new file in the <a href="<?=$html->url('/developers/versions/edit/'.$version_id)?>">Versions and Files page</a>, or check out your add-on's <a href="<?=$html->url('/developers/addon/status/'.$addon_id)?>">current status</a>.</p>
+                <p><?=sprintf(___('devcp_uploader_file_created'), $version, '<span id="new-file-status"></span>')?></p>
+                <p id="pending-message"><?=sprintf(___('devcp_uploader_p_pending_file'), '<span id="queue-count"></span>', 'href="https://wiki.mozilla.org/Update:Editors"')?></p>
+                <p><?=sprintf(___('devcp_uploader_p_update_file'), '/developers/versions/edit/', '/developers/addon/status/'.$addon_id)?>
             </div>
         </div><!-- /#file-created-content -->
     <?php endif; ?>
diff --git a/site/app/views/developers/versions.thtml b/site/app/views/developers/versions.thtml
index 1fd67d9..323ba34 100644
--- a/site/app/views/developers/versions.thtml
+++ b/site/app/views/developers/versions.thtml
@@ -40,22 +40,22 @@
     <?=$this->renderElement('developers/sidebar', array('addons' => $all_addons, 'extra' => 'developers/editbox'));?>
 
     <div id="content-main" class="<?=($author_role >= AUTHOR_ROLE_DEV ? 'privs' : 'no-privs')?>">
-        <?=$this->renderElement('developers/addonheader', array('title' => "Edit {$addon_name}", 'addon_id' => $addon_id));?>
+        <?=$this->renderElement('developers/addonheader', array('title' => sprintf(___('devcp_title_edit_addon'), $addon_name), 'addon_id' => $addon_id));?>
         <?php
         if (!empty($deleteSuccess)) {
-            echo '<div class="notice-success rounded"><span>Version '.$deletedVersion.' deleted successfully.</span></div>';
+            echo '<div class="notice-success rounded"><span>'.sprintf(___('devcp_versions_notice_success'), $deletedVersion).'</span></div>';
         }
         ?>
-        <h2>Manage Versions and Files</h2>
+        <h2><?=___('devcp_versions_header_manage')?></h2>
         <?=$this->renderElement('noscript')?>
         <?=$this->renderElement('developers/rolecheck')?>
         <div class="graybox spaced rounded">
             <table id="versions-table" class="pretty-table">
             <?php
                 echo '<tr>';
-                echo '<th style="width: 25%;">Version</th>';
-                echo '<th style="width: 30%;">File Status</th>';
-                echo '<th style="width: 30%;">Created</th>';
+                echo '<th style="width: 25%;">'.___('devcp_versions_th_version').'</th>';
+                echo '<th style="width: 30%;">'.___('devcp_versions_th_status').'</th>';
+                echo '<th style="width: 30%;">'.___('devcp_versions_th_created').'</th>';
                 echo '<th style="width: 15%;"></th>';
                 echo '</tr>';
                 if (!empty($versions)) {
@@ -68,15 +68,15 @@
                         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">Remove?</a>';
+                            echo '<a href="#" onclick="versions.deleteVersion(this); return false;" class="remove-button rounded trigger">'.___('devcp_versions_a_remove').'</a>';
                             echo '<div class="inline-delete-box">';
-                            echo '<p>This version has no files associated with it and can be removed. Would you like to remove this version?</p><br />';
-                            echo '<p><a href="'.$html->url('/developers/versions/delete/'.$version['Version']['id']).'"  class="remove-button rounded">Remove Empty Version</a>&nbsp;&nbsp;';
-                            echo '<a href="#" onclick="versions.cancelDelete(this); return false;" class="button rounded">Cancel</a></p>';
+                            echo '<p>'.___('devcp_versions_p_remove').'</p><br />';
+                            echo '<p><a href="'.$html->url('/developers/versions/delete/'.$version['Version']['id']).'"  class="remove-button rounded">'.___('devcp_versions_a_empty').'</a>&nbsp;&nbsp;';
+                            echo '<a href="#" onclick="versions.cancelDelete(this); return false;" class="button rounded">'.___('devcp_versions_a_cancel').'</a></p>';
                             echo '</div></div>';
                         }
                         else {
-                            echo '<a href="'.$html->url('/developers/versions/delete/'.$version['Version']['id']).'">'.$html->image('developers/delete.png', array('alt' => 'Delete Version', 'title' => 'Delete Version')).'</a>';
+                            echo '<a href="'.$html->url('/developers/versions/delete/'.$version['Version']['id']).'">'.$html->image('developers/delete.png', array('alt' => ___('devcp_versions_a_delete'), 'title' => ___('devcp_versions_a_delete'))).'</a>';
                         }
                         echo '</td>';
                         echo '</tr>';
@@ -84,11 +84,11 @@
                     }
                 }
                 else {
-                    echo '<tr><td colspan="3" style="text-align: center;"><i>No versions.</i></td></tr>';
+                    echo '<tr><td colspan="3" style="text-align: center;"><i>'.___('devcp_versions_no_versions').'</i></td></tr>';
                 }
             ?>
             </table>
-            <div class="add-button-container"><a href="<?=$html->url("/developers/versions/add/{$addon_id}")?>" class="add-button rounded">Add New Version</a></div>
+<div class="add-button-container"><a href="<?=$html->url("/developers/versions/add/{$addon_id}")?>" class="add-button rounded"><?=___('devcp_versions_add')?></a></div>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/site/app/views/developers/versions_delete.thtml b/site/app/views/developers/versions_delete.thtml
index ff5016a..c1d7d67 100644
--- a/site/app/views/developers/versions_delete.thtml
+++ b/site/app/views/developers/versions_delete.thtml
@@ -40,20 +40,24 @@
     <?=$this->renderElement('developers/sidebar', array('addons' => $all_addons, 'extra' => 'developers/editbox'));?>
 
     <div id="content-main">
-        <?=$this->renderElement('developers/addonheader', array('title' => "Edit {$addon_name}", 'addon_id' => $addon_id));?>
+        <?=$this->renderElement('developers/addonheader', array('title' => sprintf(___('devcp_title_edit_addon'), $addon_name), 'addon_id' => $addon_id));?>
         <?=$this->renderElement('noscript')?>
         <form id="versions-delete-form" action="" method="post">
         <?=$html->hiddenSession();?>
         <div class="graybox rounded">
-            <h4>Delete Version <?=$version['Version']['version']?>?</h4>
-            <p class="smallmargin">Are you sure you want to permanently delete version <?=$version['Version']['version']?>?</p>
-            <p>This will also delete its <?=count($version['Review'])?> review(s) and <?=count($version['File'])?> file(s).</p>
+            <h4><?=sprintf(___('devcp_versions_delete_header'), $version['Version']['version'])?></h4>
+            <p class="smallmargin"><?=sprintf(___('devcp_versions_delete_sure'), $version['Version']['version'])?></p>
+            <p><?=___('devcp_versions_delete_also')?></p>
+            <ul>
+                <li><?=sprintf(n___('devcp_versions_delete_reviews', 'devcp_versions_delete_reviews', count($version['Review'])), count($version['Review']))?></li>
+                <li><?=sprintf(n___('devcp_versions_delete_files', 'devcp_versions_delete_files', count($version['File'])), count($version['File']))?></li>
+            </ul>
             <div>
-                <a href="#" onclick="versions_delete.confirm(); return false;" class="remove-button rounded">Delete Version</a>
+                <a href="#" onclick="versions_delete.confirm(); return false;" class="remove-button rounded"><?=___('devcp_versions_delete_a_delete')?></a>
                 <input type="hidden" name="confirmDelete" value="1"/>&nbsp;&nbsp;
-                <a href="<?=$html->url('/developers/versions/'.$addon_id)?>" class="button rounded">Cancel</a>
+                <a href="<?=$html->url('/developers/versions/'.$addon_id)?>" class="button rounded"><?=___('devcp_versions_delete_a_cancel')?></a>
             </div>
         </div>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/site/app/views/developers/versions_edit.thtml b/site/app/views/developers/versions_edit.thtml
index c3dc730..da0504e 100644
--- a/site/app/views/developers/versions_edit.thtml
+++ b/site/app/views/developers/versions_edit.thtml
@@ -40,16 +40,16 @@
     <?=$this->renderElement('developers/sidebar', array('addons' => $all_addons, 'extra' => 'developers/editbox'));?>
 
     <div id="content-main" class="<?=($author_role >= AUTHOR_ROLE_DEV ? 'privs' : 'no-privs')?>">
-        <?=$this->renderElement('developers/addonheader', array('title' => "Edit {$addon_name}", 'addon_id' => $addon_id));?>
+        <?=$this->renderElement('developers/addonheader', array('title' => sprintf(___('devcp_title_edit_addon'), $addon_name), 'addon_id' => $addon_id));?>
         <?php
         if (!empty($success)) {
-            echo '<div class="notice-success rounded"><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.</div>';
+            echo '<div class="notice-success rounded">'.___('devcp_notice_changes_saved').'</div>';
         }
         if (!empty($errors)) {
-            echo '<div class="notice-error rounded"><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.</div>';
+            echo '<div class="notice-error rounded">'.___('devcp_notice_changes_error').'</div>';
         }
         ?>
-        <h2>Manage Version <?=$version['Version']['version']?></h2>
+        <h2><?=sprintf(___('devcp_versions_edit_header_manage'), $version['Version']['version'])?></h2>
         <?=$this->renderElement('noscript')?>
         <?=$this->renderElement('developers/rolecheck')?>
         <form id="versions-edit-form" action="" method="post">
@@ -70,14 +70,14 @@
                             );
         
         echo '<div class="graybox rounded spaced field">';
-        echo '<h4>File Information</h4>';
+        echo '<h4>'.___('devcp_versions_edit_header_file').'</h4>';
         if (!empty($version['File'])) {
             echo '<table id="files-table" class="pretty-table">';
             echo '<thead><tr>';
-            echo '<th>File</th>';
-            echo '<th>Platform</th>';
-            echo '<th>Size</th>';
-            echo '<th>Status</th>';
+            echo '<th>'.___('devcp_versions_edit_th_file').'</th>';
+            echo '<th>'.___('devcp_versions_edit_th_platform').'</th>';
+            echo '<th>'.___('devcp_versions_edit_th_size').'</th>';
+            echo '<th>'.___('devcp_versions_edit_th_status').'</th>';
             echo '<th style="width: 25px;"></th>';
             echo '</tr></thead><tbody>';
             $i = 0;
@@ -94,11 +94,11 @@
                 echo '<td>'.sprintf(_('size_kb'), $file['size']).'</td>';
                 echo '<td>'.$statuses[$file['status']].'</td>';
                 echo '<td><div class="inline-delete-button uses-image">';
-                echo '<a href="#" onclick="versions_edit.deleteVersion(this); return false;">'.$html->image('developers/delete.png', array('alt' => 'Delete File', 'title' => 'Delete File')).'</a>';
+                echo '<a href="#" onclick="versions_edit.deleteVersion(this); return false;">'.$html->image('developers/delete.png', array('alt' => ___('devcp_versions_edit_img_delete'), 'title' => ___('devcp_versions_edit_img_delete'))).'</a>';
                 echo '<div class="inline-delete-box">';
-                echo '<p>Are you <b>sure</b> you wish to permanently delete this file?</p><br />';
-                echo '<p><a href="#" onclick="versions_edit.confirmDelete(this); return false;" class="remove-button rounded">Delete File</a>&nbsp;&nbsp;';
-                echo '<a href="#" onclick="versions_edit.cancelDelete(this); return false;" class="button rounded">Cancel</a></p>';
+                echo '<p>'.___('devcp_versions_edit_delete_sure').'</p><br />';
+                echo '<p><a href="#" onclick="versions_edit.confirmDelete(this); return false;" class="remove-button rounded">'.___('devcp_versions_edit_a_delete').'</a>&nbsp;&nbsp;';
+                echo '<a href="#" onclick="versions_edit.cancelDelete(this); return false;" class="button rounded">'.___('devcp_versions_edit_a_cancel').'</a></p>';
                 echo '</div>';
                 echo '</div></td>';
                 echo '</tr>';
@@ -107,17 +107,17 @@
             echo '</tbody></table>';
         }
         else {
-            echo '<p><i>No files found.</i></p>';
+            echo '<p><i>'.___('devcp_versions_edit_no_files').'</i></p>';
         }
-        echo '<div class="save-changes rounded"><strong>You have unsaved changes.</strong> Files will not be deleted until you click Update Version below.</div>';
-        echo '<div class="add-button-container"><a href="'.$html->url("/developers/versions/addfile/{$version['Version']['id']}").'" class="add-button rounded">Add New File</a></div>';
+        echo '<div class="save-changes rounded">'.___('devcp_versions_edit_unsaved_files').'</div>';
+        echo '<div class="add-button-container"><a href="'.$html->url("/developers/versions/addfile/{$version['Version']['id']}").'" class="add-button rounded">'.___('devcp_versions_edit_add').'</a></div>';
         echo '</div>';
         
         // Compatible applications (hidden for search engines)
         if ($addon['Addon']['addontype_id'] != ADDON_SEARCH) {
             echo '<div class="graybox rounded spaced field">';
-            echo '<h4>Compatible Applications</h4>';
-            echo '<p>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 href="'.$html->url('/pages/appversions').'">List of supported applications and versions</a></p>';
+            echo '<h4>'.___('devcp_versions_edit_header_compat').'</h4>';
+            echo '<p>'.sprintf(___('devcp_versions_edit_adjust'), '/pages/appversions').'</p>';
             
             echo '<table id="edit-versions-targetapps-table" class="pretty-table"><tbody>';
             $i = 0;
@@ -147,11 +147,11 @@
                     echo '</select></td>';
                     echo '<td style="width: 25px;">';
                     echo '<div class="inline-delete-button uses-image">';
-                    echo '<a href="#" onclick="versions_edit.deleteVersion(this); return false;">'.$html->image('developers/delete.png', array('alt' => 'Remove Application Compatibility', 'title' => 'Remove Application Compatibility')).'</a>';
-                     echo '<div class="inline-delete-box">';
-                    echo '<p>Are you <b>sure</b> you wish to remove compatibility with this application?</p><br />';
-                    echo '<p><a href="#" onclick="versions_edit.confirmDelete(this); return false;" class="remove-button rounded">Remove Application</a>&nbsp;&nbsp;';
-                    echo '<a href="#" onclick="versions_edit.cancelDelete(this); return false;" class="button rounded">Cancel</a></p>';
+                    echo '<a href="#" onclick="versions_edit.deleteVersion(this); return false;">'.$html->image('developers/delete.png', array('alt' => ___('devcp_versions_edit_remove_compat'), 'title' => ___('devcp_versions_edit_remove_compat'))).'</a>';
+                    echo '<div class="inline-delete-box">';
+                    echo '<p>'.___('devcp_versions_edit_compat_sure').'</p><br />';
+                    echo '<p><a href="#" onclick="versions_edit.confirmDelete(this); return false;" class="remove-button rounded">'.___('devcp_versions_edit_a_remove_app').'</a>&nbsp;&nbsp;';
+                    echo '<a href="#" onclick="versions_edit.cancelDelete(this); return false;" class="button rounded">'.___('devcp_versions_edit_a_cancel').'</a></p>';
                     echo '</div>';
                     echo '</div></td>';
                     
@@ -160,10 +160,10 @@
                 }
             }
             echo '</tbody></table>';
-            echo '<div class="save-changes rounded"><strong>You have unsaved changes.</strong> Compatibility will not be modified until you click Update Version below.</div>';
-            echo '<div class="add-button-container" style="width: 60%; margin: 10px auto 0;"><a href="#" onclick="versions_edit.showAppPicker(); return false;" class="add-button rounded">Add New Application</a>';
+            echo '<div class="save-changes rounded">'.___('devcp_versions_edit_unsaved_compat').'</div>';
+            echo '<div class="add-button-container" style="width: 60%; margin: 10px auto 0;"><a href="#" onclick="versions_edit.showAppPicker(); return false;" class="add-button rounded">'.___('devcp_versions_edit_a_new_app').'</a>';
             echo '<span id="new-app-picker"><select onchange="versions_edit.addApplication(this);">';
-            echo '<option value="">Please Select an Application</option>';
+            echo '<option value="">'.___('devcp_versions_edit_select_app').'</option>';
             foreach ($applications as $application_id => $application_name) {
                 echo '<option value="'.$application_id.'">'.$application_name.'</option>';
             }
@@ -178,26 +178,26 @@
                     'translations' => $translations['releasenotes'],
                     'height' => '130',
                     'width' => 'inherit',
-                    'displayName' => 'Release Notes',
-                    'description' => '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.'
+                    'displayName' => ___('devcp_versions_edit_transbox_releasenotes_name'),
+                    'description' => ___('devcp_versions_edit_transbox_releasenotes_description'),
                 ));
         
         echo '<div class="graybox rounded spaced field">';
-        echo '<h4>Approval Information</h4>';
+        echo '<h4>'.___('devcp_versions_edit_header_approval').'</h4>';
         if (!empty($version['File'])) {
             echo '<ul>';
             foreach ($version['File'] as $file) {
-                echo '<li>'.sprintf('File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s', $file['id'], $platforms[$file['platform_id']], strftime(_('date'), strtotime($file['created'])), $statuses[$file['status']], strftime(_('date'), strtotime($file['datestatuschanged']))).'</li>';
+                echo '<li>'.sprintf(___('devcp_versions_edit_li_file'), $file['id'], $platforms[$file['platform_id']], strftime(_('date'), strtotime($file['created'])), $statuses[$file['status']], strftime(_('date'), strtotime($file['datestatuschanged']))).'</li>';
             }
             echo '</ul>';
         }
-        echo '<h5>Approval Notes</h5>';
-        echo '<p class="smallmargin">Optional information for the Editor that reviews this version.</p>';
+        echo '<h5>'.___('devcp_versions_edit_header_notes').'</h5>';
+        echo '<p class="smallmargin">'.___('devcp_versions_edit_optional').'</p>';
         echo '<textarea name="data[Version][approvalnotes]" cols="" rows="" style="width: 100%; height: 70px;" class="rounded">'.$version['Version']['approvalnotes'].'</textarea>';
         echo '</div>';
         ?>
         
-        <div class="action-button-container centered"><a href="#" onclick="versions_edit.save(); return false;" class="action-button rounded">Update Version</a></div>
+        <div class="action-button-container centered"><a href="#" onclick="versions_edit.save(); return false;" class="action-button rounded"><?=___('devcp_versions_edit_update')?></a></div>
         </form>
     </div>
 </div>
diff --git a/site/app/views/editors/email/inforequest_plain.thtml b/site/app/views/editors/email/inforequest_plain.thtml
new file mode 100644
index 0000000..6d99f11
--- /dev/null
+++ b/site/app/views/editors/email/inforequest_plain.thtml
@@ -0,0 +1,13 @@
+A Mozilla Add-ons Editor requested further information from you regarding version <?=$info['version']?> of your add-on <?=$info['name']?>.
+
+<?=$info['reviewer']?> wrote:
+
+"<?=$info['comments']?>"
+
+Please go to <?=FULL_BASE_URL.$html->url("/developers/discuss/{$info['infoid']}", true, true, false)?> to reply.
+
+
+If you have further questions, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org.
+
+Mozilla Add-ons
+<?=SITE_URL?>
diff --git a/site/app/views/editors/email/inforequest_reply_plain.thtml b/site/app/views/editors/email/inforequest_reply_plain.thtml
new file mode 100644
index 0000000..4a3d859
--- /dev/null
+++ b/site/app/views/editors/email/inforequest_reply_plain.thtml
@@ -0,0 +1,11 @@
+<?=$info['sender']?> has commented on version <?=$info['version']?> of the add-on <?=$info['name']?>:
+
+"<?=$info['comments']?>"
+
+Please go to <?=FULL_BASE_URL.$html->url("/developers/discuss/{$info['infoid']}", true, true, false)?> if you would like to reply.
+
+
+If you have further questions, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org.
+
+Mozilla Add-ons
+<?=SITE_URL?>
diff --git a/site/app/views/editors/email/nominated/public_plain.thtml b/site/app/views/editors/email/nominated/public_plain.thtml
index 86072da..4f161e5 100644
--- a/site/app/views/editors/email/nominated/public_plain.thtml
+++ b/site/app/views/editors/email/nominated/public_plain.thtml
@@ -8,7 +8,7 @@ You can view your public add-on now at: <?=SITE_URL?>/addon/<?=$info['id']?>
 Review Information:
 Reviewer: <?=$info['reviewer']?>
 
-Comments: <?=nl2br($info['comments'])?>
+Comments: <?=$info['comments']?>
 
 
 If you have questions about this review, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org.
diff --git a/site/app/views/editors/email/nominated/sandbox_plain.thtml b/site/app/views/editors/email/nominated/sandbox_plain.thtml
index fe86809..71caaa9 100644
--- a/site/app/views/editors/email/nominated/sandbox_plain.thtml
+++ b/site/app/views/editors/email/nominated/sandbox_plain.thtml
@@ -3,7 +3,7 @@ Your nominated add-on, <?=$info['name']?>, has been reviewed by a <?=SITE_NAME?>
 Review Information:
 Reviewer: <?=$info['reviewer']?>
 
-Comments: <?=nl2br($info['comments'])?>
+Comments: <?=$info['comments']?>
 
 
 If you have questions about this review, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org.
diff --git a/site/app/views/editors/email/notify_update_plain.thtml b/site/app/views/editors/email/notify_update_plain.thtml
new file mode 100644
index 0000000..5694fd3
--- /dev/null
+++ b/site/app/views/editors/email/notify_update_plain.thtml
@@ -0,0 +1,19 @@
+Dear editor,
+
+An add-on you previously reviewed was just updated.
+
+
+Add-on Information:
+
+Name: <?=$info['name']?> 
+URL: <?=FULL_BASE_URL.$html->url("/addon/{$info['id']}")?> 
+
+Version Number: <?=$info['version']?> 
+Review Link: <?=FULL_BASE_URL.$html->url("/editors/review/{$info['versionid']}")?> 
+
+
+Thanks!
+Mozilla Add-ons
+<?=SITE_URL?>
+
+This is a one-time notification sent to you because you requested a follow up email regarding queue activity for <?=$info['name']?>.  There is no need to unsubscribe if you don't wish to receive further mail.
diff --git a/site/app/views/editors/email/pending/public_plain.thtml b/site/app/views/editors/email/pending/public_plain.thtml
index 19b5157..8e099a7 100644
--- a/site/app/views/editors/email/pending/public_plain.thtml
+++ b/site/app/views/editors/email/pending/public_plain.thtml
@@ -11,7 +11,7 @@ Reviewer: <?=$info['reviewer']?>
 
 Tested on <?=$info['os']?> with <?=$info['apps']?>
 
-Comments: <?=nl2br($info['comments'])?>
+Comments: <?=$info['comments']?>
 
 
 If you have questions about this review, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org.
diff --git a/site/app/views/editors/email/pending/sandbox_plain.thtml b/site/app/views/editors/email/pending/sandbox_plain.thtml
index 8a08d33..8bcc353 100644
--- a/site/app/views/editors/email/pending/sandbox_plain.thtml
+++ b/site/app/views/editors/email/pending/sandbox_plain.thtml
@@ -6,7 +6,7 @@ Reviewer: <?=$info['reviewer']?>
 
 Tested on <?=$info['os']?> with <?=$info['apps']?>
 
-Comments: <?=nl2br($info['comments'])?>
+Comments: <?=$info['comments']?>
 
 
 If you have questions about this review, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org.
diff --git a/site/app/views/editors/email/superreview_plain.thtml b/site/app/views/editors/email/superreview_plain.thtml
index 6a5ac65..8eb4a8b 100644
--- a/site/app/views/editors/email/superreview_plain.thtml
+++ b/site/app/views/editors/email/superreview_plain.thtml
@@ -10,7 +10,7 @@ Please open your plethora of knowledge and wield your mighty administrative swor
 Review Information:
 Reviewer: <?=$info['reviewer']?>
 
-Comments: <?=nl2br($info['comments'])?>
+Comments: <?=$info['comments']?>
 
 
 Love,
diff --git a/site/app/views/editors/review.thtml b/site/app/views/editors/review.thtml
index fd26be7..f0229d4 100644
--- a/site/app/views/editors/review.thtml
+++ b/site/app/views/editors/review.thtml
@@ -120,10 +120,10 @@
 
                 echo '<li>';
                 echo $html->checkbox('Approval/File][', null, array('value' => $file['id'], 'class' => 'fileCheckbox', 'checked' => $checked, 'disabled' => $file['disabled'], 'onClick' => 'selectedFile();'));
-                echo '&nbsp;<b>'.$html->link($platforms[$file['platform_id']], '/downloads/file/'.$file['id'].'/'.$file['filename'], array('onClick' => $this->controller->Amo->installTrigger($addon['Addon']['addontype_id'], $html->url('/downloads/file/'.$file['id'].'/'.$file['filename']), $addon['Translation']['name']['string'].' '.$version['Version']['version'], '', $file['hash']).' return false;')).'</b>';
+                echo '&nbsp;<b>'.$html->link($platforms[$file['platform_id']], '/downloads/file/'.$file['id'].'/'.$file['filename'], array('onClick' => $this->controller->Amo->installTrigger($addon['Addon']['addontype_id'], FULL_BASE_URL.$html->url('/downloads/file/'.$file['id'].'/'.$file['filename']), $addon['Translation']['name']['string'].' '.$version['Version']['version'], '', $file['hash']).' return false;')).'</b>';
                 echo ' - '.$approval[$file['status']].' ('.$file['created'].')';
                 echo ' - '.$html->link(_('editors_review_file_viewcontents_link'), '/files/browse/'.$file['id'].'/1');
-                if ($has_public) {
+                if ($has_public && $addontype != ADDON_SEARCH) {
 		        //if (count($addon['Version']) > 1) {
                 	echo ' - '.$html->link(_('editors_review_file_diff_link'), '/files/diff/'.$file['id'].'/');
 		        }
@@ -150,6 +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', '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">
@@ -170,10 +171,15 @@
             echo _('editors_review_details_nominated_sandbox');
             echo '</div>';
         }
-        echo '<div id="details-superreview" style="display: none;">';
-        echo _('editors_review_details_superreview');
-        echo '</div>';
     ?>
+        <div id="details-info" style="display: none;">
+        <?=___('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');?>
+        </div>
     </div>
     <div id="subform" style="display: none;">
         <div id="commentsbox">
@@ -183,7 +189,7 @@
         <?php
             if (!empty($cannedresponses)) {
                 echo '<div id="canned">';
-                echo _('editors_review_label_cannedresponse');
+                echo _('editors_review_label_cannedresponse').' ';
                 echo $html->selectTag('Approval/CannedResponse', $cannedresponses, null, array("onChange" => "document.getElementById('comments').value = this.value;", 'class' => 'input'));
                 echo '</div>';
             }
@@ -202,6 +208,13 @@
         <?
             }
         ?>
+        <div id="subscribe">
+            <?php
+            $_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>
+        </div>
         <div id="finish">
             <?=$html->submit(_('editors_review_submit_process_action'), array('id' => 'process', 'onClick' => 'return validateReview(\''.$reviewType.'\');'))?>
         </div>
@@ -278,37 +291,8 @@ if (!empty($addon['Translation']['developercomments']['string'])) {
         </tr>
     <?php
         if (!empty($history)) {
-            foreach ($history as $hist) {
-                echo '<tr>';
-                    echo '<td>'.$hist['Version']['version'].' ('.$platforms[$hist['File']['platform_id']].')</td>';
-                    echo '<td>'.$hist['Approval']['created'].'</td>';
-                    echo '<td>'.$html->linkEmail($hist['User']['firstname'].' '.$hist['User']['lastname'], $hist['User']['email']).'</td>';
-                    echo '<td>';
-                    if ($hist['Approval']['reviewtype'] == 'nominated') {
-                        if ($hist['Approval']['action'] == STATUS_PUBLIC) {
-                            echo _('editors_review_history_nominated_approved');
-                        }
-                        elseif ($hist['Approval']['action'] == STATUS_SANDBOX) {
-                            echo _('editors_review_history_nominated_denied');
-                        }
-                        elseif ($hist['Approval']['action'] == STATUS_NOMINATED) {
-                            echo _('editors_review_history_nominated_adminreview');
-                        }
-                    }
-                    elseif ($hist['Approval']['reviewtype'] == 'pending') {
-                        if ($hist['Approval']['action'] == STATUS_PUBLIC) {
-                            echo _('editors_review_history_pending_approved');
-                        }
-                        elseif ($hist['Approval']['action'] == STATUS_SANDBOX) {
-                            echo _('editors_review_history_pending_denied');
-                        }
-                        elseif ($hist['Approval']['action'] == STATUS_PENDING) {
-                            echo _('editors_review_history_pending_adminreview');
-                        }
-                    }
-                    echo '</td>';
-                    echo '<td>'.nl2br($hist['Approval']['comments']).'</td>';
-                echo '</tr>';
+            foreach ($history as &$hist) {
+                echo $this->renderElement('developers/editors_review_history_item', array('hist'=>$hist));
             }
         }
         else {
diff --git a/site/app/views/elements/addon_discussionheader.thtml b/site/app/views/elements/addon_discussionheader.thtml
index ff8225b..1dd3fae 100644
--- a/site/app/views/elements/addon_discussionheader.thtml
+++ b/site/app/views/elements/addon_discussionheader.thtml
@@ -51,7 +51,6 @@ $addonID = $addon['Addon']['id'];
 $addonName = $addon['Translation']['name']['string'];
 $hasVersion = (isset($addon['Version']) && !empty($addon['Version']));
 $addonVersion = ($hasVersion ? $addon['Version'][0]['version'] : '');
-$addonCreated = $addon['Addon']['created'];
 $addonCreators = $addon['User'];
 $addonSummary = $addon['Translation']['summary']['string'];
 
diff --git a/site/app/views/elements/addon_listitem.thtml b/site/app/views/elements/addon_listitem.thtml
index ccbb11c..9bcfd94 100644
--- a/site/app/views/elements/addon_listitem.thtml
+++ b/site/app/views/elements/addon_listitem.thtml
@@ -59,7 +59,6 @@ if ($hasFiles) {
     return;
 }
 
-$addonCreated = $addon['Addon']['created'];
 $addonCreators = $addon['User'];
 $addonSummary = $addon['Translation']['summary']['string'];
 
@@ -90,12 +89,6 @@ if (isset($addonIconPath) && !empty($addonIconPath))
     $icon = '<img src="'.$addonIconPath.'" class="icon" alt=""/>';
 else
     $icon = '';
-// prepare version string
-if ($hasVersion)
-    $version = sprintf(_('addon_display_header_version'), $addonVersion)
-        .' &mdash; '. strftime(_('date'), strtotime($addonCreated));
-else
-    $version = '';
 
 // prepare categories
 if (!empty($addon['Tag'])) {
diff --git a/site/app/views/elements/collections_interactive_addon.thtml b/site/app/views/elements/collections_interactive_addon.thtml
index 735e40f..eb8edbb 100644
--- a/site/app/views/elements/collections_interactive_addon.thtml
+++ b/site/app/views/elements/collections_interactive_addon.thtml
@@ -82,7 +82,7 @@ if (!isset($addonSummary) || empty($addonSummary))
     <div class="item-desc">
         <h4><?=$html->link("$icon <span>$addonName</span>", "/addon/{$addonID}");?></h4>
         <?php if(isset($showDate) && $showDate == true){ ?>
-            <p class="date-added"><?php echo sprintf(_('added'), strftime(_('date'), strtotime($addonDateAdded))); ?></p>
+            <p class="date-added"><?php echo sprintf(_('collections_interactive_addon_added'), strftime(_('date'), strtotime($addonDateAdded))); ?></p>
         <?php } ?>
         
         <p class="desc"><?=$addonSummary?> <?=$html->link('Learn more...', "/addon/{$addonID}")?></p>
diff --git a/site/app/views/elements/developers/editbox.thtml b/site/app/views/elements/developers/editbox.thtml
index 889e1e2..530bab1 100644
--- a/site/app/views/elements/developers/editbox.thtml
+++ b/site/app/views/elements/developers/editbox.thtml
@@ -39,24 +39,24 @@
 <div class="pitch">
     <h4><?=$html->link($addon_name, '/developers/dashboard#addon-'.$addon_id)?></h4>
     <ul class="actionbar">
-        <li class="displaypage"><?=$html->link('View Listing', "/addon/{$addon_id}/")?></li>
-        <li class="edit<?=($action == 'edit' ? ' selected' : '')?>"><?=$html->link('Edit Add-on', "/developers/addon/edit/{$addon_id}/")?></li>
+        <li class="displaypage"><?=$html->link(___('devcp_editbox_view_listing'), "/addon/{$addon_id}/")?></li>
+        <li class="edit<?=($action == 'edit' ? ' selected' : '')?>"><?=$html->link(___('devcp_editbox_edit_addon'), "/developers/addon/edit/{$addon_id}/")?></li>
         <?php if ($action == 'edit'): ?>
         <li class="container"><ul>
-            <li class="edit-authors<?=($subaction == 'authors' ? ' selected' : '')?>"><?=$html->link('Authors', "/developers/addon/edit/{$addon_id}/authors")?></li>
-            <li class="edit-categories<?=($subaction == 'categories' ? ' selected' : '')?>"><?=$html->link('Categories', "/developers/addon/edit/{$addon_id}/categories")?></li>
-            <li class="edit-descriptions<?=($subaction == 'descriptions' ? ' selected' : '')?>"><?=$html->link('Descriptions', "/developers/addon/edit/{$addon_id}/descriptions")?></li>
-            <li class="edit-properties<?=($subaction == 'properties' ? ' selected' : '')?>"><?=$html->link('Properties', "/developers/addon/edit/{$addon_id}/properties")?></li>
+        <li class="edit-authors<?=($subaction == 'authors' ? ' selected' : '')?>"><?=$html->link(___('devcp_editbox_authors'), "/developers/addon/edit/{$addon_id}/authors")?></li>
+        <li class="edit-categories<?=($subaction == 'categories' ? ' selected' : '')?>"><?=$html->link(___('devcp_editbox_categories'), "/developers/addon/edit/{$addon_id}/categories")?></li>
+        <li class="edit-descriptions<?=($subaction == 'descriptions' ? ' selected' : '')?>"><?=$html->link(___('devcp_editbox_descriptions'), "/developers/addon/edit/{$addon_id}/descriptions")?></li>
+        <li class="edit-properties<?=($subaction == 'properties' ? ' selected' : '')?>"><?=$html->link(___('devcp_editbox_properties'), "/developers/addon/edit/{$addon_id}/properties")?></li>
         </ul></li>
         <?php endif; ?>
-        <li class="status<?=($action == 'status' ? ' selected' : '')?>"><?=$html->link('Change Status', "/developers/addon/status/{$addon_id}/")?></li>
-        <li class="statistics"><?=$html->link('Statistics Dashboard', "/statistics/addon/{$addon_id}/")?></li>
-        <li class="versions<?=($action == 'versions' ? ' selected' : '')?>"><?=$html->link('Versions and Files', "/developers/versions/{$addon_id}/")?></li>
+        <li class="status<?=($action == 'status' ? ' selected' : '')?>"><?=$html->link(___('devcp_editbox_change_status'), "/developers/addon/status/{$addon_id}/")?></li>
+        <li class="statistics"><?=$html->link(___('devcp_editbox_statistics_dashboard'), "/statistics/addon/{$addon_id}/")?></li>
+        <li class="versions<?=($action == 'versions' ? ' selected' : '')?>"><?=$html->link(___('devcp_editbox_versions'), "/developers/versions/{$addon_id}/")?></li>
         <?php if ($action == 'versions'): ?>
         <li class="container"><ul>
-            <li class="versions-add<?=($subaction == 'add' ? ' selected' : '')?>"><?=$html->link('New Version', "/developers/versions/add/{$addon_id}")?></li>
+        <li class="versions-add<?=($subaction == 'add' ? ' selected' : '')?>"><?=$html->link(___('devcp_editbox_new_version'), "/developers/versions/add/{$addon_id}")?></li>
         </ul></li>
         <?php endif; ?>
-        <li class="previews<?=($action == 'previews' ? ' selected' : '')?>"><?=$html->link('Preview Screenshots', "/developers/previews/{$addon_id}/")?></li>
+        <li class="previews<?=($action == 'previews' ? ' selected' : '')?>"><?=$html->link(___('devcp_editbox_screenshots'), "/developers/previews/{$addon_id}/")?></li>
     </ul>
 </div>
\ No newline at end of file
diff --git a/site/app/views/elements/developers/editors_review_history_item.thtml b/site/app/views/elements/developers/editors_review_history_item.thtml
new file mode 100644
index 0000000..349ab62
--- /dev/null
+++ b/site/app/views/elements/developers/editors_review_history_item.thtml
@@ -0,0 +1,101 @@
+<?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
+ * Frederic Wenzel <fwenzel@mozilla.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 element uses the following local variables:
+ * - $hist -- review history item
+ */
+if (!empty($hist['Approval']['reply_to']))
+    $trclass="class=\"hidden reply_to_{$hist['Approval']['reply_to']}\"";
+else
+    $trclass="";
+?>
+
+<tr <?=$trclass?>>
+    <td><?php if (!empty($hist['Version'])) echo "{$hist['Version']['version']} ({$platforms[$hist['File']['platform_id']]})"?></td>
+    <td><?=$hist['Approval']['created']?></td>
+    <td><?=$html->linkEmail($hist['User']['firstname'].' '.$hist['User']['lastname'], $hist['User']['email'])?></td>
+    <td>
+    <?php
+    if ($hist['Approval']['reviewtype'] == 'nominated') {
+        if ($hist['Approval']['action'] == STATUS_PUBLIC) {
+            echo _('editors_review_history_nominated_approved');
+        }
+        elseif ($hist['Approval']['action'] == STATUS_SANDBOX) {
+            echo _('editors_review_history_nominated_denied');
+        }
+        elseif ($hist['Approval']['action'] == STATUS_NOMINATED) {
+            echo _('editors_review_history_nominated_adminreview');
+        }
+    }
+    elseif ($hist['Approval']['reviewtype'] == 'pending') {
+        if ($hist['Approval']['action'] == STATUS_PUBLIC) {
+            echo _('editors_review_history_pending_approved');
+        }
+        elseif ($hist['Approval']['action'] == STATUS_SANDBOX) {
+            echo _('editors_review_history_pending_denied');
+        }
+        elseif ($hist['Approval']['action'] == STATUS_PENDING) {
+            echo _('editors_review_history_pending_adminreview');
+        }
+    }
+    elseif ($hist['Approval']['reviewtype'] == 'info') {
+        if (empty($hist['Approval']['reply_to']))
+            echo ___('editors_review_history_info_request', 'Information Request');
+        else
+            echo ___('editors_review_history_info_reply', 'Reply');
+    }
+    ?>
+    </td>
+    <td><?=nl2br($hist['Approval']['comments'])?></td>
+</tr>
+<?php if ($hist['Approval']['reviewtype'] == 'info' && empty($hist['Approval']['reply_to'])
+          && !empty($hist['replies'])):?>
+<tr>
+    <td colspan="5">
+        <?=$html->link(sprintf(n___('editors_review_history_show_hide_replies',
+        'editors_review_history_show_hide_replies', count($hist['replies']),
+        'Show/Hide Replies (%1$s)'), count($hist['replies'])), "#",
+        array('onclick'=>"$('tr.reply_to_{$hist['Approval']['id']}').toggle();return false;"))?></td>
+</tr>
+<?php
+// show all replies
+foreach ($hist['replies'] as &$reply) {
+    echo $this->renderElement('developers/editors_review_history_item', array('hist'=>$reply));
+}
+?>
+<?php endif; ?>
diff --git a/site/app/views/elements/developers/rolecheck.thtml b/site/app/views/elements/developers/rolecheck.thtml
index 862a463..93d46f7 100644
--- a/site/app/views/elements/developers/rolecheck.thtml
+++ b/site/app/views/elements/developers/rolecheck.thtml
@@ -39,7 +39,7 @@
 if (empty($required_role) || (!empty($required_role) && $author_role < $required_role)):
 ?>
     <div class="notice no-privs-box rounded">
-        <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.
+        <?=___('devcp_rolecheck_no_privs')?>
     </div>
 <?php
 endif;
diff --git a/site/app/views/elements/developers/sidebar.thtml b/site/app/views/elements/developers/sidebar.thtml
index c5c33ab..2f4bc15 100644
--- a/site/app/views/elements/developers/sidebar.thtml
+++ b/site/app/views/elements/developers/sidebar.thtml
@@ -49,7 +49,7 @@
         
         <ul id="cat-list">
     <?php if ($this->controller->Session->check('User')): ?>
-            <li><?=$html->link(_('Dashboard'), '/developers/dashboard')?></li>
+            <li><?=$html->link(___('devcp_sidebar_a_dashboard'), '/developers/dashboard')?></li>
         <?php
             if (!empty($addons)) {
                 foreach ($addons as $addon_id => $addon_name) {
diff --git a/site/app/views/elements/developers/translationbox.thtml b/site/app/views/elements/developers/translationbox.thtml
index 6fdc479..ff8e4c0 100644
--- a/site/app/views/elements/developers/translationbox.thtml
+++ b/site/app/views/elements/developers/translationbox.thtml
@@ -61,7 +61,7 @@
 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="Help (does not leave page)" onclick="translation_box.showHelp(this); return false;">'.$html->image('developers/help.png', array('alt' => 'Help')).'</a>'.$displayName.'  </h4>' : '');
+    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">
@@ -78,8 +78,8 @@ if (!isset($graybox) || $graybox === true) {
             }
         ?>
         </div>
-        <div class="translation-button"><?=$html->image('developers/tab_add.png', array('onclick' => 'translation_box.addTab(this);', 'alt' => 'Add Translation', 'title' => 'Add Translation'))?></div>
-        <div class="translation-button remove" style="display: none;"><?=$html->image('developers/tab_delete.png', array('onclick' => 'translation_box.confirmRemove(this);', 'alt' => 'Remove Translation', 'title' => 'Remove Translation'))?></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
@@ -94,7 +94,7 @@ if (!isset($graybox) || $graybox === true) {
             }
             
             if (!empty($maxLength)) {
-                echo '<div class="translation-maxlength '.$locale.($this->translationBox['defaultLocale'] == $locale ? ' selected' : '').'">'.$html->image('developers/exclamation.png', array('alt' => '')).' Characters used:&nbsp;&nbsp;<span>'.strlen($translation).'</span> / '.$maxLength.'</div>';
+                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>';
             }
         }
     ?>
@@ -110,7 +110,7 @@ if (!isset($graybox) || $graybox === true) {
 <div class="translation-newlocale-container">
     <div class="translation-newlocale new selected">
         <div class="padded">
-            Select the locale of the translation to add:
+            <?=___('devcp_transbox_select_locale')?>
             <select>
             <?php
                 foreach ($this->translationBox['languages'] as $code => $name) {
@@ -119,9 +119,9 @@ if (!isset($graybox) || $graybox === true) {
             ?>
             </select>
             <div class="buttons">
-                <input type="button" value="Add Locale" onclick="translation_box.addLocale(this, false);" />
-                <input type="button" value="Add Locale to All" onclick="translation_box.addLocale(this, true);" />
-                <input type="button" value="Cancel" onclick="translation_box.cancelAdd(this);" />
+                <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>
@@ -129,10 +129,10 @@ if (!isset($graybox) || $graybox === true) {
 <div class="translation-deletelocale-container">
     <div class="translation-deletelocale">
         <div class="padded">
-            Are you sure you wish to delete this translation?
+            <?=___('devcp_transbox_delete_sure')?>
             <div class="buttons">
-                <input type="button" value="Delete It" onclick="translation_box.removeLocale(this);" />
-                <input type="button" value="Cancel" onclick="translation_box.cancelRemove(this);" />
+                <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>
@@ -140,12 +140,11 @@ if (!isset($graybox) || $graybox === true) {
 <div class="translation-help-container">
     <div class="translation-help bluebox-tr"><div class="bluebox-tl">
         <div class="padded">
-            <h4>What are these "<?=$this->translationBox['defaultLocale']?>" tabs?</h4>
-            <p>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.</p>
-            
-            <h4>What if I don't have any translations?</h4>
-            <p>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.</p>
-            <div style="text-align: right;"><a href="#" onclick="translation_box.hideHelp(this); return false;">Hide Help</a></div>
+            <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>
diff --git a/site/app/views/elements/footer.thtml b/site/app/views/elements/footer.thtml
index 917fcc9..bd6d396 100644
--- a/site/app/views/elements/footer.thtml
+++ b/site/app/views/elements/footer.thtml
@@ -69,6 +69,9 @@
         <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>
     </ul>
     <p id="footer-disclaimer"><?=_('footer_disclaimer')?></p>
 </div>
diff --git a/site/app/views/elements/header.thtml b/site/app/views/elements/header.thtml
index c870e3e..a22e1ca 100644
--- a/site/app/views/elements/header.thtml
+++ b/site/app/views/elements/header.thtml
@@ -143,10 +143,19 @@
     if ($this->controller->Session->check('User')) {
         $user = $this->controller->Session->read('User');
         echo '<li>' . $html->link(_('header_navlink_myaccount'), '/users/edit', array('title' => $user['email'])) . '</li>' . "\n";
+        echo '<li>' . $html->link(_('sidebar_navlink_developer_tools'), '/developers') . '</li>' . "\n";
+        if ($this->controller->SimpleAcl->actionAllowed('Editors', '%', $this->controller->Session->read('User'))) {
+            echo '<li>' . $html->link(_('sidebar_navlink_editor_tools'), '/editors') .'</li>' . "\n";
+        }
+        if ($this->controller->SimpleAcl->actionAllowed('Localizers', '%', $this->controller->Session->read('User'))) {
+            echo '<li>' . $html->link('Localizer Tools', '/localizers') . '</li>' . "\n";
+        }
+        if ($this->controller->SimpleAcl->actionAllowed('Admin', '%', $this->controller->Session->read('User'))) {
+            echo '<li>' . $html->link(_('sidebar_navlink_admin_tools'), '/admin') . '</li>' . "\n";
+        }
         echo '<li>' . $html->link(_('sidebar_navlink_developer_tools'), '/developers/dashboard') . '</li>' . "\n";
         echo '<li>' . $html->link(_('header_navlink_logout'), $html->logout_url()) . '</li>' . "\n";
-    }
-    else {
+    } else {
         echo '<li>' . $html->link(_('header_navlink_register'), '/users/register') . '</li> ' . "\n";
         echo '<li>' . $html->link(_('header_navlink_login'), $html->login_url()) .  '</li>' . "\n";
     }
diff --git a/site/app/views/elements/install.thtml b/site/app/views/elements/install.thtml
index 206cef5..707f1e2 100644
--- a/site/app/views/elements/install.thtml
+++ b/site/app/views/elements/install.thtml
@@ -225,7 +225,7 @@ if (count($addonFiles) < 1) {
             ?>
             </p>
             <?php
-                 $exp_addon_url = "/pages/experimentalAddons";
+                 $exp_addon_url = "/pages/faq#experimental-addons";
                  echo sprintf(___('install_a_login_to_install'), $html->url($login_url), $html->url($exp_addon_url)); 
             ?>
             </div>
diff --git a/site/app/views/files/browse.thtml b/site/app/views/files/browse.thtml
index 7437d92..766eb00 100644
--- a/site/app/views/files/browse.thtml
+++ b/site/app/views/files/browse.thtml
@@ -43,14 +43,14 @@
     <?=$javascript->link('listing')?>
     <?=$javascript->link('scriptaculous/prototype')?>
     <?=$javascript->link('scriptaculous/scriptaculous.js')?>
-    <title><?=_('File Browser')?></title>
+    <title><?=sprintf(___('file_browser_title', '%s :: File Browser :: %s Add-ons'), $addonname, APP_PRETTYNAME)?></title>
 </head>
 <body>
     <?
 $files['dir'] = 1;
 $files['filename'] = 'extension.xpi';
 ?>
-<iframe id="fileBrowser" src="<?=$html->url(isset($is_diff)?'/files/diff/'.$id.'?compare=install.rdf':'/files/browse/'.$id.'/?view=install.rdf')?>" border="0"></iframe>
+<iframe id="fileBrowser" src="<?=$html->url(isset($is_diff)?'/files/diff/'.$id.'?compare='.$startfile:'/files/browse/'.$id.'/?view='.$startfile)?>" border="0"></iframe>
 <div id="fileContents">
     <div id="fileHeader">
         <?=$html->image('template/moz-com-logo.png')?>
@@ -61,11 +61,11 @@ $files['filename'] = 'extension.xpi';
         </ul>
     </div>
     <div id="fileFooter">
-        <?=($review == 1) ? $html->link(_('Back to Review'), '/editors/review/'.$version) :
-                            $html->link(_('Back to Add-on'), '/addon/'.$addon)?>
+        <?=($review == 1) ? $html->link(___('file_browser_link_review', 'Back to Review'), '/editors/review/'.$version) :
+                            $html->link(___('file_browser_link_addon', 'Back to Add-on'), '/addon/'.$addon)?>
         &nbsp;&middot;&nbsp;
-        <?=$html->link('Expand All', 'javascript: void(0);', array('onClick' => 'expandNodes();'))?>&nbsp;&middot;&nbsp;
-        <?=$html->link('+/-', 'javascript: void(0);', array('onClick' => 'toggleFileListing();', 'id' => 'fileControl'))?>&nbsp;&nbsp;
+        <?=$html->link(___('file_browser_link_expand_all', 'Expand All'), 'javascript: void(0);', array('onClick' => 'expandNodes();'))?>&nbsp;&middot;&nbsp;
+        <?=$html->link(___('file_browser_toggle_expand_collapse', '+/-'), 'javascript: void(0);', array('onClick' => 'toggleFileListing();', 'id' => 'fileControl'))?>&nbsp;&nbsp;
     </div>
 </div>
 <script language="JavaScript" type="text/javascript">
diff --git a/site/app/views/helpers/addons_html.php b/site/app/views/helpers/addons_html.php
index a74b69f..b2d90b6 100644
--- a/site/app/views/helpers/addons_html.php
+++ b/site/app/views/helpers/addons_html.php
@@ -484,10 +484,10 @@ class AddonsHtmlHelper extends HtmlHelper
     }
 
     function truncateChars($length, $string) {
-        if (strlen($string) <= $length) {
+        if (mb_strlen($string) <= $length) {
             return $string;
         } else {
-            $sub = substr($string, 0, $length - 3);
+            $sub = mb_substr($string, 0, $length - 3);
             return $sub.'...';
         }
     }
diff --git a/site/app/views/layouts/mozilla.thtml b/site/app/views/layouts/mozilla.thtml
index 31a422b..706e7d1 100644
--- a/site/app/views/layouts/mozilla.thtml
+++ b/site/app/views/layouts/mozilla.thtml
@@ -236,11 +236,13 @@
             advLink.click();
         <?php } ?>
 
+        if (typeof __utmSetVar == 'function') {
 <?php if ($this->controller->Session->check('User')): ?>
         __utmSetVar("Loggedin");
 <?php else: ?>
         __utmSetVar("Loggedout");
 <?php endif; ?>
+        }
 				
 <?php if(isset($content_wide) && $content_wide): ?>
         if ( $(window).width() > 1000 ) {
diff --git a/site/app/views/pages/about.thtml b/site/app/views/pages/about.thtml
new file mode 100644
index 0000000..548086f
--- /dev/null
+++ b/site/app/views/pages/about.thtml
@@ -0,0 +1,14 @@
+<?php
+$this->layout = 'mozilla';
+?>
+
+<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/credits.thtml b/site/app/views/pages/credits.thtml
index 8c823ca..918904a 100644
--- a/site/app/views/pages/credits.thtml
+++ b/site/app/views/pages/credits.thtml
@@ -132,6 +132,7 @@ ksort($other_contributors);
 ?>
     <ul>
         <li><?=_('credits_software_famfamfam')?></li>
+        <li><?=___('credits_software_timeplot', '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>.')?></li>
     </ul>
 </div>
 
diff --git a/site/app/views/pages/js_constants.js.thtml b/site/app/views/pages/js_constants.js.thtml
index 10a2474..bd61078 100644
--- a/site/app/views/pages/js_constants.js.thtml
+++ b/site/app/views/pages/js_constants.js.thtml
@@ -64,6 +64,23 @@ 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')?>';
 
+<?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')?>';
+
 <?php /* Fallback from 4/14/08 */?>
 var app_compat_ignore_check = '<?=___('app_compat_ignore_check')?>';
 
diff --git a/site/app/views/pages/robots.txt.thtml b/site/app/views/pages/robots.txt.thtml
index 105244a..2f4ac9d 100644
--- a/site/app/views/pages/robots.txt.thtml
+++ b/site/app/views/pages/robots.txt.thtml
@@ -56,8 +56,11 @@ foreach ($supported_languages as $lang => $loc) {
         /* block access to all user info pages, on all locales and apps */
         echo "Disallow: ".$html->url("/{$lang}/{$app}/user/\n", true, false, false);
         echo "Disallow: ".$html->url("/{$lang}/{$app}/users/info/\n", true, false, false);
+        echo "Disallow: ".$html->url("/{$lang}/{$app}/users/pwreset/\n", true, false, false);
         /* do not index search */
         echo "Disallow: ".$html->url("/{$lang}/{$app}/search/\n", true, false, false);
+        /* do not index share links */
+        echo "Disallow: ".$html->url("/{$lang}/{$app}/addon/share/\n", true, false, false);
     }
 }
 ?>
diff --git a/site/app/views/statistics/addon.thtml b/site/app/views/statistics/addon.thtml
index ea8ff9d..b22702d 100644
--- a/site/app/views/statistics/addon.thtml
+++ b/site/app/views/statistics/addon.thtml
@@ -75,6 +75,20 @@ echo '<div id="content">';
         <div id="plot-options" style="display: none;">
             <div id="plot-selector-area"></div>
             <div id="plot-selection">
+                <div id="weeks-legend">
+                    <div class="plot-legend">
+                        <div class="colorbox" style="background-color: #CC6666;"></div>
+                        <div id="week1-selection" class="plot-name"><select class="template">
+                            <option>--</option>
+                        </select></div>
+                    </div>
+                    <div class="plot-legend">
+                        <div class="colorbox" style="background-color: #6666CC;"></div>
+                        <div id="week2-selection" class="plot-name"><select class="template">
+                            <option>--</option>
+                        </select></div>
+                    </div>
+                </div>
                 <div id="summary-legend">
                     <div class="plot-legend">
                         <div class="colorbox" style="background-color: #33AAFF;"></div>
diff --git a/site/app/views/tests/discover.thtml b/site/app/views/tests/discover.thtml
new file mode 100644
index 0000000..5dd5b67
--- /dev/null
+++ b/site/app/views/tests/discover.thtml
@@ -0,0 +1,11 @@
+<?php
+
+echo '<?xml version="1.0" ?><cases>';
+
+$testlist = TestManager::getTestCaseList();
+foreach ($testlist as $k=>$testcase) {
+    echo "  <case>{$testcase}</case>\n";
+}
+
+echo '</cases>';
+?>
diff --git a/site/app/webroot/css/editors.css b/site/app/webroot/css/editors.css
index 396b600..4c11658 100644
--- a/site/app/webroot/css/editors.css
+++ b/site/app/webroot/css/editors.css
@@ -181,6 +181,9 @@ div.error_message {
     border: 0;
     vertical-align: middle;
 }
+#subform div {
+    margin: 5px 0;
+}
 #commentsbox {
     padding: 5px;
 }
diff --git a/site/app/webroot/css/filebrowser.css b/site/app/webroot/css/filebrowser.css
index 35f6d89..f94c1be 100644
--- a/site/app/webroot/css/filebrowser.css
+++ b/site/app/webroot/css/filebrowser.css
@@ -52,7 +52,7 @@
 	content: "\00BB \0020";
 }
 .fileList li.file:before {
-	content: "\203A \0000";
+	content: "\203A \0020";
 	margin-right: 2px;
 }
 
diff --git a/site/app/webroot/css/localizers.css b/site/app/webroot/css/localizers.css
index 6213973..ee81a39 100644
--- a/site/app/webroot/css/localizers.css
+++ b/site/app/webroot/css/localizers.css
@@ -46,6 +46,7 @@ table.translatedSection th {
 table.translatedSection td {
     padding: 5px;
     font-size: 80%;
+    vertical-align: top;
 }
 table.translatedSection td.field {
     font-weight: bold;
@@ -56,3 +57,10 @@ table.translatedSection td.enus {
 table.translatedSection td.localized {
     border-left: 1px solid gray;
 }
+table.translatedSection input {
+    width: 100%;
+}
+table.translatedSection textarea {
+    width: 100%;
+    height: 8em;
+}
diff --git a/site/app/webroot/css/remora.css b/site/app/webroot/css/remora.css
index 57fa3e1..0c796e6 100644
--- a/site/app/webroot/css/remora.css
+++ b/site/app/webroot/css/remora.css
@@ -18,8 +18,8 @@
 #cat-list li.selected a { background: #99CC66; }
 
 /* Add-on Summary */
-#addon-summary .stats { position: absolute; left: 20px; top: 18em; margin: 1em 0; }
-#addon-summary { min-height: 225px; }
+#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 */
@@ -136,4 +136,19 @@ div.hsession { display: none; }
 }
 #tabbed-editor .ui-tabs-nav {
     display: block;
+}
+
+
+/* FAQ styling */
+
+dl.faq dt {
+    margin: 1em 0 0 0;
+}
+
+dl.faq dd {
+    margin-top: 0.5em;
+}
+
+dl.faq dt:target {
+    color: #df731b;
 }
\ No newline at end of file
diff --git a/site/app/webroot/css/screen.css b/site/app/webroot/css/screen.css
index 62c4080..e20ff6e 100644
--- a/site/app/webroot/css/screen.css
+++ b/site/app/webroot/css/screen.css
@@ -4,6 +4,7 @@ Created by Craig Cook - focalcurve.com
                 on November 20, 2007
 -----------------------------------------------------------------------------*/
 
+
 /*** =Reset defaults ***/
 html, body, div, span, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
@@ -84,7 +85,7 @@ h4#moz a { display: block; height: 44px; width: 100px; padding-left: 10px;}
 /* =User nav */
 #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: -1.75em auto 0; padding: 0 0 0 50px;}
+.html-rtl #nav-user { margin: 0em auto 0; padding: 0 0 0 50px;}
 
 #nav-user li { display: inline;}
 .html-ltr #nav-user li { padding-left: 1em; margin-right: .5em; }
@@ -385,6 +386,46 @@ form.asclosed {display: none;}
 #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; /*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?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 0 0 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: 0.25em; margin: 0 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; }
@@ -906,6 +947,8 @@ form.asclosed {display: none;}
     background-color: #000;
 }
 
+
+
 /* Background iframe styling for IE6. Prevents ActiveX bleed-through (<select> form elements, etc.) */
 * iframe.jqm {
     position: absolute;
diff --git a/site/app/webroot/css/stats/dropdowns.css b/site/app/webroot/css/stats/dropdowns.css
index fef396f..336ad95 100755
--- a/site/app/webroot/css/stats/dropdowns.css
+++ b/site/app/webroot/css/stats/dropdowns.css
@@ -214,9 +214,6 @@
 .plot-dropdown.big-menu ul li.indented a {
     padding-left: 23px;
 }
-.plot-dropdown.group-by .selected {
-    width: 98%;
-}
 
 #options.plot-dropdown {
     width: 35px;
@@ -232,6 +229,17 @@
     margin-left: -120px;
 }
 
+#group-by-selector {
+    width: 163px;
+    white-space: nowrap;
+}
+#group-by-selector .selected {
+    width: 98%;
+}
+#group-by-selector_group-by-selection-menu {
+    padding: 0 0.5em 0 0.5em;
+    width: auto;
+}
 
 
 #plot-options #plot-selector-area {
@@ -251,6 +259,15 @@
     float: right;
 }
 
+#weeks-legend {
+    display: none;
+    border: 2px solid #D8DCDF;
+    -moz-border-radius: 6px;
+    -webkit-border-radius: 6px;
+    float: left;
+    margin-left: 160px;
+}
+
 #summary-legend {
     border: 2px solid #D8DCDF;
     -moz-border-radius: 6px;
@@ -331,3 +348,4 @@
     height: 150px;
     border: none !important;
 }
+
diff --git a/site/app/webroot/img/box-pointer-top.png b/site/app/webroot/img/box-pointer-top.png
new file mode 100644
index 0000000..d7f451c
--- /dev/null
+++ b/site/app/webroot/img/box-pointer-top.png
diff --git a/site/app/webroot/img/developers/admin_review.png b/site/app/webroot/img/developers/admin_review.png
new file mode 100644
index 0000000..cff65d7
--- /dev/null
+++ b/site/app/webroot/img/developers/admin_review.png
diff --git a/site/app/webroot/img/developers/info-bw.png b/site/app/webroot/img/developers/info-bw.png
new file mode 100644
index 0000000..ade8c8f
--- /dev/null
+++ b/site/app/webroot/img/developers/info-bw.png
diff --git a/site/app/webroot/img/developers/info-color.png b/site/app/webroot/img/developers/info-color.png
new file mode 100644
index 0000000..1236c56
--- /dev/null
+++ b/site/app/webroot/img/developers/info-color.png
diff --git a/site/app/webroot/img/favicons/delicious.gif b/site/app/webroot/img/favicons/delicious.gif
new file mode 100644
index 0000000..a136dd1
--- /dev/null
+++ b/site/app/webroot/img/favicons/delicious.gif
diff --git a/site/app/webroot/img/favicons/digg.gif b/site/app/webroot/img/favicons/digg.gif
new file mode 100644
index 0000000..089f4f2
--- /dev/null
+++ b/site/app/webroot/img/favicons/digg.gif
diff --git a/site/app/webroot/img/favicons/facebook.gif b/site/app/webroot/img/favicons/facebook.gif
new file mode 100644
index 0000000..90a8e02
--- /dev/null
+++ b/site/app/webroot/img/favicons/facebook.gif
diff --git a/site/app/webroot/img/favicons/friendfeed.gif b/site/app/webroot/img/favicons/friendfeed.gif
new file mode 100644
index 0000000..edcc727
--- /dev/null
+++ b/site/app/webroot/img/favicons/friendfeed.gif
diff --git a/site/app/webroot/img/favicons/myspace.gif b/site/app/webroot/img/favicons/myspace.gif
new file mode 100644
index 0000000..8e56437
--- /dev/null
+++ b/site/app/webroot/img/favicons/myspace.gif
diff --git a/site/app/webroot/img/favicons/reddit.gif b/site/app/webroot/img/favicons/reddit.gif
new file mode 100644
index 0000000..8a4963f
--- /dev/null
+++ b/site/app/webroot/img/favicons/reddit.gif
diff --git a/site/app/webroot/js/addons.js b/site/app/webroot/js/addons.js
index 6da858b..2f23003 100644
--- a/site/app/webroot/js/addons.js
+++ b/site/app/webroot/js/addons.js
@@ -260,10 +260,9 @@ function removeCompatibilityHint(versionID) {
  * This function is used on the addon version page to create an element
  * at the top of the page with the most recent compatible version of an addon
  */
-function createLatestVersionElement(get_latest_version_text) {
+function createLatestVersionElement(get_latest_version_text, app) {
 	var container = $("#latest-version-container");
-	
-	container.wrapInner("<p>" + get_latest_version_text + " (" + gLatestApplicationVersion + ")" + "</p>");
+	container.wrapInner("<p>" + sprintf(get_latest_version_text, app, gLatestApplicationVersion) + "</p>");
 	container.append(gLatestAddonVersion);	
     var installButton = $("#install-"+ gLatestVersionID);
     var cloned = installButton.clone();
@@ -865,3 +864,130 @@ $.fn.collection = function(options) {
 /*# AVOID COLLISIONS #*/
 })(jQuery);
 /*# AVOID COLLISIONS #*/
+
+/**
+ * jQuery rollover reveal widget
+ * lorchard@mozilla.com
+ *
+ * Example markup:
+ *      <div id="foo">
+ *          <a href="#" class="activator">Hover me</a>
+ *          <div class="to-reveal">This content will appear</div>
+ *      </div>
+ *      <script>
+ *          $('#foo').rolloverReveal({ 
+ *              reveal_delay: 1000, dismiss_delay: 2000 
+ *          })
+ *      </script>
+ *
+ * Whenever the activator element is hovered, the to-reveal content will appear
+ * after a short delay.  If the mouse leaves the activator or revealed content,
+ * the content will disappear after a short delay unless the mouse returns.
+ *
+ * Clicking on a link within the revealed content will dismiss the content.
+ */
+;if(jQuery) (function($){
+
+    $.fn.rolloverReveal = function(options) {
+        var $cls = arguments.callee.support;
+        $.each(this, function() { new $cls(this, options) });
+        return this;
+    }
+
+    $.fn.rolloverReveal.support = function(el, options) {
+        this.init(el, options);
+    };
+
+    $.fn.rolloverReveal.support.prototype = function() {
+
+        var option_defaults = {
+            reveal_delay:  250,
+            dismiss_delay: 500
+        };
+
+        return {
+            // Delayed execution timers.
+            timers: {},
+
+            /** Set up the object instance and event handlers for this widget. */
+            init: function(el, options) {
+                var that = this;
+                this.options = $.extend({}, option_defaults, options);
+
+                // 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)
+                    .find('.activator')
+                        .click(function()     { that.toggle(); return false; })
+                        .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'); })
+                        .mouseout(function()  { that.schedule('dismiss'); })
+                    .end()
+                    .find('.to-reveal a')
+                        .click(function()     { that.dismiss(); return true; })
+                        .mouseover(function() { that.cancel('dismiss'); })
+                        .mouseout(function()  { that.schedule('dismiss'); })
+                    .end();
+            },
+
+            /** Reveal the hidden content */
+            reveal: function() {
+                this.to_reveal.show().addClass('revealed');
+            },
+
+            /** Determine whether the hidden content is revealed */
+            revealStatus: function() {
+                return this.to_reveal.hasClass('revealed');
+            },
+            
+            /** Dismiss the hidden content */
+            dismiss: function() {
+                this.to_reveal.hide().removeClass('revealed');
+            },
+
+            /** Determine whether the hidden content is hidden */
+            dismissStatus: function() {
+                return !this.to_reveal.hasClass('revealed');
+            },
+
+            /** Toggle the hide/show of the content */
+            toggle: function() {
+                return (this.revealStatus()) ? 
+                    this.dismiss() : this.reveal();
+            },
+
+            /** Schedule delayed execution of the given action. */
+            schedule: function(action) {
+                var that = this;
+                // Skip if the action is already in effect.
+                if (this[action+'Status']()) return;
+                // De-bounce any existing running timer.
+                this.cancel(action);
+                // Schedule a call to the given action.
+                this.timers[action] = setTimeout(function() {
+                    that[action]();
+                }, this.options[action + '_delay']);
+            },
+
+            /** Cancel delayed execution of the given action. */
+            cancel: function(action) {
+                if (this.timers[action]) 
+                    clearTimeout(this.timers[action]);
+            },
+
+            EOF:null
+        };
+    }();
+
+})(jQuery);
diff --git a/site/app/webroot/js/developers.js b/site/app/webroot/js/developers.js
index e7ef203..0e02c86 100644
--- a/site/app/webroot/js/developers.js
+++ b/site/app/webroot/js/developers.js
@@ -55,7 +55,7 @@ var upload = {
             return true;
         }
         else {
-            alert('You must select a file to upload.');
+            alert(devcp_js_upload_alert);
             return false;
         }
     }
@@ -85,10 +85,13 @@ function iframeLoaded() {
         else if (upload.response.uploadtype == 'update') {
             if (upload.response.status == addon_statuses.PUBLIC) {
                 $('#pending-message').hide();
-                $('#new-file-status').text('Public');
+                $('#new-file-status').text(addons_status_public);
+            }
+            else if (upload.response.status == addon_statuses.SANDBOX) {
+                $('#new-file-status').text(addons_status_sandbox);
             }
             else if (upload.response.status == addon_statuses.PENDING) {
-                $('#new-file-status').text('In Sandbox; Pending Review');
+                $('#new-file-status').text(addons_status_pending);
             }
             $('#new-file-status').addClass('status-' + upload.response.status);
             $('#new-version-number').text(upload.response.version);
@@ -99,10 +102,10 @@ function iframeLoaded() {
         else if (upload.response.uploadtype == 'file') {
             if (upload.response.status == addon_statuses.PUBLIC) {
                 $('#pending-message').hide();
-                $('#new-file-status').text('Public');
+                $('#new-file-status').text(addons_status_public);
             }
             else if (upload.response.status == addon_statuses.PENDING) {
-                $('#new-file-status').text('In Sandbox; Pending Review');
+                $('#new-file-status').text(addons_status_pending);
             }
             $('#new-file-status').addClass('status-' + upload.response.status);
             $('#queue-count').text(upload.response.queuecount);
@@ -150,22 +153,22 @@ var addon_edit_authors = {
     
     addAuthor: function(user_id, author, role, visible, markChanges) {
         var row = '<tr><td>';
-        row += '<a class="down-arrow" href="#" onclick="addon_edit_authors.moveDownRow(this); return false;"><img src="' + imageURL + '/developers/arrow_down.png" alt="Move Down" title="Move Down" /></a>';
-        row += '<a class="up-arrow" href="#" onclick="addon_edit_authors.moveUpRow(this); return false;"><img src="' + imageURL + '/developers/arrow_up.png" alt="Move Up" title="Move Up" /></a>';
+        row += '<a class="down-arrow" href="#" onclick="addon_edit_authors.moveDownRow(this); return false;"><img src="' + imageURL + '/developers/arrow_down.png" alt="' + devcp_js_img_move_down + '" title="' + devcp_js_img_move_down + '" /></a>';
+        row += '<a class="up-arrow" href="#" onclick="addon_edit_authors.moveUpRow(this); return false;"><img src="' + imageURL + '/developers/arrow_up.png" alt="' + devcp_js_img_move_up + '" title="' + devcp_js_img_move_up + '" /></a>';
         row += '</td><td><a href="' + profileURL + '/' + user_id + '">' + author + '</a></td><td>';
         row += '<select name="data[addons_users][' + user_id + '][role]">';
-        row += '<option value="' + author_roles.OWNER + '" ' + (role == author_roles.OWNER ? ' selected="selected"' : '') + '>Owner</option>';
-        row += '<option value="' + author_roles.DEV + '" ' + (role == author_roles.DEV ? ' selected="selected"' : '') + '>Developer</option>';
-        row += '<option value="' + author_roles.VIEWER + '" ' + (role == author_roles.VIEWER ? ' selected="selected"' : '') + '>Viewer</option>';
+        row += '<option value="' + author_roles.OWNER + '" ' + (role == author_roles.OWNER ? ' selected="selected"' : '') + '>' + devcp_js_option_owner + '</option>';
+        row += '<option value="' + author_roles.DEV + '" ' + (role == author_roles.DEV ? ' selected="selected"' : '') + '>' + devcp_js_option_developer + '</option>';
+        row += '<option value="' + author_roles.VIEWER + '" ' + (role == author_roles.VIEWER ? ' selected="selected"' : '') + '>' + devcp_js_option_viewer + '</option>';
         row += '</td><td>';
-        row += '<input type="checkbox" name="data[addons_users][' + user_id + '][listed]" value="1" ' + (visible == true ? ' checked="checked"' : '') + ' title="List as author in public listings"/>';
+        row += '<input type="checkbox" name="data[addons_users][' + user_id + '][listed]" value="1" ' + (visible == true ? ' checked="checked"' : '') + ' title="' + devcp_js_input_list_author + '"/>';
         row += '</td><td style="width: 25px;">';
         row += '<div class="inline-delete-button uses-image">';
-        row += '<a href="#" onclick="addon_edit_authors.deleteAuthor(this); return false;"><img src="' + imageURL + '/developers/delete.png" alt="Remove Author" title="Remove Author" /></a>';
+        row += '<a href="#" onclick="addon_edit_authors.deleteAuthor(this); return false;"><img src="' + imageURL + '/developers/delete.png" alt="' + devcp_js_remove_author + '" title="' + devcp_js_remove_author + '" /></a>';
         row += '<div class="inline-delete-box">';
-        row += '<p>Are you <b>sure</b> you wish to remove this author?</p><br />';
-        row += '<p><a href="#" onclick="addon_edit_authors.confirmDelete(this); return false;" class="remove-button rounded">Remove Author</a>&nbsp;&nbsp;';
-        row += '<a href="#" onclick="addon_edit_authors.cancelDelete(this); return false;" class="button rounded">Cancel</a></p>';
+        row += '<p>' + devcp_js_sure_remove + '</p><br/>';
+        row += '<p><a href="#" onclick="addon_edit_authors.confirmDelete(this); return false;" class="remove-button rounded">' + devcp_js_remove_author + '</a>&nbsp;&nbsp;';
+        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>';
         
@@ -239,7 +242,7 @@ var addon_edit_authors = {
             return true;
         }
         else {
-            $('#add-error').html('Please enter the account email of the author you wish to add.');
+            $('#add-error').html(devcp_js_add_email);
             $('#add-error').slideDown();
             return false;
         }
@@ -380,7 +383,7 @@ var versions_edit = {
         newRow += '<input type="hidden" name="data[Application][' + application_id + '][new]" value="1"/></td>';
         newRow += '<td>' + $('#app' + application_id + '-dropdowns').html() + '</td>';
         newRow += '<td style="width: 25px;"><div class="inline-delete-button">';
-        newRow += '<a href="#" onclick="versions_edit.confirmDelete(this); return false;"><img src="' + imageBase + '/delete.png" alt="Remove Application Compatibility" title="Remove Application Compatibility" /></a>';
+        newRow += '<a href="#" onclick="versions_edit.confirmDelete(this); return false;"><img src="' + imageBase + '/delete.png" alt="' + devcp_js_img_remove_compat + '" title="' + devcp_js_img_remove_compat + '" /></a>';
         newRow += '</div></td>';
         newRow += '</tr>';
         
diff --git a/site/app/webroot/js/editors.js b/site/app/webroot/js/editors.js
index d6e1bba..6a00292 100644
--- a/site/app/webroot/js/editors.js
+++ b/site/app/webroot/js/editors.js
@@ -26,7 +26,7 @@ function toggleFilters() {
 *               editors/review                 *
 *************************************************/
 //Array of possible actions
-var actions = ['public', 'sandbox', 'superreview'];
+var actions = ['public', 'sandbox', 'info', 'superreview'];
 
 //Simulate radio button group for action icons
 function selectAction(action) {
@@ -36,34 +36,33 @@ function selectAction(action) {
     //Select action and deselect other actions
     for (var i = 0; i < actions.length; i++) {
         if (actions[i] == action) {
-            color(actions[i]);
+            changeIcon(actions[i], 'color');
             document.getElementById('details-' + actions[i]).style.display = '';
         }
         else {
-            bw(actions[i]);
+            changeIcon(actions[i], 'bw');
             document.getElementById('details-' + actions[i]).style.display = 'none';
         }
     }
     
+    // when rejecting, pre-select notification box
+    $('#subscribe input').attr('checked', (action=='sandbox'));
+    // no canned responses/app/os for info request
+    if (action=='info')
+        $('#canned,#testing').hide();
+    else
+        $('#canned,#testing').show();
+    
     $('#subform').show('medium');
 }
 
-//Turn an icon colored
-function color(action) {
+//Turn an icon colored/bw
+function changeIcon(action, colorbw) {
     var icon = document.getElementById(action + 'Icon');
     var span = document.getElementById(action);
    
-    icon.src = '../../../../img/developers/' + action + '-color.png';
-    span.className = 'action_color';
-}
-
-//Turn an icon bw
-function bw(action) {
-    var icon = document.getElementById(action + 'Icon');
-    var span = document.getElementById(action);
-   
-    icon.src = '../../../../img/developers/' + action + '-bw.png';
-    span.className = 'action_bw';
+    icon.src = icon.src.substring(0, icon.src.lastIndexOf('/')+1) + action + '-' + colorbw + '.png';
+    span.className = 'action_'+colorbw;
 }
 
 //Get number of selected files
@@ -95,7 +94,13 @@ function selectedFile() {
 
 //Validate review form
 function validateReview(type) {
-    if (type == 'pending') {
+    //Make sure an action was selected
+    var action = document.getElementById('actionField').value;
+    if (action == '') {
+        errors += '- ' + localized['action'] + '\n';
+    }
+    
+    if (type == 'pending' && action!='info') {
         //Make sure at least one file is selected
         var filesSelected = selectedFileCount();
         
@@ -107,15 +112,11 @@ function validateReview(type) {
     
     var errors = '';
     
-    //Make sure an action was selected
-    if (document.getElementById('actionField').value == '') {
-        errors += '- ' + localized['action'] + '\n';
-    }
     //Make sure comments were entered
     if (document.getElementById('comments').value == '') {
         errors += '- ' + localized['comments'] + '\n';
     }
-    if (type == 'pending') {
+    if (type == 'pending' && action!='info') {
         //Make sure tested operating system was entered
         if (document.getElementById('ApprovalOs').value == '') {
             errors += '- ' + localized['os'] + '\n';
diff --git a/site/app/webroot/js/stats/plot-selection.js b/site/app/webroot/js/stats/plot-selection.js
index 5310f32..805e3b9 100755
--- a/site/app/webroot/js/stats/plot-selection.js
+++ b/site/app/webroot/js/stats/plot-selection.js
@@ -65,9 +65,15 @@ var plotSelection = {
         menu.addItem({'value': 'date',  'name': localized['statistics_js_groupby_selector_date']}).select();
         menu.addItem({'value': 'week',  'name': localized['statistics_js_groupby_selector_week']});
         menu.addItem({'value': 'month', 'name': localized['statistics_js_groupby_selector_month']});
+        menu.addItem({'value': 'week_over_week', 'name':localized['statistics_js_groupby_selector_week_over_week']});
 
         $('#group-by-selector').hide();
     },
+
+    getGroupByValue: function() {
+        return (!this.dropdowns['group-by-selector']) ? 'date' :
+            this.dropdowns['group-by-selector'].selectedItem.value;
+    },
     
     addAdditionalDropdown: function() {
         var type = plotSelection.dropdowns['plot-selector'].selectedItem.value;
@@ -371,4 +377,4 @@ var plotSelection = {
             }
         });
     }
-};
\ No newline at end of file
+};
diff --git a/site/app/webroot/js/stats/plot-tables.js b/site/app/webroot/js/stats/plot-tables.js
index 51833ad..106c3e6 100644
--- a/site/app/webroot/js/stats/plot-tables.js
+++ b/site/app/webroot/js/stats/plot-tables.js
@@ -61,6 +61,12 @@ var PlotsTables = (function() {
             $('#stats-table-instance').remove();
         },
 
+        week_over_week_count_onAddMany: function(source) {
+            // Clear any existing tables when week-over-week comes up
+            $('#stats-table').hide();
+            $('#stats-table-instance').remove();
+        },
+
         defined_count_onAddMany: function(source) {
 
             // Set the URL for the download link.
diff --git a/site/app/webroot/js/stats/plots.js b/site/app/webroot/js/stats/plots.js
index 464b2c3..48f792e 100755
--- a/site/app/webroot/js/stats/plots.js
+++ b/site/app/webroot/js/stats/plots.js
@@ -7,11 +7,7 @@ var Plots = {
     
     determinePlot: function() {
         var selected = plotSelection.dropdowns['plot-selector'].selectedItem.value;
-        
-        // HACK: The group-by selector doesn't exist when the plot-selector is first
-        // instantiated, but this method is called at that point.
-        var group_by = (!plotSelection.dropdowns['group-by-selector']) ? null :
-            plotSelection.dropdowns['group-by-selector'].selectedItem.value;
+        var group_by = plotSelection.getGroupByValue();
 
         // Remove current plot selections
         plotSelection.removeAll();
@@ -156,11 +152,13 @@ var Plots = {
             var plotType = plotSelection.dropdowns['plot-selector'].selectedItem.value;
             
             if (plotType == 'summary') {
+                $('#weeks-legend').hide();
                 $('#summary-legend').show();
                 $('#summary-options').show();
                 $('#group-by-selector').hide();
             }
             else {
+                $('#weeks-legend').hide();
                 $('#summary-legend').hide();
                 $('#summary-options').hide();
                 $('#group-by-selector').show();
@@ -231,9 +229,22 @@ var Plots = {
 
             // If there's a value for the group-by selector, add it as a
             // parameter to the CSV URL to invoke it server-side.
-            var group_by = plotSelection.dropdowns['group-by-selector'].selectedItem.value;
+            var group_by = plotSelection.getGroupByValue();
+
+            if ('week_over_week' == group_by) {
+                if ('updatepings' == type || 'downloads' == type) {
+                    $('#weeks-legend').show();
+                    return this.plotWeekOverWeek();
+                } else {
+                    // HACK: Until I can figure out how to disable the Compare
+                    // by: Week option for views not supported for it
+                    group_by = 'week';
+                }
+            } 
+
+            $('#weeks-legend').hide();
             if (group_by) Plots.currentCSV += '?group_by=' + group_by;
-            
+
             this.dataSources = {
                 'count': new Timeplot.DefaultEventSource(),
                 'events-firefox': new Timeplot.DefaultEventSource(),
@@ -304,7 +315,7 @@ var Plots = {
             
             this.plot();
         },
-        
+
         plot: function() {
             var timeGeometry = new Timeplot.DefaultTimeGeometry(this.timeGeometry);
             var valueGeometry = new Timeplot.DefaultValueGeometry(this.valueGeometry);
@@ -328,6 +339,172 @@ var Plots = {
             Plots.timeplot.loadXML(statsURL + 'xml/events/firefox', this.dataSources['events-firefox']);
             Plots.timeplot.loadXML(statsURL + 'xml/events/addon/' + addonID, this.dataSources['events-addon']);
         },
+
+        /**
+         * Construct a plot consisting of 2 different weeks' data overlaid on
+         * the same graph.
+         */
+        plotWeekOverWeek: function() {
+
+            var type = plotSelection.dropdowns['plot-selector'].selectedItem.value;
+            Plots.currentCSV = statsURL + 'csv/' + addonID + '/' + type;
+
+            this.dataSources = {
+                'count': new Timeplot.DefaultEventSource(),
+            };
+
+            PlotsTables.addListeners('week_over_week', this.dataSources);
+            
+            var date_parser = Timeline.NativeDateUnit.getParser('iso8601');
+
+            // Collect Mondays from the set of available dates.
+            var available_dates = plotSelection
+                .summary[ (type=='downloads') ? 'downloads' : 'updatepings' ]
+                .availableDates;
+            var dates = [];
+            var DAY_MONDAY = 1;
+            for (idx in available_dates) {
+                // The available dates data is a little weird - it's an object
+                // with numerical properties, instead of an array.
+                if (available_dates.hasOwnProperty(idx)) {
+                    var date = date_parser(available_dates[idx]);
+                    if (date.getDay() == DAY_MONDAY)
+                        dates.push(available_dates[idx]);
+                }
+            }
+
+            // Set up empty ranges set.
+            var ranges = {
+                week1: { min: '', max: '' },
+                week2: { min: '', max: '' }
+            };
+
+            var WEEK = ( 1000 * 60 * 60 * 24 * 7 );
+
+            if ( $('#weeks-legend .template').length ) {
+
+                // The date selection dropdowns still contain unpopulated
+                // templates, so set up the defaults and populate the dropdowns
+                
+                ranges['week2']['min'] = date_parser(dates[dates.length - 1]);
+                ranges['week2']['max'] = new Date(ranges['week2']['min'].getTime() + WEEK);
+                ranges['week1']['min'] = date_parser(dates[dates.length - 2]);
+                ranges['week1']['max'] = new Date(ranges['week1']['min'].getTime() + WEEK);
+
+                var weeks = ['week1', 'week2'];
+                for (var i=0, week; week=weeks[i]; i++) {
+
+                    // Convert the selection template into a concrete element
+                    var tmpl = $('#'+week+'-selection select.template');
+                    if (!tmpl.length) continue;
+                    tmpl.remove().removeClass('template');
+
+                    // Convert the current min date to string for comparison.
+                    var min_str = ranges[week]['min'].strftime('%Y-%m-%d');
+
+                    // Now populate the selection element with options cloned
+                    // and populated from available dates.
+                    var t_opt = tmpl.find('option').remove();
+                    for (var j=0,date; date=dates[j]; j++) {
+                        var opt = t_opt.clone();
+
+                        var dp = date.split('-');
+                        opt.text([dp[1], dp[2], dp[0]].join('/'))
+                            .attr('value', date)
+                            .appendTo(tmpl);
+
+                        if (date == min_str)
+                            opt.attr('selected', 'selected');
+                    }
+
+                    // Finally inject the populated selector into the DOM and
+                    // wire up an onChange handler to reload the plot.
+                    tmpl.appendTo('#'+week+'-selection')
+                        .change(function() { Plots.determinePlot() });
+                }
+
+            } else {
+
+                // The date selection dropdowns are populated, so set ranges
+                // from the selected values.
+                
+                var weeks = ['week1', 'week2'];
+                for (var i=0, week; week=weeks[i]; i++) {
+                    var opt = $('#'+week+'-selection select')[0];
+                    var date = opt.options[opt.selectedIndex].value;
+                    ranges[week]['min'] = date_parser(date);
+                    ranges[week]['max'] = new Date(ranges[week]['min'].getTime() + WEEK);
+                }
+
+            }
+
+            // Assemble the time geometries from the selected time ranges.
+            this.timeGeometries = {
+                'week1': {
+                    'min': ranges['week1']['min'],
+                    'max': ranges['week1']['max'],
+                    'gridColor': '#CC6666',
+                    'axisLabelsPlacement': 'bottom'
+                },
+                'week2': {
+                    'min': ranges['week2']['min'],
+                    'max': ranges['week2']['max'],
+                    'gridColor': '#6666CC',
+                    'axisLabelsPlacement': 'top'
+                }
+            };
+
+            // Both time ranges share the same value geometry
+            this.valueGeometry = {
+                'gridColor': '#000000',
+                'axisLabelsPlacement': 'left',
+                'min': 0
+            };
+
+            // Construct the plot info structures for each of the overlaid sets.
+            Plots.newTimeplot();
+            Plots.timeplot = Timeplot.create(document.getElementById(Plots.timeplot_id), [
+                Timeplot.createPlotInfo({
+                    'id': 'week1-plot',
+                    'dataSource':    
+                        new Timeplot.ColumnSource(this.dataSources['count'], 1),
+                    'timeGeometry':  
+                        new Timeplot.DefaultTimeGeometry(this.timeGeometries['week1']),
+                    'valueGeometry': 
+                        new Timeplot.DefaultValueGeometry(this.valueGeometry),
+                    'showValues': true,
+                    'dotColor':   '#CC6666',
+                    'dotRadius':  3.0,
+                    'lineColor':  '#CC6666',
+                    'lineWidth':  3.0,
+                    'fillColor':  false
+                }),
+                Timeplot.createPlotInfo({
+                    'id': 'week2-plot',
+                    'dataSource':    
+                        new Timeplot.ColumnSource(this.dataSources['count'], 1),
+                    'timeGeometry':  
+                        new Timeplot.DefaultTimeGeometry(this.timeGeometries['week2']),
+                    'valueGeometry': 
+                        new Timeplot.DefaultValueGeometry(this.valueGeometry),
+                    'showValues': true,
+                    'dotColor':   '#6666CC',
+                    'dotRadius':  3.0,
+                    'lineColor':  '#6666CC',
+                    'lineWidth':  3.0,
+                    'fillColor':  false
+                })
+            ]);
+
+            // Finally, queue up a load for the plot data.
+            Plots.timeplot.loadText(
+                Plots.currentCSV, 
+                ",", 
+                this.dataSources['count'], 
+                parseFields
+            );
+
+        },
         
         addPlot: function(plotName, column, color) {
             if (plotName in this.plotInfo)
@@ -397,4 +574,4 @@ function parseFields(data) {
     }
     
     return data;
-}
\ No newline at end of file
+}
diff --git a/site/app/webroot/services/install.php b/site/app/webroot/services/install.php
index 251b790..ba70ab4 100644
--- a/site/app/webroot/services/install.php
+++ b/site/app/webroot/services/install.php
@@ -60,6 +60,7 @@
 */
 define('REGEX_MOZILLA', '/^https?:\/\/[^\/]*\.?mozilla\.(com|org)\/?.*/');
 define('REGEX_LOCALHOST', '/https?:\/\/[^\/]*\.?localhost.*/');
+define('REGEX_PERSONAS', '/https?:\/\/[^\/]*\.?getpersonas\.com\/?.*/');
 
 // If an add-on's referrers property is set, defaults will not be used unless specified
 $default_referrers = array('document.referrer.match('.REGEX_MOZILLA.')',
@@ -140,8 +141,17 @@ $addons = array(
         /* Other */
             'personas' => array(
                     'name' => 'Personas for Firefox',
-                    'xpi' => 'https://labs.mozilla.com/projects/personas/xpi/personas-latest.xpi',
-                    'icon' => 'http://labs.mozilla.com/projects/personas/images/personas_32x32.png'
+                    'xpi' => 'https://addons.mozilla.org/en-US/firefox/downloads/latest/10900',
+                    'icon' => 'https://addons.mozilla.org/en-US/firefox/images/addon_icon/10900/1236031798',
+                    'referrers' => array_merge($default_referrers, array(
+                            'document.referrer.match('.REGEX_PERSONAS.')'
+                    ))
+            ),
+            
+            'weave' => array(
+                    'name' => 'Weave',
+                    'xpi' => 'https://addons.mozilla.org/en-US/firefox/downloads/latest/10868',
+                    'icon' => 'https://addons.mozilla.org/en-US/firefox/images/addon_icon/10868/1236131155'
             )
     );
 
diff --git a/site/cake/libs/model/datasources/dbo_source.php b/site/cake/libs/model/datasources/dbo_source.php
index 4c1e6e4..150b0e7 100644
--- a/site/cake/libs/model/datasources/dbo_source.php
+++ b/site/cake/libs/model/datasources/dbo_source.php
@@ -1757,8 +1757,12 @@ class DboSource extends DataSource {
  * @return boolean True if the table has a matching record, else false
  */
 	function hasAny($model, $sql) {
+		// bug 478041, escaping the fields properly
 		$sql = $this->conditions($sql);
-		$out = $this->fetchRow("SELECT COUNT(" . $model->primaryKey . ") " . $this->alias . "count FROM " . $this->fullTableName($model) . ' ' . ($sql ? ' ' . $sql : 'WHERE 1 = 1'));
+		$pk = $model->escapeField($model->primaryKey);
+		$table = $this->fullTableName($model) . ' ' . $this->alias . $this->name($model->name);
+		$where = $sql ? $sql : 'WHERE 1 = 1';
+		$out = $this->fetchRow("SELECT COUNT({$pk}) {$this->alias} count FROM {$table} {$where}");
 
 		if (is_array($out)) {
 			return $out[0]['count'];
@@ -1887,4 +1891,4 @@ class DboSource extends DataSource {
 		return false;
 	}
 }
-?>
\ No newline at end of file
+?>