[california] Remove -> Delete, Update -> Edit: Bug #731486

[Jim Nelson <jnelson src gnome org>]

commit 394f7400f1602f53c304fc8d1e42cefb25518561
Author: Jim Nelson <jim yorba org>
Date:   Wed Jul 23 15:37:55 2014 -0700

    Remove -> Delete, Update -> Edit: Bug #731486

 src/host/host-create-update-event.vala |    6 +++---
 src/host/host-show-event.vala          |   10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/host/host-create-update-event.vala b/src/host/host-create-update-event.vala
index a3e9206..ee19080 100644
--- a/src/host/host-create-update-event.vala
+++ b/src/host/host-create-update-event.vala
@@ -79,8 +79,8 @@ public class CreateUpdateEvent : Gtk.Grid, Toolkit.Card {
     
     private Gtk.Button accept_button = new Gtk.Button();
     private Gtk.Button cancel_button = new Gtk.Button.with_mnemonic(_("_Cancel"));
-    private Gtk.Button update_all_button = new Gtk.Button.with_mnemonic(_("Update A_ll Events"));
-    private Gtk.Button update_this_button = new Gtk.Button.with_mnemonic(_("Update _This Event"));
+    private Gtk.Button update_all_button = new Gtk.Button.with_mnemonic(_("Edit A_ll Events"));
+    private Gtk.Button update_this_button = new Gtk.Button.with_mnemonic(_("Edit _This Event"));
     private Gtk.Button cancel_recurring_button = new Gtk.Button.with_mnemonic(_("_Cancel"));
     
     public CreateUpdateEvent() {
@@ -236,7 +236,7 @@ public class CreateUpdateEvent : Gtk.Grid, Toolkit.Card {
         location_entry.text = event.location ?? "";
         description_textview.buffer.text = event.description ?? "";
         
-        accept_button.label = is_update ? _("_Update") : _("C_reate");
+        accept_button.label = is_update ? _("_Edit") : _("C_reate");
         accept_button.use_underline = true;
         
         rotating_button_box.family = FAMILY_NORMAL;
diff --git a/src/host/host-show-event.vala b/src/host/host-show-event.vala
index ee8998b..663130a 100644
--- a/src/host/host-show-event.vala
+++ b/src/host/host-show-event.vala
@@ -51,12 +51,12 @@ public class ShowEvent : Gtk.Grid, Toolkit.Card {
     private Toolkit.RotatingButtonBox rotating_button_box = new Toolkit.RotatingButtonBox();
     
     private Gtk.Button close_button = new Gtk.Button.with_mnemonic(_("_Close"));
-    private Gtk.Button update_button = new Gtk.Button.with_mnemonic(_("_Update"));
-    private Gtk.Button remove_button = new Gtk.Button.with_mnemonic(_("_Remove"));
-    private Gtk.Button remove_all_button = new Gtk.Button.with_mnemonic(_("Remove A_ll Events"));
-    private Gtk.Button remove_this_button = new Gtk.Button.with_mnemonic(_("Remove _This Event"));
+    private Gtk.Button update_button = new Gtk.Button.with_mnemonic(_("_Edit"));
+    private Gtk.Button remove_button = new Gtk.Button.with_mnemonic(_("_Delete"));
+    private Gtk.Button remove_all_button = new Gtk.Button.with_mnemonic(_("Delete A_ll Events"));
+    private Gtk.Button remove_this_button = new Gtk.Button.with_mnemonic(_("Delete _This Event"));
     private Gtk.Button remove_this_future_button = new Gtk.Button.with_mnemonic(
-        _("Remove This and _Future Events"));
+        _("Delete This and _Future Events"));
     private Gtk.Button cancel_remove_button = new Gtk.Button.with_mnemonic(_("_Cancel"));
     
     public ShowEvent() {