diff --git a/src/www/js/CalendarEditor.js b/src/www/js/CalendarEditor.js
index 22b9474..96befe7 100644
--- a/src/www/js/CalendarEditor.js
+++ b/src/www/js/CalendarEditor.js
@@ -1038,7 +1038,7 @@ Dragonfly.Calendar.CalendarInvitationPopup.prototype.deleteClicked = function (e
     var d = Dragonfly;
 
     var loc = new d.Location ({ tab: 'mail', conversation: this.invite.convId, message: this.invite.bongoId });
-    d.notify (_('genericSavingChanges'), true);
+    d.notify (_('Saving changes...'), true);
     d.request ('POST', loc, { method: 'delete' }).addCallbacks (
         bind ('disposeAndReload', this),
         bind ('showError', this));
@@ -1049,7 +1049,7 @@ Dragonfly.Calendar.CalendarInvitationPopup.prototype.junkClicked = function (evt
     var d = Dragonfly;
 
     var loc = new d.Location ({ tab: 'mail', conversation: this.invite.convId, message: this.invite.bongoId });
-    d.notify (_('genericSavingChanges'), true);
+    d.notify (_('Saving changes...'), true);
     d.request ('POST', loc, { method: 'junk' }).addCallbacks (
         bind ('disposeAndReload', this),
         bind ('showError', this));
@@ -1059,7 +1059,7 @@ Dragonfly.Calendar.CalendarInvitationPopup.prototype.ignoreClicked = function (e
 {
     var d = Dragonfly;
     var loc = new d.Location ({ tab: 'mail', conversation: this.invite.convId, message: this.invite.bongoId });
-    d.notify (_('genericSavingChanges'), true);
+    d.notify (_('Saving changes...'), true);
     var req = d.request ('POST', loc, { method: 'archive' }).addCallbacks (
         bind ('disposeAndReload', this),
         bind ('showError', this));
diff --git a/src/www/js/Composer.js b/src/www/js/Composer.js
index d2af4a8..83df0cd 100644
--- a/src/www/js/Composer.js
+++ b/src/www/js/Composer.js
@@ -154,7 +154,7 @@ Dragonfly.Mail.Composer.prototype.buildHtml = function (html)
         }
     }
 
-    html.push ('<li><a id="', this.addAttachment, '">', _('mailAttachLabel'), '</a></li></ul>',
+    html.push ('<li><a id="', this.addAttachment, '">', _('Attach file...'), '</a></li></ul>',
                '<tr><td colspan="2"><textarea id="', this.body, '" class="body" cols="75" rows="15"  wrap="on">',
                d.escapeHTML (this.msg.body), '</textarea></td></tr>',
                '<tr class="action"><td id="', this.toolbar, '" colspan="2">',
diff --git a/src/www/js/OccurrenceEditor.js b/src/www/js/OccurrenceEditor.js
index 3301f67..b9ca5a4 100644
--- a/src/www/js/OccurrenceEditor.js
+++ b/src/www/js/OccurrenceEditor.js
@@ -277,7 +277,7 @@ Dragonfly.Calendar.OccurrencePopup.prototype.getScope = function (forSave)
         '<label><input type="radio" name="scope">', _('all events in series'), '</label>',
         '</form>'];
     var actions = [
-        { value: _('genericCancel'), onclick: 'dispose'},
+        { value: _('Cancel'), onclick: 'dispose'},
         { value: forSave ? _('Save') : _('Delete'), onclick: partial (this.dispatchWithScope, forSave) }];
     this.setForm (form, actions);
     this.show();
@@ -377,7 +377,7 @@ Dragonfly.Calendar.OccurrenceEditor.prototype.buildSharingTab = function (page)
     var c = d.Calendar;
 
     var html = new d.HtmlBuilder (
-        _('includeEventLabel'),
+        _('Include this event in:'),
         '<ul id="', this.calendarsId, '" class="scrollv" style="max-height: 8em">');
 
     var calIds = this.occurrence.vcalendar.calendarIds;
diff --git a/src/www/js/Summary.js b/src/www/js/Summary.js
index 011d9f0..2bc73db 100644
--- a/src/www/js/Summary.js
+++ b/src/www/js/Summary.js
@@ -325,7 +325,7 @@ Dragonfly.Summary.addCalInvites = function (loc, jsob)
         var cal = s.calInvites[bongoId];
         html.push ('<li><a bongoid="', bongoId, '">',
                    d.escapeHTML (cal.calendarName),
-                   ' ', _('summaryInviteFrom'), ' ',
+                   ' ', _('from'), ' ',
                    d.escapeHTML (cal.from[0][0]),
                    '</a></li>');
     }