From aa5b7ccd0474a40fb1d624c8a50d00cfbab8f63a Mon Sep 17 00:00:00 2001
From: Jeff Balogh <jbalogh@mozilla.com>
Date: Tue, 28 Dec 2010 10:25:46 -0500
Subject: [PATCH] filling out the status info boxes (bug 617358)

---
 .../templates/devhub/versions/list.html       | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/apps/devhub/templates/devhub/versions/list.html b/apps/devhub/templates/devhub/versions/list.html
index 244cbe9970..fc6df10866 100644
--- a/apps/devhub/templates/devhub/versions/list.html
+++ b/apps/devhub/templates/devhub/versions/list.html
@@ -17,37 +17,35 @@
   <div class="item" id="version-status">
     <div>
       {% if addon.disabled_by_user %}
-        {{ status('disabled', _('This add-on has been <b>disabled</b>.')|safe) }}
-        {{ _("Your add-on is disabled and will not show up in our gallery or update service.") }}
+        {{ status('disabled', _('You have <b>disabled</b> this add-on.')|safe) }}
+        {{ _("Your add-on's listing is disabled and is not showing anywhere in our gallery or update service. You may re-enable it at any time below.") }}
       {% elif addon.status == amo.STATUS_NULL %}
         {{ status('incomplete', _('This add-on is <b>incomplete</b>.')|safe) }}
         {{ _('Please complete your add-on.') }}
       {% elif addon.status == amo.STATUS_UNREVIEWED %}
         {{ status('unreviewed',  _('This add-on is <b>awaiting preliminary review</b>.')|safe) }}
-        {{ _('ASK FLIGTAR') }}
+        {{ _("You will receive an email when the review is complete. Until then, your add-on is not listed in our gallery but can be accessed directly from its details page.") }}
       {% elif addon.status == amo.STATUS_NOMINATED %}
         {{ status('nominated', _('This add-on is <b>awaiting full review</b>.')|safe) }}
-        {{ _('ASK FLIGTAR') }}
+        {{ _("You will receive an email when the review is complete. Until then, your add-on is not listed in our gallery but can be accessed directly from its details page. ") }}
       {% elif addon.status == amo.STATUS_PUBLIC %}
-        {{ status('fully-approved', _('This add-on has been <b>fully approved</b>.')|safe) }}
-        {{ _('ASK FLIGTAR') }}
+        {{ status('fully-approved', _('This add-on has been <b>fully reviewed</b>.')|safe) }}
+        {{ _("Your add-on is displayed in our gallery and users are receiving automatic updates.") }}
       {% elif addon.status == amo.STATUS_DISABLED %}
-        {{ status('admin-disabled', _('This add-on has been <b>disabled by the admins</b>.')|safe) }}
-        {{ _('ASK FLIGTAR') }}
+        {{ status('admin-disabled', _('This add-on has been <b>disabled by Mozilla</b>.')|safe) }}
+        {{ _("Your add-on was disabled by a site administrator and is no longer shown in our gallery. If you have any questions, please email amo-admins@mozilla.org.") }}
       {% elif addon.status == amo.STATUS_LITE %}
-        {{ status('lite', _('This add-on has been <b>preliminarily approved</b>.')|safe) }}
-        {{ _('ASK FLIGTAR') }}
+        {{ status('lite', _('This add-on has been <b>preliminarily reviewed</b>.')|safe) }}
+        {{ _("Your add-on is displayed in our gallery as experimental and users are receiving automatic updates. Some features are unavailable to your add-on.") }}
       {% elif addon.status == amo.STATUS_LITE_AND_NOMINATED %}
-        {{ status('lite-nom', _('This add-on has been <b>preliminarily approved</b> and is <b>awaiting full review</b>.')|safe) }}
-        {{ _('ASK FLIGTAR') }}
+        {{ status('lite-nom', _('This add-on has been <b>preliminarily reviewed</b> and is <b>awaiting full review</b>.')|safe) }}
+        {{ _("You will receive an email when the full review is complete. Until then, your add-on is displayed in our gallery as experimental and users are receiving automatic updates. Some features are unavailable to your add-on.") }}
       {% elif addon.status == amo.STATUS_PURGATORY %}
         {{ status('purgatory', _('Please select a review option.')) }}
-        {% trans url=remora_url('developers/docs/policies/reviews#selection') %}
-          All add-ons hosted in our gallery must now be reviewed by an editor. If you
-          wish to continue hosting your add-on, please select a review process from the
-          choices below. <a href="{{ url }}">Learn more about the review choices.</a>
-        {% endtrans %}
+        {{ _("All add-ons hosted in our gallery must now be reviewed by an editor. If you wish to continue hosting your add-on, please select a review process from the choices below.") }}
       {% endif %}
+      <a href="{{ remora_url('developers/docs/policies/reviews#selection') }}">
+        {{ _('Learn more') }}</a>
 
       <div class="version-status-actions item-actions">
         {% set req = {amo.STATUS_PUBLIC: _('Request Full Review'),