diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 706767e38..7bb9ac2e0 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -664,29 +664,39 @@ define([ ); me.btnReject.updateHint([me.tipRejectCurrent, me.txtRejectChanges]); + var menuTemplate = _.template('
<%= caption %>
' + + '<% if (options.description !== null) { %>' + + '<% } %>'); + me.btnReviewView.setMenu( new Common.UI.Menu({ cls: 'ppm-toolbar', items: [ { - caption: me.txtMarkup, + caption: me.txtMarkupCap, checkable: true, toggleGroup: 'menuReviewView', checked: true, - value: 'markup' + value: 'markup', + template: menuTemplate, + description: me.txtMarkup }, { - caption: me.txtFinal, + caption: me.txtFinalCap, checkable: true, toggleGroup: 'menuReviewView', checked: false, + template: menuTemplate, + description: me.txtFinal, value: 'final' }, { - caption: me.txtOriginal, + caption: me.txtOriginalCap, checkable: true, toggleGroup: 'menuReviewView', checked: false, + template: menuTemplate, + description: me.txtOriginal, value: 'original' } ] @@ -705,12 +715,15 @@ define([ me.btnCoAuthMode.setMenu( new Common.UI.Menu({ cls: 'ppm-toolbar', + style: 'max-width: 220px;', items: [ { caption: me.strFast, checkable: true, toggleGroup: 'menuCoauthMode', checked: true, + template: menuTemplate, + description: me.strFastDesc, value: 1 }, { @@ -718,6 +731,8 @@ define([ checkable: true, toggleGroup: 'menuCoauthMode', checked: false, + template: menuTemplate, + description: me.strStrictDesc, value: 0 } ] @@ -927,9 +942,9 @@ define([ txtAcceptChanges: 'Accept Changes', txtRejectChanges: 'Reject Changes', txtView: 'Display Mode', - txtMarkup: 'All changes (Editing)', - txtFinal: 'All changes accepted (Preview)', - txtOriginal: 'All changes rejected (Preview)', + txtMarkup: 'Text with changes (Editing)', + txtFinal: 'All changes like accept (Preview)', + txtOriginal: 'Text without changes (Preview)', tipReviewView: 'Select the way you want the changes to be displayed', tipAcceptCurrent: 'Accept current changes', tipRejectCurrent: 'Reject current changes', @@ -941,7 +956,12 @@ define([ strStrict: 'Strict', txtHistory: 'Version History', tipHistory: 'Show version history', - txtChat: 'Chat' + txtChat: 'Chat', + txtMarkupCap: 'Markup', + txtFinalCap: 'Final', + txtOriginalCap: 'Original', + strFastDesc: 'Real-time co-editing. All changes are saved automatically.', + strStrictDesc: 'Use the \'Save\' button to sync the changes you and others make.' } }()), Common.Views.ReviewChanges || {})); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 4716ae078..49e804991 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -207,10 +207,13 @@ "Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change", "Common.Views.ReviewChanges.txtClose": "Close", "Common.Views.ReviewChanges.txtDocLang": "Language", - "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)", - "Common.Views.ReviewChanges.txtMarkup": "All changes (Editing)", + "Common.Views.ReviewChanges.txtFinal": "All changes like accept (Preview)", + "Common.Views.ReviewChanges.txtMarkup": "Text with changes (Editing)", "Common.Views.ReviewChanges.txtNext": "Next", - "Common.Views.ReviewChanges.txtOriginal": "All changes rejected (Preview)", + "Common.Views.ReviewChanges.txtOriginal": "Text without changes (Preview)", + "Common.Views.ReviewChanges.txtMarkupCap": "Markup", + "Common.Views.ReviewChanges.txtFinalCap": "Final", + "Common.Views.ReviewChanges.txtOriginalCap": "Original", "Common.Views.ReviewChanges.txtPrev": "Previous", "Common.Views.ReviewChanges.txtReject": "Reject", "Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes", @@ -225,6 +228,8 @@ "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode", "Common.Views.ReviewChanges.strFast": "Fast", "Common.Views.ReviewChanges.strStrict": "Strict", + "Common.Views.ReviewChanges.strFastDesc": "Real-time co-editing. All changes are saved automatically.", + "Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.", "Common.Views.ReviewChanges.txtHistory": "Version History", "Common.Views.ReviewChanges.tipHistory": "Show version history", "Common.Views.ReviewChangesDialog.textTitle": "Review Changes", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index c880414ad..00546838c 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -140,10 +140,13 @@ "Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change", "Common.Views.ReviewChanges.txtClose": "Close", "Common.Views.ReviewChanges.txtDocLang": "Language", - "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)", - "Common.Views.ReviewChanges.txtMarkup": "All changes (Editing)", + "Common.Views.ReviewChanges.txtFinal": "All changes like accept (Preview)", + "Common.Views.ReviewChanges.txtMarkup": "Text with changes (Editing)", "Common.Views.ReviewChanges.txtNext": "Next", - "Common.Views.ReviewChanges.txtOriginal": "All changes rejected (Preview)", + "Common.Views.ReviewChanges.txtOriginal": "Text without changes (Preview)", + "Common.Views.ReviewChanges.txtMarkupCap": "Markup", + "Common.Views.ReviewChanges.txtFinalCap": "Final", + "Common.Views.ReviewChanges.txtOriginalCap": "Original", "Common.Views.ReviewChanges.txtPrev": "Previous", "Common.Views.ReviewChanges.txtReject": "Reject", "Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes", @@ -158,6 +161,8 @@ "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode", "Common.Views.ReviewChanges.strFast": "Fast", "Common.Views.ReviewChanges.strStrict": "Strict", + "Common.Views.ReviewChanges.strFastDesc": "Real-time co-editing. All changes are saved automatically.", + "Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.", "Common.Views.ReviewChanges.txtHistory": "Version History", "Common.Views.ReviewChanges.tipHistory": "Show version history", "PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 18e02ca7a..37e0ec017 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -126,10 +126,13 @@ "Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change", "Common.Views.ReviewChanges.txtClose": "Close", "Common.Views.ReviewChanges.txtDocLang": "Language", - "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)", - "Common.Views.ReviewChanges.txtMarkup": "All changes (Editing)", + "Common.Views.ReviewChanges.txtFinal": "All changes like accept (Preview)", + "Common.Views.ReviewChanges.txtMarkup": "Text with changes (Editing)", "Common.Views.ReviewChanges.txtNext": "Next", - "Common.Views.ReviewChanges.txtOriginal": "All changes rejected (Preview)", + "Common.Views.ReviewChanges.txtOriginal": "Text without changes (Preview)", + "Common.Views.ReviewChanges.txtMarkupCap": "Markup", + "Common.Views.ReviewChanges.txtFinalCap": "Final", + "Common.Views.ReviewChanges.txtOriginalCap": "Original", "Common.Views.ReviewChanges.txtPrev": "Previous", "Common.Views.ReviewChanges.txtReject": "Reject", "Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes", @@ -144,6 +147,8 @@ "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode", "Common.Views.ReviewChanges.strFast": "Fast", "Common.Views.ReviewChanges.strStrict": "Strict", + "Common.Views.ReviewChanges.strFastDesc": "Real-time co-editing. All changes are saved automatically.", + "Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.", "Common.Views.ReviewChanges.txtHistory": "Version History", "Common.Views.ReviewChanges.tipHistory": "Show version history", "SSE.Controllers.DocumentHolder.alignmentText": "Alignment",