Bug 392737: Event dialog: No 'save and close' function in the new event file menu - r=fallen

Bug 392737: Event dialog: No 'save and close' function in the new event file menu - r=philipp

--HG--
extra : rebase_source : d9e8da700614eb878778194e15756bc9b0c06bd1

calendar/base/content/dialogs/calendar-event-dialog.xul

@@ -236,6 +236,10 @@
              modifiers="accel"
              key="&event.dialog.save.key;"
              command="cmd_save"/>
+        <key id="saveandclose-key"
+             modifiers="accel"
+             key="&event.dialog.saveandclose.key;"
+             command="cmd_accept"/>
         <key id="delete-key"
              modifiers="accel"
              key="&event.dialog.delete.key;"
@@ -321,6 +325,11 @@
                               accesskey="&event.menu.item.save.accesskey;"
                               key="save-key"
                               command="cmd_save"/>
+                    <menuitem id="item-saveandclose-menuitem"
+                              label="&event.menu.item.saveandclose.label;"
+                              accesskey="&event.menu.item.saveandclose.accesskey;"
+                              key="saveandclose-key"
+                              command="cmd_accept"/>
                     <menuitem id="item-delete-menuitem"
                               label="&event.menu.item.delete.label;"
                               accesskey="&event.menu.item.delete.accesskey;"

calendar/locales/en-US/chrome/calendar/calendar-event-dialog.dtd

@@ -71,6 +71,7 @@
 <!ENTITY event.dialog.new.message.key             "M">
 <!ENTITY event.dialog.close.key                   "W">
 <!ENTITY event.dialog.save.key                    "S">
+<!ENTITY event.dialog.saveandclose.key            "L">
 <!ENTITY event.dialog.delete.key                  "D">
 <!ENTITY event.dialog.print.key                   "P">
 <!ENTITY event.dialog.undo.key                    "Z">
@@ -93,6 +94,8 @@
 <!ENTITY  event.menu.item.close.accesskey                 "C">
 <!ENTITY  event.menu.item.save.label                      "Save">
 <!ENTITY  event.menu.item.save.accesskey                  "S">
+<!ENTITY  event.menu.item.saveandclose.label              "Save and Close">
+<!ENTITY  event.menu.item.saveandclose.accesskey          "l"
 <!ENTITY  event.menu.item.delete.label                    "Delete…">
 <!ENTITY  event.menu.item.delete.accesskey                "D">
 <!ENTITY  event.menu.item.page.setup.label                "Page Setup">