Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations

products/ASC.Files/Client/public/locales/de/Home.json

@@ -6,7 +6,6 @@
   "ChangeToGuest": "Zu {{guestCaption}} ändern",
   "ChangeToUser": "Zu {{userCaption}} ändern",
   "ClearButton": "Filter zurücksetzen",
-  "DeleteButton": "Löschen",
   "DisableUserButton": "Deaktivieren",
   "EmailChangeButton": "E-Mail-Adresse ändern",
   "EmptyGroupDescription": "Sie können neue Teammitglieder manuell oder über den Link einladen.",
@@ -31,4 +30,4 @@
   "SuccessChangeUserStatus": "Der Benutzerstatus war erfolgreich geändert",
   "SuccessfullyRemovedGroup": "Die Gruppe wurde erfolgreich entfernt",
   "UserStatus": "Status"
-}
+}

products/ASC.Files/Client/public/locales/en/Home.json

@@ -21,7 +21,6 @@
   "CopyItems": "\u003Cstrong\u003E{{qty}}\u003C/strong\u003E elements copied",
   "CopyOperation": "Copying",
   "CreateWithEmptyTitle": "Can\u0027t create a folder or file with an empty title",
-  "Delete": "Delete",
   "DeleteFromTrash": "Selected elements were successfully deleted from Trash",
   "DeleteOperation": "Deleting",
   "DeleteSelectedElem": "Selected elements were successfully deleted",
@@ -107,4 +106,4 @@
   "View": "View",
   "ViewList": "List",
   "ViewTiles": "Tiles"
-}
+}

products/ASC.Files/Client/public/locales/ru/Home.json

@@ -21,7 +21,6 @@
   "CopyItems": "Скопировано элементов: \u003Cstrong\u003E{{qty}}\u003C/strong\u003E",
   "CopyOperation": "Копирование",
   "CreateWithEmptyTitle": "Нельзя создать папку или файл с пустым названием",
-  "Delete": "Удалить",
   "DeleteFromTrash": "Выбранные элементы успешно удалены из корзины",
   "DeleteOperation": "Удаление",
   "DeleteSelectedElem": "Выбранные элементы успешно удалены",
@@ -107,4 +106,4 @@
   "View": "Просмотр",
   "ViewList": "Список",
   "ViewTiles": "Плитки"
-}
+}

products/ASC.Files/Client/src/HOCs/withContextOptions.js

@@ -362,7 +362,9 @@ export default function withContextOptions(WrappedComponent) {
           case "delete":
             return {
               key: option,
-              label: isThirdPartyFolder ? t("DeleteThirdParty") : t("Delete"),
+              label: isThirdPartyFolder
+                ? t("DeleteThirdParty")
+                : t("Common:Delete"),
               icon: "/static/images/catalog.trash.react.svg",
               onClick: this.onClickDelete,
               disabled: false,

products/ASC.Files/Client/src/pages/Home/Section/Header/index.js

@@ -285,7 +285,7 @@ class SectionHeaderContent extends React.Component {
       },
       {
         key: "delete",
-        label: t("Delete"),
+        label: t("Common:Delete"),
         onClick: this.onDeleteAction,
         disabled: true,
       },
@@ -413,7 +413,7 @@ class SectionHeaderContent extends React.Component {
         onClick: this.onCopyAction,
       },
       {
-        label: t("Delete"),
+        label: t("Common:Delete"),
         disabled:
           !selectionCount || !deleteDialogVisible || isThirdPartySelection,
         onClick: this.onDeleteAction,

products/ASC.People/Client/public/locales/en/Home.json

@@ -14,7 +14,6 @@
   "LblActive": "Active",
   "Administrator": "Administrator",
   "LblOther": "Other",
-  "DeleteButton": "Delete",
   "LblSelect": "Select",
   "More": "More",
   "MessageEmailActivationInstuctionsSentOnEmail": "The email activation instructions have been sent to the <1>{{email}}</1> email address",
@@ -32,4 +31,4 @@
   "SuccessfullyRemovedGroup": "Group has been removed successfully",
   "AddFilter": "Add filter",
   "SuccessChangeUserStatus": "The user status was successfully changed"
-}
+}

products/ASC.People/Client/public/locales/ru/Home.json

@@ -14,7 +14,6 @@
   "LblActive": "Активный",
   "Administrator": "Администратор",
   "LblOther": "Другое",
-  "DeleteButton": "Удалить",
   "LblSelect": "Выберите",
   "More": "Больше",
   "MessageEmailActivationInstuctionsSentOnEmail": "Инструкции по активации электронной почты были отправлены на адрес <1>{{email}}</1>",
@@ -32,4 +31,4 @@
   "SuccessfullyRemovedGroup": "Группа была успешно удалена",
   "AddFilter": "Добавить фильтр",
   "SuccessChangeUserStatus": "Статус пользователя успешно изменен"
-}
+}

products/ASC.People/Client/src/pages/Home/Section/Header/index.js

@@ -265,7 +265,7 @@ const SectionHeaderContent = (props) => {
         onClick: onSendEmail,
       },
       {
-        label: t("DeleteButton"),
+        label: t("Common:Delete"),
         disabled: !hasUsersToRemove,
         onClick: toggleDeleteDialog,
       },
@@ -319,7 +319,7 @@ const SectionHeaderContent = (props) => {
       },
       {
         key: "delete-group",
-        label: t("DeleteButton"),
+        label: t("Common:Delete"),
         onClick: onDeleteGroup,
       },
     ];

public/locales/de/Common.json

@@ -52,5 +52,6 @@
   "Settings": "Einstellungen",
   "Guest": "Gast",
   "AdminSettings": "Administrative Einstellungen",
-  "ContinueButton": "Weiter"
+  "ContinueButton": "Weiter",
+  "Delete": "Löschen"
 }

public/locales/en/Common.json

@@ -52,5 +52,6 @@
   "Settings": "Settings",
   "Guest": "Guest",
   "AdminSettings": "Admin settings",
-  "ContinueButton": "Continue"
+  "ContinueButton": "Continue",
+  "Delete": "Delete"
 }

public/locales/ru/Common.json

@@ -52,5 +52,6 @@
   "Settings": "Настройки",
   "Guest": "Гость",
   "AdminSettings": "Настройки администратора",
-  "ContinueButton": "Продолжить"
+  "ContinueButton": "Продолжить",
+  "Delete": "Удалить"
 }