diff --git a/apps/common/main/lib/view/AutoCorrectDialog.js b/apps/common/main/lib/view/AutoCorrectDialog.js index 1a01f5fa4..0c217617c 100644 --- a/apps/common/main/lib/view/AutoCorrectDialog.js +++ b/apps/common/main/lib/view/AutoCorrectDialog.js @@ -77,8 +77,8 @@ define([ '', '', '', - '', - '', + '', + '', '', '', '', @@ -243,7 +243,7 @@ define([ defChanged = rec.get('defaultValue') && (rec.get('defaultValueStr')!==rec.get('by')); this.btnDelete.setCaption(disabled ? this.textRestore : this.textDelete); this.btnEdit.setDisabled(disabled || inputBy === rec.get('by') || !inputBy && !defChanged ); - this.btnEdit.setCaption(!inputBy && defChanged ? this.textReset : this.textEdit); + this.btnEdit.setCaption(!inputBy && defChanged ? this.textReset : this.textReplace); } else { this.btnDelete.setCaption(this.textDelete); this.btnEdit.setDisabled(!inputBy); @@ -445,11 +445,10 @@ define([ textTitle: 'AutoCorrect', textMathCorrect: 'Math AutoCorrect', - textReplace: 'Replace:', - textBy: 'By:', + textReplace: 'Replace', + textBy: 'By', textResetAll: 'Reset to default', textAdd: 'Add', - textEdit: 'Replace', textDelete: 'Delete', textRestore: 'Restore', textReset: 'Reset', diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index e40c16820..8e09393a2 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -159,8 +159,17 @@ "Common.Views.About.txtVersion": "Version ", "Common.Views.AutoCorrectDialog.textTitle": "AutoCorrect", "Common.Views.AutoCorrectDialog.textMathCorrect": "Math AutoCorrect", - "Common.Views.AutoCorrectDialog.textReplace": "Replace:", - "Common.Views.AutoCorrectDialog.textBy": "By:", + "Common.Views.AutoCorrectDialog.textReplace": "Replace", + "Common.Views.AutoCorrectDialog.textBy": "By", + "Common.Views.AutoCorrectDialog.textResetAll": "Reset to default", + "Common.Views.AutoCorrectDialog.textAdd": "Add", + "Common.Views.AutoCorrectDialog.textDelete": "Delete", + "Common.Views.AutoCorrectDialog.textRestore": "Restore", + "Common.Views.AutoCorrectDialog.textReset": "Reset", + "Common.Views.AutoCorrectDialog.textReplaceType": "Replace text as you type", + "Common.Views.AutoCorrectDialog.warnReset": "Any autocorrect you added will be removed and the changed ones will be restored to their original values. Do you want to continue?", + "Common.Views.AutoCorrectDialog.warnReplace": "The autocorrect entry for %1 already exists. Do you want to replace it?", + "Common.Views.AutoCorrectDialog.warnRestore": "The autocorrect entry for %1 will be reset to its original value. Do you want to continue?", "Common.Views.Chat.textSend": "Send", "Common.Views.Comments.textAdd": "Add", "Common.Views.Comments.textAddComment": "Add Comment", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 4c596c059..fa8458c13 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -60,8 +60,17 @@ "Common.Views.About.txtVersion": "Version ", "Common.Views.AutoCorrectDialog.textTitle": "AutoCorrect", "Common.Views.AutoCorrectDialog.textMathCorrect": "Math AutoCorrect", - "Common.Views.AutoCorrectDialog.textReplace": "Replace:", - "Common.Views.AutoCorrectDialog.textBy": "By:", + "Common.Views.AutoCorrectDialog.textReplace": "Replace", + "Common.Views.AutoCorrectDialog.textBy": "By", + "Common.Views.AutoCorrectDialog.textResetAll": "Reset to default", + "Common.Views.AutoCorrectDialog.textAdd": "Add", + "Common.Views.AutoCorrectDialog.textDelete": "Delete", + "Common.Views.AutoCorrectDialog.textRestore": "Restore", + "Common.Views.AutoCorrectDialog.textReset": "Reset", + "Common.Views.AutoCorrectDialog.textReplaceType": "Replace text as you type", + "Common.Views.AutoCorrectDialog.warnReset": "Any autocorrect you added will be removed and the changed ones will be restored to their original values. Do you want to continue?", + "Common.Views.AutoCorrectDialog.warnReplace": "The autocorrect entry for %1 already exists. Do you want to replace it?", + "Common.Views.AutoCorrectDialog.warnRestore": "The autocorrect entry for %1 will be reset to its original value. Do you want to continue?", "Common.Views.Chat.textSend": "Send", "Common.Views.Comments.textAdd": "Add", "Common.Views.Comments.textAddComment": "Add Comment", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index fd18f39ac..1ba62e5d0 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -61,8 +61,17 @@ "Common.Views.About.txtVersion": "Version ", "Common.Views.AutoCorrectDialog.textTitle": "AutoCorrect", "Common.Views.AutoCorrectDialog.textMathCorrect": "Math AutoCorrect", - "Common.Views.AutoCorrectDialog.textReplace": "Replace:", - "Common.Views.AutoCorrectDialog.textBy": "By:", + "Common.Views.AutoCorrectDialog.textReplace": "Replace", + "Common.Views.AutoCorrectDialog.textBy": "By", + "Common.Views.AutoCorrectDialog.textResetAll": "Reset to default", + "Common.Views.AutoCorrectDialog.textAdd": "Add", + "Common.Views.AutoCorrectDialog.textDelete": "Delete", + "Common.Views.AutoCorrectDialog.textRestore": "Restore", + "Common.Views.AutoCorrectDialog.textReset": "Reset", + "Common.Views.AutoCorrectDialog.textReplaceType": "Replace text as you type", + "Common.Views.AutoCorrectDialog.warnReset": "Any autocorrect you added will be removed and the changed ones will be restored to their original values. Do you want to continue?", + "Common.Views.AutoCorrectDialog.warnReplace": "The autocorrect entry for %1 already exists. Do you want to replace it?", + "Common.Views.AutoCorrectDialog.warnRestore": "The autocorrect entry for %1 will be reset to its original value. Do you want to continue?", "Common.Views.Chat.textSend": "Send", "Common.Views.Comments.textAdd": "Add", "Common.Views.Comments.textAddComment": "Add Comment",