Bug 579707 - Hard-coded strings need to be replaced with entities; r+a=dtownsend
authorAndres Hernandez <andres@appcoast.com>
Fri, 13 Aug 2010 12:07:36 -0700
changeset 50572 1a841e176c6cf50e6d8a1a6ea7ef7bf82eefa46d
parent 50571 2ddd0d9fe7b35dc800be58496c29b16318044eba
child 50573 72491f4caf6d994cd64ca27ad5601cb369e7f744
push idunknown
push userunknown
push dateunknown
bugs579707
milestone2.0b4pre
Bug 579707 - Hard-coded strings need to be replaced with entities; r+a=dtownsend
browser/app/profile/extensions/testpilot@labs.mozilla.com/content/all-studies-window.xul
browser/app/profile/extensions/testpilot@labs.mozilla.com/content/feedback-browser.xul
browser/app/profile/extensions/testpilot@labs.mozilla.com/content/tp-browser.xul
browser/app/profile/extensions/testpilot@labs.mozilla.com/defaults/preferences/preferences.js
browser/locales/en-US/feedback/main.dtd
browser/locales/en-US/feedback/main.properties
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/all-studies-window.xul
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/all-studies-window.xul
@@ -91,23 +91,23 @@
                       name="extensions.testpilot.popup.showOnNewStudy"/>
           <preference id="notify-results" type="bool"
                       name="extensions.testpilot.popup.showOnNewResults"/>
           <preference id="always-submit-data" type="bool"
                       name="extensions.testpilot.alwaysSubmitData"/>
         </preferences>
         <vbox style="padding: 12px;">
           <groupbox>
-            <caption label="Data Submission" />
+            <caption label="&testpilot.settings.dataSubmission.label;" />
             <checkbox label="&testpilot.settings.alwaysSubmitData.label;"
                       preference="always-submit-data"/>
           </groupbox>
           <groupbox>
-            <caption label="Notifications" />
-            <label value="&testpilot.settings.notifyMeWhen.label;"/>
+            <caption label="&testpilot.settings.notifications.label;" />
+            <label value="&testpilot.settings.notifyWhen.label;"/>
             <hbox>
               <separator orient="vertical" />
               <vbox>
                 <checkbox label="&testpilot.settings.readyToSubmit.label;"
                           preference="notify-finished"/>
                 <checkbox label="&testpilot.settings.newStudy.label;"
                           preference="notify-new"/>
                 <checkbox label="&testpilot.settings.hasNewResults.label;"
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/feedback-browser.xul
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/feedback-browser.xul
@@ -66,16 +66,16 @@
               oncommand="TestPilotWindowUtils.openFeedbackPage(true);"/>
     <menuitem id="feedback-menu-sad-button"
               class="menuitem-iconic"
               image="chrome://testpilot-os/skin/feedback-frown-16x16.png"
               label = "&testpilot.sad.label;"
               oncommand="TestPilotWindowUtils.openFeedbackPage(false);"/>
     <menuseparator/>
     <menuitem id="feedback-menu-show-studies"
-              label="&testpilot.allStudies.label;..."
+              label="&testpilot.allYourStudies.label;"
               oncommand="TestPilotWindowUtils.openAllStudiesWindow();"/>
     <menuitem id="feedback-menu-enable-studies" 
               label="&testpilot.enable.label;"
               oncommand="TestPilotMenuUtils.togglePref('runStudies');"/>
   </menupopup>
 </menu>
 </overlay>
\ No newline at end of file
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/tp-browser.xul
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/tp-browser.xul
@@ -19,17 +19,17 @@
 <menu id="pilot-menu" class="menu-iconic" label="&testpilot.brand.label;"
       insertafter="addonsManager"
       image="chrome://testpilot/skin/testpilot_16x16.png">
   <menupopup id="pilot-menu-popup"
              onpopuphiding="TestPilotMenuUtils.onPopupHiding(event);">
     <menu id="pilot-notification-settings" label="&testpilot.settings.label;">
       <menupopup onpopupshowing="TestPilotMenuUtils.updateSubmenu();">
         <menuitem class="pilot-notify-me-when"
