Fix bug 1001831 - Wrong text in new imipBar button strings. r=philipp
authorMakeMyDay <makemyday@gmx-topmail.de>
Mon, 28 Apr 2014 15:39:46 +0200
changeset 19958 c3d5f07afddd6efee64c764bdd6e0e1270224e45
parent 19957 676cdd2e540a1ca35721282815c27c3b2855c182
child 19959 bd8a30ab9160372f28fe7be1f41f3e3ec1446768
push id1151
push usermbanner@mozilla.com
push dateMon, 09 Jun 2014 22:14:36 +0000
treeherdercomm-beta@ce127428ad7d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp
bugs1001831
Fix bug 1001831 - Wrong text in new imipBar button strings. r=philipp
calendar/lightning/content/imip-bar-overlay.xul
calendar/locales/en-US/chrome/lightning/lightning.dtd
--- a/calendar/lightning/content/imip-bar-overlay.xul
+++ b/calendar/lightning/content/imip-bar-overlay.xul
@@ -109,128 +109,128 @@
                              label="&lightning.imipbar.btnDelete.label;"
                              tooltiptext="&lightning.imipbar.btnDelete.tooltiptext;"
                              class="toolbarbutton-1 msgHeaderView-button imipDeleteButton"
                              oncommand="ltnImipBar.executeAction()"
                              hidden="true"/>
 
               <!-- re-confirm partstat -->
               <toolbarbutton id="imipReconfirmButton"
-                             label="&lightning.imipbar.btnReconfirm.label;"
+                             label="&lightning.imipbar.btnReconfirm2.label;"
                              tooltiptext="&lightning.imipbar.btnReconfirm.tooltiptext;"
                              class="toolbarbutton-1 msgHeaderView-button imipReconfirmButton"
                              oncommand="ltnImipBar.executeAction()"
                              hidden="true"/>
 
               <!-- accept -->
               <toolbarbutton id="imipAcceptButton"
-                             tooltiptext="&lightning.imipbar.btnAccept.tooltiptext;"
+                             tooltiptext="&lightning.imipbar.btnAccept2.tooltiptext;"
                              label="&lightning.imipbar.btnAccept.label;"
                              oncommand="if (event.target.id == this.id) ltnImipBar.executeAction('ACCEPTED');"
                              type="menu-button"
                              class="imip-button toolbarbutton-1 msgHeaderView-button imipAcceptButton"
                              hidden="true">
                 <menupopup id="imipAcceptDropdown">
                   <menuitem id="imipAcceptButton_Accept"
-                            tooltiptext="&lightning.imipbar.btnAccept.tooltiptext;"
+                            tooltiptext="&lightning.imipbar.btnAccept2.tooltiptext;"
                             label="&lightning.imipbar.btnAccept.label;"
                             oncommand="ltnImipBar.executeAction('ACCEPTED');"/>
                   <menuitem id="imipAcceptButton_Tentative"
-                            tooltiptext="&lightning.imipbar.btnTentative.tooltiptext;"
+                            tooltiptext="&lightning.imipbar.btnTentative2.tooltiptext;"
                             label="&lightning.imipbar.btnTentative.label;"
                             oncommand="ltnImipBar.executeAction('TENTATIVE');"/>
                   <!-- add here more menuitem as needed -->
                 </menupopup>
               </toolbarbutton>
 
               <!-- accept recurrences -->
               <toolbarbutton id="imipAcceptRecurrencesButton"
-                             tooltiptext="&lightning.imipbar.btnAcceptRecurrences.tooltiptext;"
+                             tooltiptext="&lightning.imipbar.btnAcceptRecurrences2.tooltiptext;"
                              label="&lightning.imipbar.btnAcceptRecurrences.label;"
                              oncommand="if (event.target.id == this.id) ltnImipBar.executeAction('ACCEPTED');"
                              type="menu-button"
                              class="imip-button toolbarbutton-1 msgHeaderView-button imipAcceptRecurrencesButton"
                              hidden="true">
                 <menupopup id="imipAcceptRecurrencesDropdown">
                   <menuitem id="imipAcceptRecurrencesButton_Accept"
-                            tooltiptext="&lightning.imipbar.btnAcceptRecurrences.tooltiptext;"
+                            tooltiptext="&lightning.imipbar.btnAcceptRecurrences2.tooltiptext;"
                             label="&lightning.imipbar.btnAcceptRecurrences.label;"
                             oncommand="ltnImipBar.executeAction('ACCEPTED');"/>
                   <menuitem id="imipAcceptRecurrencesButton_Tentative"
                             tooltiptext="&lightning.imipbar.btnTentativeRecurrences.tooltiptext;"
                             label="&lightning.imipbar.btnTentativeRecurrences.label;"
                             oncommand="ltnImipBar.executeAction('TENTATIVE');"/>
                   <!-- add here more menuitem as needed -->
                 </menupopup>
               </toolbarbutton>
 
               <!-- tentative; should only be used, if no imipMoreButton is used and
                  - imipDeclineButton/imipAcceptButton have no visible menuitems //-->
               <toolbarbutton id="imipTentativeButton"
                              label="&lightning.imipbar.btnTentative.label;"
