Merge branch 'develop' into 4124-4139-locks #4124 #4139

src/main/java/Bundle.properties

@@ -158,7 +158,7 @@ notification.createDataset={0} was created in {1}. To learn more about what you
 notification.dataset.management.title=Dataset Management - Dataset User Guide
 notification.wasSubmittedForReview={0} was submitted for review to be published in {1}. Don''t forget to publish it or send it back to the contributor\!
 notification.wasReturnedByReviewer={0} was returned by the curator of {1}.
-notification.wasPublished={0}, was published in {1}.
+notification.wasPublished={0} was published in {1}.
 notification.worldMap.added={0}, dataset had WorldMap layer data added to it.
 notification.maplayer.deletefailed=Failed to delete the map layer associated with the restricted file {0} from WorldMap. Please try again, or contact WorldMap and/or Dataverse support. (Dataset: {1})
 notification.generic.objectDeleted=The dataverse, dataset, or file for this notification has been deleted.
@@ -1117,7 +1117,7 @@ dataset.publish.header=Publish Dataset
 dataset.rejectBtn=Return to Author
 dataset.submitBtn=Submit for Review
 dataset.disabledSubmittedBtn=Submitted for Review
-dataset.submitMessage=Submit this dataset for review by the curator of this dataverse for possible publishing.
+dataset.submitMessage=You will not be able to make changes to this dataset while it is in review.
 dataset.submit.success=Your dataset has been submitted for review.
 dataset.inreview.infoMessage=\u2013 This dataset is currently under review prior to publication.
 dataset.submit.failure=Dataset Submission Failed - {0}
@@ -1521,10 +1521,10 @@ file.results.btn.sort.option.oldest=Oldest
 file.results.btn.sort.option.size=Size
 file.results.btn.sort.option.type=Type
 file.compute.fileRestricted=File Restricted
-file.compute.fileAccessDenied=You cannot compute on this restricted file because you don't have permission to access it. 
+file.compute.fileAccessDenied=You cannot compute on this restricted file because you do not have permission to access it. 
 dataset.compute.datasetCompute=Dataset Compute Not Supported
-dataset.compute.datasetAccessDenied=You cannot compute on this dataset because you don't have permission to access all of the restricted files.
-dataset.compute.datasetComputeDisabled=You cannot compute on this dataset because this functionality is not enabled yet. Please click on a file to access computing capalibities.
+dataset.compute.datasetAccessDenied=You cannot compute on this dataset because you do not have permission to access all of the restricted files.
+dataset.compute.datasetComputeDisabled=You cannot compute on this dataset because this functionality is not enabled yet. Please click on a file to access computing features.
 
 # dataset-widgets.xhtml
 dataset.widgets.title=Dataset Thumbnail + Widgets

src/main/webapp/dashboard-users.xhtml

@@ -90,7 +90,7 @@
                         </p:column>
                     </p:dataTable>
                     <p:dialog styleClass="smallPopUp" id="toggleSuperuserConfirmation" header="#{bundle['dashboard.list_users.toggleSuperuser']}" widgetVar="toggleSuperuserConfirmation" modal="true" closable="false">
-                        <p class="text-danger"><span class="glyphicon glyphicon-warning-sign"/>
+                        <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/>
                             <h:outputFormat value=" #{bundle['dashboard.list_users.toggleSuperuser.confirmationText.add']} " rendered="#{DashboardUsersPage.selectedUserDetached.superuser}">
                                 <f:param value="#{DashboardUsersPage.selectedUserDetached.userIdentifier}"/>
                             </h:outputFormat>
@@ -104,7 +104,7 @@
                         </div>
                     </p:dialog>
                     <p:dialog id="removeRolesConfirm" header="#{bundle['dashboard.list_users.tbl_header.roles.removeAll.header']}" widgetVar="removeRolesConfirm">
-                        <p class="text-danger"><span class="glyphicon glyphicon-warning-sign"/> #{DashboardUsersPage.confirmRemoveRolesMessage}</p>
+                        <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{DashboardUsersPage.confirmRemoveRolesMessage}</p>
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" value="#{bundle.yes}" update="userTable,:messagePanel" oncomplete="PF('removeRolesConfirm').hide();" action="#{DashboardUsersPage.removeUserRoles()}" />
                             <p:commandButton styleClass="btn btn-default" value="#{bundle.no}" onclick="PF('removeRolesConfirm').hide();" type="button" />