diff --git a/apps/common/mobile/lib/controller/Collaboration.js b/apps/common/mobile/lib/controller/Collaboration.js index 0f6778519..013928067 100644 --- a/apps/common/mobile/lib/controller/Collaboration.js +++ b/apps/common/mobile/lib/controller/Collaboration.js @@ -1739,16 +1739,13 @@ define([ textParaMoveFromUp: 'Moved Up:', textParaMoveFromDown: 'Moved Down:', textEditUser: 'Document is currently being edited by several users.', - textAddComment: "Add Comment", textCancel: "Cancel", textDone: "Done", textAddReply: "Add Reply", textEdit: 'Edit', textResolve: 'Resolve', textDeleteComment: 'Delete comment', - textEditComment: 'Edit comment', textDeleteReply: 'Delete reply', - textEditReply: 'Edit reply', textReopen: 'Reopen', textMessageDeleteComment: 'Do you really want to delete this comment?', textMessageDeleteReply: 'Do you really want to delete this reply?', diff --git a/apps/common/mobile/lib/view/Collaboration.js b/apps/common/mobile/lib/view/Collaboration.js index 748ec1bd7..b87108959 100644 --- a/apps/common/mobile/lib/view/Collaboration.js +++ b/apps/common/mobile/lib/view/Collaboration.js @@ -440,11 +440,11 @@ define([ textOriginal: 'Original', textChange: 'Review Change', textEditUsers: 'Users', - textNoComments: "This document doesn\'t contain comments", - textEditСomment: "Edit Comment", - textDone: "Done", - textAddReply: "Add Reply", - textEditReply: "Edit Reply", + textNoComments: 'This document doesn\'t contain comments', + textEditСomment: 'Edit Comment', + textDone: 'Done', + textAddReply: 'Add Reply', + textEditReply: 'Edit Reply', textCancel: 'Cancel' } })(), Common.Views.Collaboration || {})) diff --git a/apps/documenteditor/mobile/app/controller/add/AddOther.js b/apps/documenteditor/mobile/app/controller/add/AddOther.js index 041cb3758..fc09c8d7b 100644 --- a/apps/documenteditor/mobile/app/controller/add/AddOther.js +++ b/apps/documenteditor/mobile/app/controller/add/AddOther.js @@ -455,7 +455,7 @@ define([ txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"', textBottomOfPage: 'Bottom Of Page', textBelowText: 'Below Text', - textDeleteDraft: 'Delete draft?', + textDeleteDraft: 'Do you really want to delete draft?', textCancel: 'Cancel', textContinue: 'Continue' diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 8402c0bb5..a44edb222 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -12,6 +12,17 @@ "Common.Controllers.Collaboration.textDeleted": "Deleted:", "Common.Controllers.Collaboration.textDStrikeout": "Double strikeout", "Common.Controllers.Collaboration.textEditUser": "Users who are editing the file:", + "Common.Controllers.Collaboration.textCancel": "Cancel", + "Common.Controllers.Collaboration.textDone": "Done", + "Common.Controllers.Collaboration.textAddReply": "Add Reply", + "Common.Controllers.Collaboration.textEdit": "Edit", + "Common.Controllers.Collaboration.textResolve": "Resolve", + "Common.Controllers.Collaboration.textDeleteComment": "Delete comment", + "Common.Controllers.Collaboration.textDeleteReply": "Delete reply", + "Common.Controllers.Collaboration.textReopen": "Reopen", + "Common.Controllers.Collaboration.textMessageDeleteComment": "Do you really want to delete this comment?", + "Common.Controllers.Collaboration.textMessageDeleteReply": "Do you really want to delete this reply?", + "Common.Controllers.Collaboration.textYes": "Yes", "Common.Controllers.Collaboration.textEquation": "Equation", "Common.Controllers.Collaboration.textExact": "exactly", "Common.Controllers.Collaboration.textFirstLine": "First line", @@ -77,6 +88,11 @@ "Common.Views.Collaboration.textReview": "Track Changes", "Common.Views.Collaboration.textReviewing": "Review", "Common.Views.Collaboration.textСomments": "Сomments", + "Common.Views.Collaboration.textEditСomment": "Edit Comment", + "Common.Views.Collaboration.textDone": "Done", + "Common.Views.Collaboration.textAddReply": "Add Reply", + "Common.Views.Collaboration.textEditReply": "Edit Reply", + "Common.Views.Collaboration.textCancel": "Cancel", "DE.Controllers.AddContainer.textImage": "Image", "DE.Controllers.AddContainer.textOther": "Other", "DE.Controllers.AddContainer.textShape": "Shape", @@ -86,6 +102,9 @@ "DE.Controllers.AddOther.textBelowText": "Below Text", "DE.Controllers.AddOther.textBottomOfPage": "Bottom Of Page", "DE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format", + "DE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?", + "DE.Controllers.AddOther.textCancel": "Cancel", + "DE.Controllers.AddOther.textContinue": "Continue", "DE.Controllers.AddTable.textCancel": "Cancel", "DE.Controllers.AddTable.textColumns": "Columns", "DE.Controllers.AddTable.textRows": "Rows", @@ -110,6 +129,8 @@ "DE.Controllers.DocumentHolder.textRows": "Rows", "DE.Controllers.DocumentHolder.textCopyCutPasteActions": "Copy, Cut and Paste Actions", "DE.Controllers.DocumentHolder.errorCopyCutPaste": "Copy, cut and paste actions using the context menu will be performed within the current file only. You cannot copy or paste to or from other applications.", + "DE.Controllers.DocumentHolder.menuViewComment": "View Comment", + "DE.Controllers.DocumentHolder.menuAddComment": "Add Comment", "DE.Controllers.EditContainer.textChart": "Chart", "DE.Controllers.EditContainer.textFooter": "Footer", "DE.Controllers.EditContainer.textHeader": "Header", @@ -298,6 +319,9 @@ "DE.Views.AddOther.textSectionBreak": "Section Break", "DE.Views.AddOther.textStartFrom": "Start At", "DE.Views.AddOther.textTip": "Screen Tip", + "DE.Views.AddOther.textComment": "Comment", + "DE.Views.AddOther.textAddComment": "Add Comment", + "DE.Views.AddOther.textDone": "Done", "DE.Views.EditChart.textAddCustomColor": "Add Custom Color", "DE.Views.EditChart.textAlign": "Align", "DE.Views.EditChart.textBack": "Back", diff --git a/apps/presentationeditor/mobile/app/controller/add/AddOther.js b/apps/presentationeditor/mobile/app/controller/add/AddOther.js index b64bc7a35..7d5bddd16 100644 --- a/apps/presentationeditor/mobile/app/controller/add/AddOther.js +++ b/apps/presentationeditor/mobile/app/controller/add/AddOther.js @@ -156,7 +156,7 @@ define([ } }, - textDeleteDraft: 'Delete draft?', + textDeleteDraft: 'Do you really want to delete draft?', textCancel: 'Cancel', textContinue: 'Continue' diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 16aac262d..974581605 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -1,5 +1,16 @@ { "Common.Controllers.Collaboration.textEditUser": "Users who are editing the file:", + "Common.Controllers.Collaboration.textCancel": "Cancel", + "Common.Controllers.Collaboration.textDone": "Done", + "Common.Controllers.Collaboration.textAddReply": "Add Reply", + "Common.Controllers.Collaboration.textEdit": "Edit", + "Common.Controllers.Collaboration.textResolve": "Resolve", + "Common.Controllers.Collaboration.textDeleteComment": "Delete comment", + "Common.Controllers.Collaboration.textDeleteReply": "Delete reply", + "Common.Controllers.Collaboration.textReopen": "Reopen", + "Common.Controllers.Collaboration.textMessageDeleteComment": "Do you really want to delete this comment?", + "Common.Controllers.Collaboration.textMessageDeleteReply": "Do you really want to delete this reply?", + "Common.Controllers.Collaboration.textYes": "Yes", "Common.UI.ThemeColorPalette.textCustomColors": "Custom Colors", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", @@ -10,11 +21,17 @@ "Common.Views.Collaboration.textEditUsers": "Users", "Common.Views.Collaboration.textNoComments": "This presentation doesn't contain comments", "Common.Views.Collaboration.textСomments": "Сomments", + "Common.Views.Collaboration.textEditСomment": "Edit Comment", + "Common.Views.Collaboration.textDone": "Done", + "Common.Views.Collaboration.textAddReply": "Add Reply", + "Common.Views.Collaboration.textEditReply": "Edit Reply", + "Common.Views.Collaboration.textCancel": "Cancel", "PE.Controllers.AddContainer.textImage": "Image", "PE.Controllers.AddContainer.textLink": "Link", "PE.Controllers.AddContainer.textShape": "Shape", "PE.Controllers.AddContainer.textSlide": "Slide", "PE.Controllers.AddContainer.textTable": "Table", + "PE.Controllers.AddContainer.textOther": "Other", "PE.Controllers.AddImage.textEmptyImgUrl": "You need to specify image URL.", "PE.Controllers.AddImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'", "PE.Controllers.AddLink.textDefault": "Selected text", @@ -30,6 +47,9 @@ "PE.Controllers.AddTable.textColumns": "Columns", "PE.Controllers.AddTable.textRows": "Rows", "PE.Controllers.AddTable.textTableSize": "Table Size", + "PE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?", + "PE.Controllers.AddOther.textCancel": "Cancel", + "PE.Controllers.AddOther.textContinue": "Continue", "PE.Controllers.DocumentHolder.menuAddLink": "Add Link", "PE.Controllers.DocumentHolder.menuCopy": "Copy", "PE.Controllers.DocumentHolder.menuCut": "Cut", @@ -38,6 +58,8 @@ "PE.Controllers.DocumentHolder.menuMore": "More", "PE.Controllers.DocumentHolder.menuOpenLink": "Open Link", "PE.Controllers.DocumentHolder.menuPaste": "Paste", + "PE.Controllers.DocumentHolder.menuViewComment": "View Comment", + "PE.Controllers.DocumentHolder.menuAddComment": "Add Comment", "PE.Controllers.DocumentHolder.sheetCancel": "Cancel", "PE.Controllers.DocumentHolder.textCopyCutPasteActions": "Copy, Cut and Paste Actions", "PE.Controllers.DocumentHolder.errorCopyCutPaste": "Copy, cut and paste actions using the context menu will be performed within the current file only. You cannot copy or paste to or from other applications.", @@ -257,6 +279,9 @@ "PE.Views.AddLink.textNumber": "Slide Number", "PE.Views.AddLink.textPrev": "Previous Slide", "PE.Views.AddLink.textTip": "Screen Tip", + "PE.Views.AddOther.textComment": "Comment", + "PE.Views.AddOther.textAddComment": "Add Comment", + "PE.Views.AddOther.textDone": "Done", "PE.Views.EditChart.textAddCustomColor": "Add Custom Color", "PE.Views.EditChart.textAlign": "Align", "PE.Views.EditChart.textAlignBottom": "Align Bottom", diff --git a/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js b/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js index 6986b3ba9..e62a322e1 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js +++ b/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js @@ -198,7 +198,7 @@ define([ textEmptyImgUrl : 'You need to specify image URL.', txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"', - textDeleteDraft: 'Delete draft?', + textDeleteDraft: 'Do you really want to delete draft?', textCancel: 'Cancel', textContinue: 'Continue' } diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index ee71efa83..65cf7a6b6 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -1,5 +1,16 @@ { "Common.Controllers.Collaboration.textEditUser": "Users who are editing the file:", + "Common.Controllers.Collaboration.textCancel": "Cancel", + "Common.Controllers.Collaboration.textDone": "Done", + "Common.Controllers.Collaboration.textAddReply": "Add Reply", + "Common.Controllers.Collaboration.textEdit": "Edit", + "Common.Controllers.Collaboration.textResolve": "Resolve", + "Common.Controllers.Collaboration.textDeleteComment": "Delete comment", + "Common.Controllers.Collaboration.textDeleteReply": "Delete reply", + "Common.Controllers.Collaboration.textReopen": "Reopen", + "Common.Controllers.Collaboration.textMessageDeleteComment": "Do you really want to delete this comment?", + "Common.Controllers.Collaboration.textMessageDeleteReply": "Do you really want to delete this reply?", + "Common.Controllers.Collaboration.textYes": "Yes", "Common.UI.ThemeColorPalette.textCustomColors": "Custom Colors", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", @@ -10,6 +21,11 @@ "Common.Views.Collaboration.textEditUsers": "Users", "Common.Views.Collaboration.textNoComments": "This spreadsheet doesn't contain comments", "Common.Views.Collaboration.textСomments": "Сomments", + "Common.Views.Collaboration.textEditСomment": "Edit Comment", + "Common.Views.Collaboration.textDone": "Done", + "Common.Views.Collaboration.textAddReply": "Add Reply", + "Common.Views.Collaboration.textEditReply": "Edit Reply", + "Common.Views.Collaboration.textCancel": "Cancel", "SSE.Controllers.AddChart.txtDiagramTitle": "Chart Title", "SSE.Controllers.AddChart.txtSeries": "Series", "SSE.Controllers.AddChart.txtXAxis": "X Axis", @@ -23,6 +39,9 @@ "SSE.Controllers.AddLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'", "SSE.Controllers.AddOther.textEmptyImgUrl": "You need to specify image URL.", "SSE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'", + "SSE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?", + "SSE.Controllers.AddOther.textCancel": "Cancel", + "SSE.Controllers.AddOther.textContinue": "Continue", "SSE.Controllers.DocumentHolder.menuAddLink": "Add Link", "SSE.Controllers.DocumentHolder.menuCell": "Cell", "SSE.Controllers.DocumentHolder.menuCopy": "Copy", @@ -40,6 +59,8 @@ "SSE.Controllers.DocumentHolder.menuUnmerge": "Unmerge", "SSE.Controllers.DocumentHolder.menuUnwrap": "Unwrap", "SSE.Controllers.DocumentHolder.menuWrap": "Wrap", + "SSE.Controllers.DocumentHolder.menuViewComment": "View Comment", + "SSE.Controllers.DocumentHolder.menuAddComment": "Add Comment", "SSE.Controllers.DocumentHolder.sheetCancel": "Cancel", "SSE.Controllers.DocumentHolder.warnMergeLostData": "Operation can destroy data in the selected cells.
Continue?", "SSE.Controllers.DocumentHolder.textCopyCutPasteActions": "Copy, Cut and Paste Actions", @@ -351,6 +372,9 @@ "SSE.Views.AddOther.textLink": "Link", "SSE.Views.AddOther.textSort": "Sort and Filter", "SSE.Views.AddOther.textLinkSettings": "Link Settings", + "SSE.Views.AddOther.textComment": "Comment", + "SSE.Views.AddOther.textAddComment": "Add Comment", + "SSE.Views.AddOther.textDone": "Done", "SSE.Views.EditCell.textAccounting": "Accounting", "SSE.Views.EditCell.textAddCustomColor": "Add Custom Color", "SSE.Views.EditCell.textAlignBottom": "Align Bottom",