-                             tooltiptext="&lightning.imipbar.btnTentative.tooltiptext;"
+                             tooltiptext="&lightning.imipbar.btnTentative2.tooltiptext;"
                              class="toolbarbutton-1 msgHeaderView-button imipTentativeButton"
                              oncommand="if (event.target.id == this.id) ltnImipBar.executeAction('TENTATIVE');"
                              type="menu-button"
                              hidden="true">
                 <menupopup id="imipTentativeDropdown">
                   <menuitem id="imipTentativeButton_Tentative"
-                            tooltiptext="&lightning.imipbar.btnTentative.tooltiptext;"
+                            tooltiptext="&lightning.imipbar.btnTentative2.tooltiptext;"
                             label="&lightning.imipbar.btnTentative.label;"
                             oncommand="ltnImipBar.executeAction('TENTATIVE');"/>
                   <!-- add here more menuitem as needed -->
                 </menupopup>
               </toolbarbutton>
 
               <!-- tentative recurrences; should only be used, if no imipMoreButton is used and
                  - imipDeclineRecurrencesButton/imipAcceptRecurrencesButton have no visible menuitems //-->
               <toolbarbutton id="imipTentativeRecurrencesButton"
                              label="&lightning.imipbar.btnTentativeRecurrences.label;"
-                             tooltiptext="&lightning.imipbar.btnTentativeRecurrences.tooltiptext;"
+                             tooltiptext="&lightning.imipbar.btnTentativeRecurrences2.tooltiptext;"
                              class="toolbarbutton-1 msgHeaderView-button imipTentativeRecurrencesButton"
                              oncommand="if (event.target.id == this.id) ltnImipBar.executeAction('TENTATIVE');"
                              type="menu-button"
                              hidden="true">
                 <menupopup id="imipTentativeRecurrencesDropdown">
                   <menuitem id="imipTentativeRecurrencesButton_Tentative"
-                            tooltiptext="&lightning.imipbar.btnTentativeRecurrences.tooltiptext;"
+                            tooltiptext="&lightning.imipbar.btnTentativeRecurrences2.tooltiptext;"
                             label="&lightning.imipbar.btnTentativeRecurrences.label;"
                             oncommand="ltnImipBar.executeAction('TENTATIVE');"/>
                   <!-- add here more menuitem as needed -->
                 </menupopup>
               </toolbarbutton>
 
               <!-- decline -->
               <toolbarbutton id="imipDeclineButton"
-                             tooltiptext="&lightning.imipbar.btnDecline.tooltiptext;"
+                             tooltiptext="&lightning.imipbar.btnDecline2.tooltiptext;"
                              label="&lightning.imipbar.btnDecline.label;"
                              oncommand="if (event.target.id == this.id) ltnImipBar.executeAction('DECLINED');"
                              type="menu-button"
                              class="toolbarbutton-1 msgHeaderView-button imipDeclineButton"
                              hidden="true">
                 <menupopup id="imipDeclineDropdown">
                   <menuitem id="imipDeclineButton_Decline"
-                            tooltiptext="&lightning.imipbar.btnDecline.tooltiptext;"
+                            tooltiptext="&lightning.imipbar.btnDecline2.tooltiptext;"
                             label="&lightning.imipbar.btnDecline.label;"
                             oncommand="ltnImipBar.executeAction('DECLINED');"/>
                   <!-- add here more menuitem as needed -->
                 </menupopup>
               </toolbarbutton>
 
               <!-- decline recurrences -->
               <toolbarbutton id="imipDeclineRecurrencesButton"
-                             tooltiptext="&lightning.imipbar.btnDeclineRecurrences.tooltiptext;"
+                             tooltiptext="&lightning.imipbar.btnDeclineRecurrences2.tooltiptext;"
                              label="&lightning.imipbar.btnDeclineRecurrences.label;"
                              oncommand="if (event.target.id == this.id) ltnImipBar.executeAction('DECLINED');"
                              type="menu-button"
                              class="toolbarbutton-1 msgHeaderView-button imipDeclineRecurrencesButton"
                              hidden="true">
                 <menupopup id="imipDeclineRecurrencesDropdown">
                   <menuitem id="imipDeclineRecurrencesButton_DeclineAll"
