diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js index b1e9090ea..cd160dca9 100644 --- a/apps/common/main/lib/view/Comments.js +++ b/apps/common/main/lib/view/Comments.js @@ -102,7 +102,7 @@ define([ var view = this, textBox = $(this.el).find('textarea'), domTextBox = null, - minHeight = 50, + minHeight = 55, lineHeight = 0, scrollPos = 0, oldHeight = 0, diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js index 6eda90bda..759c2debe 100644 --- a/apps/common/main/lib/view/ReviewPopover.js +++ b/apps/common/main/lib/view/ReviewPopover.js @@ -176,7 +176,7 @@ define([ var view = this, textBox = this.$el.find('textarea'), domTextBox = null, - minHeight = 50, + minHeight = 55, lineHeight = 0, scrollPos = 0, oldHeight = 0, diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index 415f98a0c..b505e1ba1 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -94,7 +94,7 @@ textarea { width: 100%; - height: 50px; + height: 55px; resize: none; margin-bottom: 5px; border: @scaled-one-px-value-ie solid @border-regular-control-ie; diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 41c4ac979..ea8a32bb6 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -176,6 +176,13 @@ "Common.Views.Header.tipViewUsers": "View users and manage document access rights", "Common.Views.Header.txtAccessRights": "Change access rights", "Common.Views.Header.txtRename": "Rename", + "Common.Views.History.textCloseHistory": "Close History", + "Common.Views.History.textHide": "Collapse", + "Common.Views.History.textHideAll": "Hide detailed changes", + "Common.Views.History.textRestore": "Restore", + "Common.Views.History.textShow": "Expand", + "Common.Views.History.textShowAll": "Show detailed changes", + "Common.Views.History.textVer": "ver.", "Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:", "Common.Views.ImageFromUrlDialog.txtEmpty": "This field is required", "Common.Views.ImageFromUrlDialog.txtNotUrl": "This field should be a URL in the \"http://www.example.com\" format", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 546ea1b1c..64290ef70 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -161,6 +161,7 @@ "Common.Views.AutoCorrectDialog.textRecognized": "Recognized Functions", "Common.Views.AutoCorrectDialog.textRecognizedDesc": "The following expressions are recognized math expressions. They will not be automatically italicized.", "Common.Views.AutoCorrectDialog.textReplace": "Replace", + "Common.Views.AutoCorrectDialog.textReplaceText": "Replace As You Type", "Common.Views.AutoCorrectDialog.textReplaceType": "Replace text as you type", "Common.Views.AutoCorrectDialog.textReset": "Reset", "Common.Views.AutoCorrectDialog.textResetAll": "Reset to default",