Bug 1120258 - Saving an item in the event dialog fails with MODIFICATION_FAILED if the item has been modified elsewhere. r=philipp
authorMatthew Mecca <matthew.mecca@gmail.com>
Sun, 08 Feb 2015 20:49:00 +0100
changeset 8408 4a4f821d2e8d48d50bf2ef79b11976302263d1e2
parent 8407 7e43d1294c32df4d71924e8866ed7ab71326fb1e
child 8409 4827a0b101db2d042e94ed51cd0d4141ced5f972
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersphilipp
bugs1120258
Bug 1120258 - Saving an item in the event dialog fails with MODIFICATION_FAILED if the item has been modified elsewhere. r=philipp X-Channel-Repo: comm-central X-Channel-Converted-Revision: 2872ad20a04143d17a570452cb2ca3b0960c18c6
calendar/chrome/calendar/calendar.properties
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -622,8 +622,15 @@ unitDays=#1 day;#1 days
 # LOCALIZATION NOTE (showCalendar)
 # Used in calendar list context menu
 #    %1$S will be replaced with the calendar name
 # uses the access key calendar.context.togglevisible.accesskey
 showCalendar=Show %1$S
 hideCalendar=Hide %1$S
 # uses the access key calendar.context.showonly.accesskey
 showOnlyCalendar=Show Only %1$S
+
+# LOCALIZATION NOTE (modifyConflict)
+# Used by the event dialog to resolve item modification conflicts.
+modifyConflictPromptTitle=Item Modification Conflict
+modifyConflictPromptMessage=The item being edited in the dialog has been modified since it was opened.
+modifyConflictPromptButton1=Overwrite the other changes
+modifyConflictPromptButton2=Discard these changes