Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE] Update tooltip for combine button

Browse source
This commit is contained in:
Alexei Koshelev 2022-10-14 15:14:30 +03:00
parent 6296783762
commit efdefe3eb3
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -723,9 +723,9 @@ define([
}
}
})).show();
}
Common.NotificationCenter.trigger('edit:complete', this.view);
}
}
Common.NotificationCenter.trigger('edit:complete', this.view);
},
setRevisedFile: function(data) {

2
apps/common/main/lib/view/ReviewChanges.js
View file

@ -945,7 +945,7 @@ define([
txtCompare: 'Compare',
tipCompare: 'Compare current document with another one',
txtCombine: 'Combine',
tipCombine: 'Combine',
tipCombine: 'Combine current document with another one',
mniFromFile: 'Document from File',
mniFromUrl: 'Document from URL',
mniFromStorage: 'Document from Storage',

2
apps/documenteditor/main/locale/en.json
View file

@ -388,6 +388,7 @@
"Common.Views.ReviewChanges.tipCommentResolve": "Resolve comments",
"Common.Views.ReviewChanges.tipCommentResolveCurrent": "Resolve current comments",
"Common.Views.ReviewChanges.tipCompare": "Compare current document with another one",
"Common.Views.ReviewChanges.tipCombine": "Combine current document with another one",
"Common.Views.ReviewChanges.tipHistory": "Show version history",
"Common.Views.ReviewChanges.tipRejectCurrent": "Reject current change",
"Common.Views.ReviewChanges.tipReview": "Track changes",
@ -413,6 +414,7 @@
"Common.Views.ReviewChanges.txtCommentResolveMy": "Resolve My Comments",
"Common.Views.ReviewChanges.txtCommentResolveMyCurrent": "Resolve My Current Comments",
"Common.Views.ReviewChanges.txtCompare": "Compare",
"Common.Views.ReviewChanges.txtCombine": "Combine",
"Common.Views.ReviewChanges.txtDocLang": "Language",
"Common.Views.ReviewChanges.txtEditing": "Editing",
"Common.Views.ReviewChanges.txtFinal": "All changes accepted {0}",

2
apps/documenteditor/main/locale/ru.json
View file

@ -388,6 +388,7 @@
"Common.Views.ReviewChanges.tipCommentResolve": "Решить комментарии",
"Common.Views.ReviewChanges.tipCommentResolveCurrent": "Решить текущие комментарии",
"Common.Views.ReviewChanges.tipCompare": "Сравнить текущий документ с другим",
"Common.Views.ReviewChanges.tipCombine": "Объединить текущий документ с другим",
"Common.Views.ReviewChanges.tipHistory": "Показать историю версий",
"Common.Views.ReviewChanges.tipRejectCurrent": "Отклонить текущее изменение",
"Common.Views.ReviewChanges.tipReview": "Отслеживать изменения",
@ -413,6 +414,7 @@
"Common.Views.ReviewChanges.txtCommentResolveMy": "Решить мои комментарии",
"Common.Views.ReviewChanges.txtCommentResolveMyCurrent": "Решить мои текущие комментарии",
"Common.Views.ReviewChanges.txtCompare": "Сравнить",
"Common.Views.ReviewChanges.txtCombine": "Объединить",
"Common.Views.ReviewChanges.txtDocLang": "Язык",
"Common.Views.ReviewChanges.txtEditing": "Редактирование",
"Common.Views.ReviewChanges.txtFinal": "Все изменения приняты {0}",