diff --git a/assignment/assignment-bundles/resources/assignment.properties b/assignment/assignment-bundles/resources/assignment.properties index 39f4b1aa7148..e5395cc03e40 100644 --- a/assignment/assignment-bundles/resources/assignment.properties +++ b/assignment/assignment-bundles/resources/assignment.properties @@ -26,7 +26,7 @@ attaonly = Attachments only attempty = Can not submit empty attachments: ''{0}''. -cannotfin1 = Can not add the due date to schedule. +cannotfin1 = Can not add the due date to calendar. cannotfin_assignment = Can not find the assignment ''{0}''. @@ -74,7 +74,7 @@ gen.addatttoassig = Add Attachments to Assignment gen.addatttoassig.singular = Add Attachment to Assignment gen.addatttoassiginstr = Add an item from your computer or select an existing item from Resources. Once you've made your selection, select 'Continue', or select 'Cancel' to return without making any changes. You will return your assignment - which you should then save. gen.adddroatt = Add / Remove Attachments -gen.addduedat = Add due date to schedule +gen.addduedat = Add due date to calendar gen.addhonple = Add honor pledge gen.addinst = Additional instructor's comments about your submission gen.addinst2 = Instructor's comments about your submission diff --git a/calendar/calendar-bundles/resources/calendar.properties b/calendar/calendar-bundles/resources/calendar.properties index 767a9fd16dda..c5b6da402270 100644 --- a/calendar/calendar-bundles/resources/calendar.properties +++ b/calendar/calendar-bundles/resources/calendar.properties @@ -22,7 +22,7 @@ java.print = Printable Version java.default_view = Set as Default View java.alert.default_view = This is now the default view java.permissions = Permissions -java.set = Set permissions for Schedule in worksite +java.set = Set permissions for Calendar in worksite java.error = The event doesn't exist any more. ical.title = Generate a Link to this Calendar for Public Use @@ -116,7 +116,7 @@ gen.assignmentlink = Assignment Link # note: 'del' prefix comes from Delete.vm originally, but these should be # renamed since they are more widely used... -del.deleting = Deleting schedule item... +del.deleting = Deleting calendar item... del.sure = Are you sure you want to remove this event? del.every = Every del.number = Number of occurrences: @@ -182,7 +182,7 @@ import.outlook.note=NOTE: The import is language sensitive. This means the langu #New Vm new.adding = Add Event -new.toadd = To add an event to the schedule, complete the form and choose 'Save Event' at the bottom. +new.toadd = To add an event to the Calendar, complete the form and choose 'Save Event' at the bottom. new.a = Required items marked with new.scheduleitem = Event @@ -295,7 +295,7 @@ viewl.folder = folder viewl.attach = attachment viewl.froms = From Site: viewl.update = Update -viewl.list.summary = List of events in schedule. Column 1: date. Column 2: time. Column 3: audience. Column 4: title and description. +viewl.list.summary = List of events in calendar. Column 1: date. Column 2: time. Column 3: audience. Column 4: title and description. viewl.sortdateasc = Sort by date ascending viewl.sortdatedesc = Sort by date descending viewl.group.list.summary = Table contains list of groups. First will contain checkboxes, second will contain the group name, third the group description. Header links can be used to sort. @@ -350,7 +350,7 @@ subs.calendar.subscribe = Subscribe merge.merge = Show Events from Another Site merge.select = Select what calendars you want to merge into this site. This site's users will only see those events they had permission to see in the source site. merge.list.summary = List of calendars from sites you can merge into this one. Column 1: site name. Column 2: checkbox - select for merge. -merge.showsched = Show Schedule +merge.showsched = Show Calendar #detail Vm det.lasact = < Last Event @@ -392,7 +392,7 @@ gen.eventtype.list.summary = List of event types in the calendar # Property values used in XSL files to generate schedule PDFs -sched.for = Schedule for +sched.for = Calendar for # ImportException error messages diff --git a/calendar/calendar-tool/tool/src/webapp/tools/sakai.schedule.xml b/calendar/calendar-tool/tool/src/webapp/tools/sakai.schedule.xml index 8f5fe45692d5..0e69998e06e8 100644 --- a/calendar/calendar-tool/tool/src/webapp/tools/sakai.schedule.xml +++ b/calendar/calendar-tool/tool/src/webapp/tools/sakai.schedule.xml @@ -4,7 +4,7 @@ diff --git a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools.properties b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools.properties index 09133fc67f12..f233bdee30b1 100644 --- a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools.properties +++ b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools.properties @@ -143,7 +143,7 @@ sakai.sample.tool.servlet2.title = Simple Sample Servlet Tool sakai.sample.tools.OSIDRepository.description = Display registered Repositories and Search sakai.sample.tools.OSIDRepository.title = Sample use of RepositoryManager Component sakai.schedule.description = For posting and viewing deadlines, events, etc. -sakai.schedule.title = Schedule +sakai.schedule.title = Calendar sakai.scheduler.description = Job Scheduler Based on Quartz sakai.scheduler.title = Job Scheduler sakai.search.description = For searching content @@ -164,7 +164,7 @@ sakai.sitesetup.description = Modify your sites and crea sakai.sitesetup.title = Worksite Setup sakai.su.description = Tool for logging in as another user sakai.su.title = Become User -sakai.summary.calendar.description = Show a summary of schedule events in My Workspace +sakai.summary.calendar.description = Show a summary of calendar events in My Workspace sakai.summary.calendar.title = Calendar sakai.syllabus.description = For posting a summary outline and/or requirements for a site sakai.syllabus.title = Syllabus diff --git a/kernel/kernel-impl/src/main/sql/hsqldb/sakai_site.sql b/kernel/kernel-impl/src/main/sql/hsqldb/sakai_site.sql index fa02a607e906..dc26b0a3626c 100644 --- a/kernel/kernel-impl/src/main/sql/hsqldb/sakai_site.sql +++ b/kernel/kernel-impl/src/main/sql/hsqldb/sakai_site.sql @@ -344,8 +344,8 @@ INSERT INTO SAKAI_SITE_PAGE VALUES('!user-150', '!user', 'Profile', '0', 2, '0' INSERT INTO SAKAI_SITE_TOOL VALUES('!user-165', '!user-150', '!user', 'sakai.profile2', 1, 'Profile', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!user-200', '!user', 'Membership', '0', 3, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('!user-210', '!user-200', '!user', 'sakai.membership', 1, 'Membership', NULL ); -INSERT INTO SAKAI_SITE_PAGE VALUES('!user-300', '!user', 'Schedule', '0', 4, '0' ); -INSERT INTO SAKAI_SITE_TOOL VALUES('!user-310', '!user-300', '!user', 'sakai.schedule', 1, 'Schedule', NULL ); +INSERT INTO SAKAI_SITE_PAGE VALUES('!user-300', '!user', 'Calendar', '0', 4, '0' ); +INSERT INTO SAKAI_SITE_TOOL VALUES('!user-310', '!user-300', '!user', 'sakai.schedule', 1, 'Calendar', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!user-400', '!user', 'Resources', '0', 5, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('!user-410', '!user-400', '!user', 'sakai.resources', 1, 'Resources', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!user-450', '!user', 'Announcements', '0', 6, '0' ); @@ -371,8 +371,8 @@ INSERT INTO SAKAI_SITE_TOOL_PROPERTY VALUES('!worksite', '!worksite-110', 'heigh INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-120', '!worksite-100', '!worksite', 'sakai.synoptic.announcement', 2, 'Recent Announcements', NULL ); INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-130', '!worksite-100', '!worksite', 'sakai.synoptic.messagecenter', 3, 'Recent Forums Items', NULL ); INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-140', '!worksite-100', '!worksite', 'sakai.synoptic.chat', 4, 'Recent Chat Messages', NULL ); -INSERT INTO SAKAI_SITE_PAGE VALUES('!worksite-200', '!worksite', 'Schedule', '0', 2, '0' ); -INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-210', '!worksite-200', '!worksite', 'sakai.schedule', 1, 'Schedule', NULL ); +INSERT INTO SAKAI_SITE_PAGE VALUES('!worksite-200', '!worksite', 'Calendar', '0', 2, '0' ); +INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-210', '!worksite-200', '!worksite', 'sakai.schedule', 1, 'Calendar', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!worksite-300', '!worksite', 'Announcements', '0', 3, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-310', '!worksite-300', '!worksite', 'sakai.announcements', 1, 'Announcements', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!worksite-400', '!worksite', 'Resources', '0', 4, '0' ); @@ -407,8 +407,8 @@ INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-130', 'mercury-100', 'mercury', 'sak INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-140', 'mercury-100', 'mercury', 'sakai.synoptic.chat', 4, 'Recent Chat Messages', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-150', 'mercury', 'Dashboard', '0', 2, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-160', 'mercury-150', 'mercury', 'sakai.dashboard', 1, 'Dashboard', NULL ); -INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-200', 'mercury', 'Schedule', '0', 2, '0' ); -INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-210', 'mercury-200', 'mercury', 'sakai.schedule', 1, 'Schedule', NULL ); +INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-200', 'mercury', 'Calendar', '0', 2, '0' ); +INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-210', 'mercury-200', 'mercury', 'sakai.schedule', 1, 'Calendar', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-300', 'mercury', 'Announcements', '0', 3, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-310', 'mercury-300', 'mercury', 'sakai.announcements', 1, 'Announcements', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-350', 'mercury', 'Lessons', '0', 3, '0' ); @@ -434,4 +434,4 @@ INSERT INTO SAKAI_SITE_TOOL_PROPERTY VALUES('mercury', 'mercury-810', 'display-u INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-900', 'mercury', 'Email Archive', '0', 9, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-910', 'mercury-900', 'mercury', 'sakai.mailbox', 1, 'Email Archive', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-1000', 'mercury', 'Site Info', '0', 10, '0' ); -INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-1010', 'mercury-1000', 'mercury', 'sakai.siteinfo', 1, 'Site Info', NULL ); +INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-1010', 'mercury-1000', 'mercury', 'sakai.siteinfo', 1, 'Site Info', NULL ); \ No newline at end of file diff --git a/kernel/kernel-impl/src/main/sql/mysql/sakai_site.sql b/kernel/kernel-impl/src/main/sql/mysql/sakai_site.sql index 4452ff1eb2d6..f7f7a0d074af 100644 --- a/kernel/kernel-impl/src/main/sql/mysql/sakai_site.sql +++ b/kernel/kernel-impl/src/main/sql/mysql/sakai_site.sql @@ -358,8 +358,8 @@ INSERT INTO SAKAI_SITE_PAGE VALUES('!user-150', '!user', 'Profile', '0', 2, '0' INSERT INTO SAKAI_SITE_TOOL VALUES('!user-165', '!user-150', '!user', 'sakai.profile2', 1, 'Profile', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!user-200', '!user', 'Membership', '0', 3, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('!user-210', '!user-200', '!user', 'sakai.membership', 1, 'Membership', NULL ); -INSERT INTO SAKAI_SITE_PAGE VALUES('!user-300', '!user', 'Schedule', '0', 4, '0' ); -INSERT INTO SAKAI_SITE_TOOL VALUES('!user-310', '!user-300', '!user', 'sakai.schedule', 1, 'Schedule', NULL ); +INSERT INTO SAKAI_SITE_PAGE VALUES('!user-300', '!user', 'Calendar', '0', 4, '0' ); +INSERT INTO SAKAI_SITE_TOOL VALUES('!user-310', '!user-300', '!user', 'sakai.schedule', 1, 'Calendar', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!user-400', '!user', 'Resources', '0', 5, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('!user-410', '!user-400', '!user', 'sakai.resources', 1, 'Resources', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!user-450', '!user', 'Announcements', '0', 6, '0' ); @@ -385,8 +385,8 @@ INSERT INTO SAKAI_SITE_TOOL_PROPERTY VALUES('!worksite', '!worksite-110', 'heigh INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-120', '!worksite-100', '!worksite', 'sakai.synoptic.announcement', 2, 'Recent Announcements', NULL ); INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-130', '!worksite-100', '!worksite', 'sakai.synoptic.messagecenter', 3, 'Recent Forums Items', NULL ); INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-140', '!worksite-100', '!worksite', 'sakai.synoptic.chat', 4, 'Recent Chat Messages', NULL ); -INSERT INTO SAKAI_SITE_PAGE VALUES('!worksite-200', '!worksite', 'Schedule', '0', 2, '0' ); -INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-210', '!worksite-200', '!worksite', 'sakai.schedule', 1, 'Schedule', NULL ); +INSERT INTO SAKAI_SITE_PAGE VALUES('!worksite-200', '!worksite', 'Calendar', '0', 2, '0' ); +INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-210', '!worksite-200', '!worksite', 'sakai.schedule', 1, 'Calendar', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!worksite-300', '!worksite', 'Announcements', '0', 3, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-310', '!worksite-300', '!worksite', 'sakai.announcements', 1, 'Announcements', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!worksite-400', '!worksite', 'Resources', '0', 4, '0' ); @@ -421,8 +421,8 @@ INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-130', 'mercury-100', 'mercury', 'sak INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-140', 'mercury-100', 'mercury', 'sakai.synoptic.chat', 4, 'Recent Chat Messages', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-150', 'mercury', 'Dashboard', '0', 2, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-160', 'mercury-150', 'mercury', 'sakai.dashboard', 1, 'Dashboard', NULL ); -INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-200', 'mercury', 'Schedule', '0', 2, '0' ); -INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-210', 'mercury-200', 'mercury', 'sakai.schedule', 1, 'Schedule', NULL ); +INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-200', 'mercury', 'Calendar', '0', 2, '0' ); +INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-210', 'mercury-200', 'mercury', 'sakai.schedule', 1, 'Calendar', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-300', 'mercury', 'Announcements', '0', 3, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-310', 'mercury-300', 'mercury', 'sakai.announcements', 1, 'Announcements', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-350', 'mercury', 'Lessons', '0', 3, '0' ); diff --git a/kernel/kernel-impl/src/main/sql/oracle/sakai_site.sql b/kernel/kernel-impl/src/main/sql/oracle/sakai_site.sql index 328d293f0060..446922029f17 100644 --- a/kernel/kernel-impl/src/main/sql/oracle/sakai_site.sql +++ b/kernel/kernel-impl/src/main/sql/oracle/sakai_site.sql @@ -380,8 +380,8 @@ INSERT INTO SAKAI_SITE_PAGE VALUES('!user-150', '!user', 'Profile', '0', 2, '0' INSERT INTO SAKAI_SITE_TOOL VALUES('!user-165', '!user-150', '!user', 'sakai.profile2', 1, 'Profile', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!user-200', '!user', 'Membership', '0', 3, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('!user-210', '!user-200', '!user', 'sakai.membership', 1, 'Membership', NULL ); -INSERT INTO SAKAI_SITE_PAGE VALUES('!user-300', '!user', 'Schedule', '0', 4, '0' ); -INSERT INTO SAKAI_SITE_TOOL VALUES('!user-310', '!user-300', '!user', 'sakai.schedule', 1, 'Schedule', NULL ); +INSERT INTO SAKAI_SITE_PAGE VALUES('!user-300', '!user', 'Calendar', '0', 4, '0' ); +INSERT INTO SAKAI_SITE_TOOL VALUES('!user-310', '!user-300', '!user', 'sakai.schedule', 1, 'Calendar', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!user-400', '!user', 'Resources', '0', 5, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('!user-410', '!user-400', '!user', 'sakai.resources', 1, 'Resources', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!user-450', '!user', 'Announcements', '0', 6, '0' ); @@ -411,8 +411,8 @@ INSERT INTO SAKAI_SITE_TOOL_PROPERTY VALUES('!worksite', '!worksite-110', 'heigh INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-120', '!worksite-100', '!worksite', 'sakai.synoptic.announcement', 2, 'Recent Announcements', NULL ); INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-130', '!worksite-100', '!worksite', 'sakai.synoptic.messagecenter', 3, 'Recent Forums Items', NULL ); INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-140', '!worksite-100', '!worksite', 'sakai.synoptic.chat', 4, 'Recent Chat Messages', NULL ); -INSERT INTO SAKAI_SITE_PAGE VALUES('!worksite-200', '!worksite', 'Schedule', '0', 2, '0' ); -INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-210', '!worksite-200', '!worksite', 'sakai.schedule', 1, 'Schedule', NULL ); +INSERT INTO SAKAI_SITE_PAGE VALUES('!worksite-200', '!worksite', 'Calendar', '0', 2, '0' ); +INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-210', '!worksite-200', '!worksite', 'sakai.schedule', 1, 'Calendar', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!worksite-300', '!worksite', 'Announcements', '0', 3, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('!worksite-310', '!worksite-300', '!worksite', 'sakai.announcements', 1, 'Announcements', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('!worksite-400', '!worksite', 'Resources', '0', 4, '0' ); @@ -451,8 +451,8 @@ INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-130', 'mercury-100', 'mercury', 'sak INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-140', 'mercury-100', 'mercury', 'sakai.synoptic.chat', 4, 'Recent Chat Messages', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-150', 'mercury', 'Dashboard', '0', 2, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-160', 'mercury-150', 'mercury', 'sakai.dashboard', 1, 'Dashboard', NULL ); -INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-200', 'mercury', 'Schedule', '0', 2, '0' ); -INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-210', 'mercury-200', 'mercury', 'sakai.schedule', 1, 'Schedule', NULL ); +INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-200', 'mercury', 'Calendar', '0', 2, '0' ); +INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-210', 'mercury-200', 'mercury', 'sakai.schedule', 1, 'Calendar', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-300', 'mercury', 'Announcements', '0', 3, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('mercury-310', 'mercury-300', 'mercury', 'sakai.announcements', 1, 'Announcements', NULL ); INSERT INTO SAKAI_SITE_PAGE VALUES('mercury-350', 'mercury', 'Lessons', '0', 3, '0' ); diff --git a/reference/docs/conversion/sakai_11_mysql_conversion.sql b/reference/docs/conversion/sakai_11_mysql_conversion.sql index 1fbdeea9e09d..b5c37e33cd0b 100644 --- a/reference/docs/conversion/sakai_11_mysql_conversion.sql +++ b/reference/docs/conversion/sakai_11_mysql_conversion.sql @@ -417,3 +417,7 @@ INSERT INTO SAKAI_SITE VALUES('!contact-us', 'Contact Us', null, null, null, '', INSERT INTO SAKAI_SITE_PAGE VALUES('!contact-us', '!contact-us', 'Contact Us', '0', 1, '0' ); INSERT INTO SAKAI_SITE_TOOL VALUES('!contact-us', '!contact-us', '!contact-us', 'sakai.feedback', 1, 'Contact Us', NULL ); -- END SAK-29271 + +-- SAK-29733 Change Schedule to Calendar for existing sites +UPDATE SAKAI_SITE_TOOL SET TITLE="Calendar" WHERE REGISTRATION = "sakai.schedule" AND TITLE = "Schedule"; +UPDATE SAKAI_SITE_PAGE SET TITLE="Calendar" WHERE TITLE = "Schedule"; \ No newline at end of file diff --git a/signup/tool/src/bundle/messages.properties b/signup/tool/src/bundle/messages.properties index 7c731a92bb63..06f71da6a88f 100644 --- a/signup/tool/src/bundle/messages.properties +++ b/signup/tool/src/bundle/messages.properties @@ -104,11 +104,11 @@ edit.failed_due_to_other_updated_db = Edit failed. Someone else updated the meet #email exception message email.exception = Email was not sent: an error has occurred. -error.calendarEvent.posted_failed = The event was created successfully, but can not be added to the Schedule because the Schedule tool is not present on the site. -error.calendarEvent.posted_failed_due_to_permission = The event was created successfully, but can not be added to the Schedule on the site(s) because you do not have permission to add to the Schedule. -error.calendarEvent.removal_failed = An error occurred and calendarEvent removal in Schedule tool may have failed. -error.calendarEvent.updated_failed = The event was updated successfully, but can not be updated to the Schedule on the site(s) because the Schedule tool is not present on the site. -error.calendarEvent.updated_failed_due_to_permission = The event was updated successfully, but can not be updated to the Schedule on the site(s) because you do not have permission to update the Schedule. +error.calendarEvent.posted_failed = The event was created successfully, but can not be added to the Calendar because the Calendar tool is not present on the site. +error.calendarEvent.posted_failed_due_to_permission = The event was created successfully, but can not be added to the Calendar on the site(s) because you do not have permission to add to the Calendar. +error.calendarEvent.removal_failed = An error occurred and calendarEvent removal in Calendar tool may have failed. +error.calendarEvent.updated_failed = The event was updated successfully, but can not be updated to the Calendar on the site(s) because the Calendar tool is not present on the site. +error.calendarEvent.updated_failed_due_to_permission = The event was updated successfully, but can not be updated to the Calendar on the site(s) because you do not have permission to update the Calendar. error.group_sync_failed = The group could not be synchronised. Has the group been manually deleted from Site Info? To restore this group, visit the modify the meeting page and click 'Publish Modification', then return here to synchronise again. error.no.change.group.title = Some of the group title have not been synchronized since it's modified via Site Info tool already! error.no_group_for_timeslot = The group for this timeslot is missing. To restore this group, visit the modify the meeting page and click 'Publish Modification', then return here to synchronise again. @@ -389,7 +389,7 @@ event_show_no_attendee_info = Private event_show_other_default_setting = Show the other default settings -event_show_schedule = Schedule Details: +event_show_schedule = Calendar Details: event_show_site_group_detail =  Show site(s)/group(s) details @@ -529,7 +529,7 @@ event_yes_label = Yes event_yes_meeting_default_notify_setting =  Yes, pre-select the 'Email Notification' checkbox on the Modify Meeting page. -event_yes_publish_to_calendar =  Yes, publish the meeting to the Schedule tool. +event_yes_publish_to_calendar =  Yes, publish the meeting to the Calendar tool. event_yes_receive_notification =  Yes, send an email notification to the selected meeting coordinators when a participant signs up or cancels an appointment. @@ -764,7 +764,7 @@ publish_processing_submit_message = Processing... publish_new_evnt_button = Publish New Meeting -put_In_Multiple_Calendar_Blocks_at_ScheduleTool = Yes, publish the meeting as multiple calendar events in the Schedule Tool if adjacent timeslots are more than two hours apart. +put_In_Multiple_Calendar_Blocks_at_ScheduleTool = Yes, publish the meeting as multiple calendar events in the Calendar Tool if adjacent timeslots are more than two hours apart. recurrence = Recurring meetings @@ -868,9 +868,9 @@ timeperiod_divider =   -   timeslot.just.canceled = This time slot has been canceled and is no longer available. timeslot.just.locked = This time slot has been locked and is not available. -title_tip_click_hide_schedule = Click to hide schedule details. +title_tip_click_hide_schedule = Click to hide calendar details. -title_tip_click_show_schedule = Click to show schedule details. +title_tip_click_show_schedule = Click to show calendar details. title_tip_delete_this_ts = delete the timeslot. diff --git a/signup/tool/src/bundle/messages_en_AU.properties b/signup/tool/src/bundle/messages_en_AU.properties index 72833536f84f..6872b7ce5a8e 100644 --- a/signup/tool/src/bundle/messages_en_AU.properties +++ b/signup/tool/src/bundle/messages_en_AU.properties @@ -100,11 +100,11 @@ edit.failed_due_to_other_updated_db = Edit failed. Someone else updated the meet #email exception message email.exception = Email was not sent: an error has occurred. -error.calendarEvent.posted_failed = The event was created successfully, but can not be added to the Schedule because the Schedule tool is not present on the site. -error.calendarEvent.posted_failed_due_to_permission = The event was created successfully, but can not be added to the Schedule on the site(s) because you do not have permission to add to the Schedule. -error.calendarEvent.removal_failed = An error occurred and calendarEvent removal in Schedule tool may have failed. -error.calendarEvent.updated_failed = The event was updated successfully, but can not be updated to the Schedule on the site(s) because the Schedule tool is not present on the site. -error.calendarEvent.updated_failed_due_to_permission = The event was updated successfully, but can not be updated to the Schedule on the site(s) because you do not have permission to update the Schedule. +error.calendarEvent.posted_failed = The event was created successfully, but can not be added to the Calendar because the Calendar tool is not present on the site. +error.calendarEvent.posted_failed_due_to_permission = The event was created successfully, but can not be added to the Calendar on the site(s) because you do not have permission to add to the Calendar. +error.calendarEvent.removal_failed = An error occurred and calendarEvent removal in Calendar tool may have failed. +error.calendarEvent.updated_failed = The event was updated successfully, but can not be updated to the Calendar on the site(s) because the Calendar tool is not present on the site. +error.calendarEvent.updated_failed_due_to_permission = The event was updated successfully, but can not be updated to the Calendar on the site(s) because you do not have permission to update the Calendar. error.group_sync_failed = The group could not be synchronised. Has the group been manually deleted from Site Info? To restore this group, visit the modify the meeting page and click 'Publish Modification', then return here to synchronise again. error.no.change.group.title = Some of the group title have not been synchronized since it's modified via Site Info tool already! error.no_group_for_timeslot = The group for this timeslot is missing. To restore this group, visit the modify the meeting page and click 'Publish Modification', then return here to synchronise again. @@ -381,7 +381,7 @@ event_show_no_attendee_info = Private event_show_other_default_setting = Show the other default settings -event_show_schedule = Schedule Details: +event_show_schedule = Calendar Details: event_show_site_group_detail =  Show site(s)/group(s) details @@ -507,7 +507,7 @@ event_yes_label = Yes event_yes_meeting_default_notify_setting =  Yes, pre-select the 'Email Notification' checkbox on the Modify Meeting page. -event_yes_publish_to_calendar =  Yes, publish the meeting to the Schedule tool. +event_yes_publish_to_calendar =  Yes, publish the meeting to the Calendar tool. event_yes_receive_notification =  Yes, send an email notification to the selected meeting coordinators when a participant signs up or cancels an appointment. @@ -733,7 +733,7 @@ publish_button = Publish publish_new_evnt_button = Publish New Meeting -put_In_Multiple_Calendar_Blocks_at_ScheduleTool = Yes, publish the meeting as multiple calendar events in the Schedule Tool if adjacent timeslots are more than two hours apart. +put_In_Multiple_Calendar_Blocks_at_ScheduleTool = Yes, publish the meeting as multiple calendar events in the Calendar Tool if adjacent timeslots are more than two hours apart. recurrence = Recurring meetings @@ -835,9 +835,9 @@ timeperiod_divider =   -   timeslot.just.canceled = This time slot has been cancelled and is no longer available. timeslot.just.locked = This time slot has been locked and is not available. -title_tip_click_hide_schedule = Click to hide schedule details. +title_tip_click_hide_schedule = Click to hide calendar details. -title_tip_click_show_schedule = Click to show schedule details. +title_tip_click_show_schedule = Click to show calendar details. title_tip_delete_this_ts = delete the timeslot. diff --git a/signup/tool/src/bundle/messages_en_GB.properties b/signup/tool/src/bundle/messages_en_GB.properties index 7098b07ae025..2fbcc4b50546 100644 --- a/signup/tool/src/bundle/messages_en_GB.properties +++ b/signup/tool/src/bundle/messages_en_GB.properties @@ -104,11 +104,11 @@ edit.failed_due_to_other_updated_db = Edit failed. Someone else updated the meet #email exception message email.exception = Email was not sent: an error has occurred. -error.calendarEvent.posted_failed = The event was created successfully, but can not be added to the Schedule because the Schedule tool is not present on the site. -error.calendarEvent.posted_failed_due_to_permission = The event was created successfully, but can not be added to the Schedule on the site(s) because you do not have permission to add to the Schedule. -error.calendarEvent.removal_failed = An error occurred and calendarEvent removal in Schedule tool may have failed. -error.calendarEvent.updated_failed = The event was updated successfully, but can not be updated to the Schedule on the site(s) because the Schedule tool is not present on the site. -error.calendarEvent.updated_failed_due_to_permission = The event was updated successfully, but can not be updated to the Schedule on the site(s) because you do not have permission to update the Schedule. +error.calendarEvent.posted_failed = The event was created successfully, but can not be added to the Calendar because the Calendar tool is not present on the site. +error.calendarEvent.posted_failed_due_to_permission = The event was created successfully, but can not be added to the Calendar on the site(s) because you do not have permission to add to the Calendar. +error.calendarEvent.removal_failed = An error occurred and calendarEvent removal in Calendar tool may have failed. +error.calendarEvent.updated_failed = The event was updated successfully, but can not be updated to the Calendar on the site(s) because the Calendar tool is not present on the site. +error.calendarEvent.updated_failed_due_to_permission = The event was updated successfully, but can not be updated to the Calendar on the site(s) because you do not have permission to update the Calendar. error.group_sync_failed = The group could not be synchronised. Has the group been manually deleted from Site Info? To restore this group, visit the modify the meeting page and click 'Publish Modification', then return here to synchronise again. error.no.change.group.title = Some of the group title have not been synchronized since it's modified via Site Info tool already! error.no_group_for_timeslot = The group for this timeslot is missing. To restore this group, visit the modify the meeting page and click 'Publish Modification', then return here to synchronise again. @@ -385,7 +385,7 @@ event_show_no_attendee_info = Private event_show_other_default_setting = Show the other default settings -event_show_schedule = Schedule Details: +event_show_schedule = Calendar Details: event_show_site_group_detail =  Show site(s)/group(s) details @@ -515,7 +515,7 @@ event_yes_label = Yes event_yes_meeting_default_notify_setting =  Yes, pre-select the 'Email Notification' checkbox on the Modify Meeting page. -event_yes_publish_to_calendar =  Yes, publish the meeting to the Schedule tool. +event_yes_publish_to_calendar =  Yes, publish the meeting to the Calendar tool. event_yes_receive_notification =  Yes, send an email notification to the selected meeting coordinators when a participant signs up or cancels an appointment. @@ -746,7 +746,7 @@ publish_button = Publish publish_new_evnt_button = Publish New Meeting -put_In_Multiple_Calendar_Blocks_at_ScheduleTool = Yes, publish the meeting as multiple calendar events in the Schedule Tool if adjacent timeslots are more than two hours apart. +put_In_Multiple_Calendar_Blocks_at_ScheduleTool = Yes, publish the meeting as multiple calendar events in the Calendar Tool if adjacent timeslots are more than two hours apart. recurrence = Recurring meetings @@ -848,9 +848,9 @@ timeperiod_divider =   -   timeslot.just.canceled = This time slot has been cancelled and is no longer available. timeslot.just.locked = This time slot has been locked and is not available. -title_tip_click_hide_schedule = Click to hide schedule details. +title_tip_click_hide_schedule = Click to hide calendar details. -title_tip_click_show_schedule = Click to show schedule details. +title_tip_click_show_schedule = Click to show calendar details. title_tip_delete_this_ts = delete the timeslot. diff --git a/user/user-tool-prefs/tool/src/bundle/user-tool-prefs.properties b/user/user-tool-prefs/tool/src/bundle/user-tool-prefs.properties index 7e96091b746f..3a3f4bcead45 100644 --- a/user/user-tool-prefs/tool/src/bundle/user-tool-prefs.properties +++ b/user/user-tool-prefs/tool/src/bundle/user-tool-prefs.properties @@ -71,7 +71,7 @@ tab_move_lall=<< tab_count = Tabs displayed: -time_inst=Please select your local time zone for selected {0} tools, such as Schedule. You are currently in the {1} time zone +time_inst=Please select your local time zone for selected {0} tools, such as Calendar. You are currently in the {1} time zone locale_msg=Please select your language (and country) preference. Your current language preference is: