SAK-29516

Reword the pages that lie behind the improved Schedule button labels
SAK-29165

calendar/calendar-bundles/resources/calendar.properties

@@ -1,5 +1,5 @@
 #Java code
-java.importcal = Import calendar
+java.importcal = Import Events
 java.theend = The end date you have specified on the Frequency page is earlier than the start date. Change it please.
 java.merge = Merge Internal Calendars
 java.merge.title = Display events from sites
@@ -25,11 +25,11 @@ java.permissions = Permissions
 java.set = Set permissions for Schedule in worksite 
 java.error = The event doesn't exist any more.
 
-ical.title = Calendar Subscription Export
+ical.title = Generate a Link to this Calendar for Public Use
 ical.schedname = Calendar Name
 ical.option    = Enable Subscription?
 ical.url       = Subscription URL:
-ical.info      = Subscription enables all calendar events within a window plus/minus 6 months to be publicly subscribed and accessed, without authentication.
+ical.info      = Subscription to this calendar in other applications will display all events within a window of plus and minus 6 months. Authentication is not required and all events will potentially be visible to the general public. If this is not desirable then please publish via a private link instead.
 java.alert.aliasreq = An Alias is required to enable iCal exports.
 
 java.alert.youneed = You need to enter the name of the field to be added.
@@ -329,9 +329,13 @@ cust.save = Save Field Changes
 cust.list = Table contains list of additional fields. First column contains the fieldname, second column a checkbox to take remove it.
 
 #Subscriptions Vm
-subs.subscriptions = Calendar Subscriptions
+subs.subscriptions = Show Events from an External Calendar
 subs.institutional = Institutional Calendars
-subs.institutional.instruction = Select what Institutional Calendars you want to subscribe.
+subs.institutional.instruction = This page allows subscription to an external calendar. Unfortunately this feature has some limitations, it
+subs.institutional.instruction.detailed.1 = Does not support all-day events
+subs.institutional.instruction.detailed.2 = Only supports events defined with <VEVENT>
+subs.institutional.instruction.detailed.3 = Does not support re-occurring events
+subs.institutional.instruction.detailed.4 = Does not support events without an end time
 subs.institutional.summary = List of Institutional Calendars
 subs.calendar.name = Calendar Name
 subs.calendar.url = URL
@@ -342,7 +346,7 @@ subs.user.summary = List of User-specified Calendars
 subs.calendar.subscribe = Subscribe
 
 #Merge Vm
-merge.merge = Merging calendars...
+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
@@ -476,8 +480,10 @@ date_link_format =yyyy-MM-dd
 java.opaque_subscribe = Publish (private)
 java.opaque_subscribe.title = Generate link for personal use in other calendar applications
 # SAK-21497
-ical_opaqueurl_header=Subscribe
-ical_opaqueurl_explanation=If you would like to generate a private URL for you to access the calendar in this site, please press the button below:
+ical_opaqueurl_header=Generate a Link to this Calendar for Personal Use
+ical_opaqueurl_header_existing = Subscribe to this Calendar
+ical_opaqueurl_explanation=Please click the 'Generate' button to create a link to this calendar. The link is for private use only and will allow events from this site to be displayed in other calendaring applications.
+ical_opaqueurl_explanation_existing = The following links are for private use only. If you have accidentally disclosed the URL to others then please click the 'Regenerate' button to create a new private link.
 ical_opaqueurl_myworkspace=Note: If you subscribe to the calendar in your 'My Workspace', it will aggregate the events from the calendars of all the sites of which you are a member.
 ical_opaqueurl_generate=Generate
 ical_opaqueurl_webcal=If you click on the link below, your browser should present you with a client (e.g. Outlook) that you can use to subscribe to this calendar:

calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar-opaqueUrlExisting.vm

@@ -1,8 +1,11 @@
 ## $Header: /cvs/sakai2/legacy/tools/src/webapp/vm/calendar/chef_calendar-opaqueUrl2.vm,v 1.5 2005/05/28 03:04:35 ggolden.umich.edu Exp $
 <div class="portletBody"> 
 	<h3>
-		$tlang.getString('ical_opaqueurl_header')
+		$tlang.getString('ical_opaqueurl_header_existing')
 	</h3>
+		<p class="instruction">
+			$tlang.getString('ical_opaqueurl_explanation_existing')
+		</p>
 	#if (!$isMyWorkspace)
 		<p class="instruction">
 			<em>$tlang.getString('ical_opaqueurl_myworkspace')</em>

calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar-subscriptions.vm

@@ -15,9 +15,15 @@
 		#if ($institutionalSubscriptionsAvailable)
 			<br/>
 			<h4>$tlang.getString('subs.institutional')</h4>
-			<p class="instruction">
+			<div class="instruction">
 				$tlang.getString('subs.institutional.instruction')
-			</p>
+				<ul>
+					<li>$tlang.getString('subs.institutional.instruction.detailed.1')</li>
+					<li>$tlang.getString('subs.institutional.instruction.detailed.2')</li>
+					<li>$tlang.getString('subs.institutional.instruction.detailed.3')</li>
+					<li>$tlang.getString('subs.institutional.instruction.detailed.4')</li>
+				</ul>
+			</div>
 				<table class="listHier lines nolines" style="width: 75%" cellspacing="0" summary="$tlang.getString('subs.institutional.summary')">
 					<tr> 
 						<th scope="col" id="subscriptionName">$tlang.getString('subs.calendar.name')</th>
@@ -29,7 +35,7 @@
 							#set ($num=$num + 1)
 							<tr> 
 								<td headers="subscriptionName"><label for="check_$num">$calendarEntry.getDisplayName()</label></td>
-								<td headers="checkbox">							
+								<td headers="checkbox">
 									<input type="checkbox" name="$calendarEntry.getReference()" value="$calendarEntry.getReference()" id="check_$num"
 									#if($calendarEntry.isSelected())
 									checked="checked"
@@ -81,7 +87,7 @@
 						#set ($num=$num + 1)
 						<tr> 
 							<td headers="subscriptionName"><label for="check_$num">$validator.escapeHtml($calendarEntry.getDisplayName())</label></td>
-							<td headers="checkbox">							
+							<td headers="checkbox">
 								<input type="checkbox" name="$calendarEntry.getReference()" value="$calendarEntry.getReference()" id="check_$num"
 								#if($calendarEntry.isSelected())
 								checked="checked"