-                  label="&testpilot.settings.notifyMeWhen.label;..."
+                  label="&testpilot.settings.notifyWhen.label;"
                   disabled="true"/>
         <menuitem id="pilot-menu-notify-finished"
                   label="&testpilot.settings.readyToSubmit.label;"
                   type="checkbox"
                   oncommand="
                     TestPilotMenuUtils.togglePref('popup.showOnStudyFinished');"/>
         <menuitem id="pilot-menu-notify-new"
                   label="&testpilot.settings.newStudy.label;" type="checkbox"
@@ -43,17 +43,17 @@
         <menuseparator />
         <menuitem id="pilot-menu-always-submit-data"
                   label="&testpilot.settings.alwaysSubmitData.label;"
                   type="checkbox"
                   oncommand="
                     TestPilotMenuUtils.togglePref('alwaysSubmitData');"/>
       </menupopup>
     </menu>
-    <menuitem label="&testpilot.allStudies.label;..."
+    <menuitem label="&testpilot.allYourStudies.label;"
               oncommand="TestPilotWindowUtils.openAllStudiesWindow();"/>
     <menuitem label="&testpilot.about.label;"
               oncommand="TestPilotWindowUtils.openHomepage();"/>
   </menupopup>
 </menu>
 
 <statusbar id="status-bar">
   <statusbarpanel id="pilot-notifications-button"
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/defaults/preferences/preferences.js
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/defaults/preferences/preferences.js
@@ -1,10 +1,12 @@
 pref("extensions.testpilot.indexFileName", "index.json");
 
+pref("extensions.testpilot@labs.mozilla.com.description", "chrome://testpilot/locale/main.properties");
+
 pref("extensions.testpilot.popup.delayAfterStartup", 180000); // 3 minutes
 pref("extensions.testpilot.popup.timeBetweenChecks", 86400000); // 24 hours
 pref("extensions.testpilot.uploadRetryInterval", 3600000); // 1 hour
 
 pref("extensions.testpilot.popup.showOnNewStudy", false);
 pref("extensions.testpilot.popup.showOnStudyFinished", true);
 pref("extensions.testpilot.popup.showOnNewResults", false);
 pref("extensions.testpilot.alwaysSubmitData", false);
--- a/browser/locales/en-US/feedback/main.dtd
+++ b/browser/locales/en-US/feedback/main.dtd
@@ -1,17 +1,19 @@
 <!ENTITY testpilot.brand.label                      "Test Pilot">
 <!-- browser window: menu and status bar -->
 <!ENTITY testpilot.settings.label                   "Settings">
-<!ENTITY testpilot.settings.notifyMeWhen.label      "Notify me when">
+<!ENTITY testpilot.settings.dataSubmission.label    "Data Submission">
+<!ENTITY testpilot.settings.notifications.label     "Notifications">
+<!ENTITY testpilot.settings.notifyWhen.label        "Notify me when…">
 <!ENTITY testpilot.settings.readyToSubmit.label     "A study is ready to submit">
 <!ENTITY testpilot.settings.newStudy.label          "There's a new study">
 <!ENTITY testpilot.settings.hasNewResults.label     "A study has new results">
 <!ENTITY testpilot.settings.alwaysSubmitData.label  "Automatically submit my data (don't ask me)">
-<!ENTITY testpilot.allStudies.label                 "All Your User Studies">
+<!ENTITY testpilot.allYourStudies.label             "All Your User Studies…">
 <!ENTITY testpilot.about.label                      "About Test Pilot">
 
 <!-- all studies window -->
 <!ENTITY testpilot.studiesWindow.title                  "Your Test Pilot Studies">
 <!ENTITY testpilot.studiesWindow.currentStudies.label   "Current Studies">
 <!ENTITY testpilot.studiesWindow.finishedStudies.label  "Finished Studies">
 <!ENTITY testpilot.studiesWindow.studyFindings.label    "Study Findings">
 <!ENTITY testpilot.studiesWindow.settings.label         "Settings">
--- a/browser/locales/en-US/feedback/main.properties
+++ b/browser/locales/en-US/feedback/main.properties
@@ -1,8 +1,11 @@
+# description for add-on manager
+extensions.testpilot@labs.mozilla.com.description = Help make Firefox better by running user studies.
+
 # common
 testpilot.fullBrandName = Mozilla Labs Test Pilot
 testpilot.moreInfo = More Info
 testpilot.submit = Submit
 testpilot.takeSurvey = Take the Survey
 
 # Feedback button menu
 testpilot.turnOn = Turn On User Studies