-                            tooltiptext="&lightning.imipbar.btnDeclineRecurrences.tooltiptext;"
+                            tooltiptext="&lightning.imipbar.btnDeclineRecurrences2.tooltiptext;"
                             label="&lightning.imipbar.btnDeclineRecurrences.label;"
                             oncommand="ltnImipBar.executeAction('DECLINED');"/>
                   <!-- add here more menuitem as needed -->
                 </menupopup>
               </toolbarbutton>
 
               <!-- more options -->
               <toolbarbutton id="imipMoreButton"
--- a/calendar/locales/en-US/chrome/lightning/lightning.dtd
+++ b/calendar/locales/en-US/chrome/lightning/lightning.dtd
@@ -36,37 +36,37 @@
 <!ENTITY lightning.menu.eventtask.label                "Events and Tasks">
 <!ENTITY lightning.menu.eventtask.accesskey            "n">
 
 <!-- properties dialog, calendar creation wizard -->
 <!ENTITY lightning.calendarproperties.email.label               "E-Mail:">
 
 <!-- iMIP Bar (meeting support) -->
 <!ENTITY lightning.imipbar.btnAccept.label                                  "Accept">
-<!ENTITY lightning.imipbar.btnAccept.tooltiptext                            "Accept event participation">
+<!ENTITY lightning.imipbar.btnAccept2.tooltiptext                           "Accept event invitation">
 <!ENTITY lightning.imipbar.btnAcceptRecurrences.label                       "Accept all">
-<!ENTITY lightning.imipbar.btnAcceptRecurrences.tooltiptext                 "Accept event participation for all recurrences of the event">
+<!ENTITY lightning.imipbar.btnAcceptRecurrences2.tooltiptext                "Accept event invitation for all occurrences of the event">
 <!ENTITY lightning.imipbar.btnAdd.label                                     "Add">
 <!ENTITY lightning.imipbar.btnAdd.tooltiptext                               "Add the event to the calendar">
 <!ENTITY lightning.imipbar.btnDecline.label                                 "Decline">
-<!ENTITY lightning.imipbar.btnDecline.tooltiptext                           "Decline event participation">
+<!ENTITY lightning.imipbar.btnDecline2.tooltiptext                          "Decline event invitation">
 <!ENTITY lightning.imipbar.btnDeclineRecurrences.label                      "Decline all">
-<!ENTITY lightning.imipbar.btnDeclineRecurrences.tooltiptext                "Accept event participation for all recurrences of the event">
+<!ENTITY lightning.imipbar.btnDeclineRecurrences2.tooltiptext               "Decline event invitation for all occurrences of the event">
 <!ENTITY lightning.imipbar.btnDelete.label                                  "Delete">
 <!ENTITY lightning.imipbar.btnDelete.tooltiptext                            "Delete from calendar">
 <!ENTITY lightning.imipbar.btnDetails.label                                 "Details…">
 <!ENTITY lightning.imipbar.btnDetails.tooltiptext                           "Show event details">
 <!ENTITY lightning.imipbar.btnMore.label                                    "More">
 <!ENTITY lightning.imipbar.btnMore.tooltiptext                              "Click to show more options">
-<!ENTITY lightning.imipbar.btnReconfirm.label                               "Send">
-<!ENTITY lightning.imipbar.btnReconfirm.tooltiptext                         "Sends a re-confirmation to the organizer">
+<!ENTITY lightning.imipbar.btnReconfirm2.label                              "Reconfirm">
+<!ENTITY lightning.imipbar.btnReconfirm.tooltiptext                         "Sends a reconfirmation to the organizer">
 <!ENTITY lightning.imipbar.btnTentative.label                               "Tentative">
-<!ENTITY lightning.imipbar.btnTentative.tooltiptext                         "Accept event participation tentatively">
+<!ENTITY lightning.imipbar.btnTentative2.tooltiptext                        "Accept event invitation tentatively">
 <!ENTITY lightning.imipbar.btnTentativeRecurrences.label                    "Tentative all">
-<!ENTITY lightning.imipbar.btnTentativeRecurrences.tooltiptext              "Accept event participation tentatively for all recurrences of the event">
+<!ENTITY lightning.imipbar.btnTentativeRecurrences2.tooltiptext             "Accept event invitation tentatively for all occurrences of the event">
 <!ENTITY lightning.imipbar.btnUpdate.label                                  "Update">
 <!ENTITY lightning.imipbar.btnUpdate.tooltiptext                            "Update event in calendar">
 <!ENTITY lightning.imipbar.description                                      "This message contains an invitation to an event.">
 
 <!-- Lightning specific keybindings -->
 <!ENTITY lightning.keys.event.showCalendar.key "C">
 <!ENTITY lightning.keys.event.showTasks.key "D">
 <!ENTITY lightning.keys.event.new "I">