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

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

@@ -1,4 +1,3 @@
 {
   "MoveToFolderMessage": "Ordner können nicht in Unterordner verschoben werden",
-  "Restore": "Wiederherstellen"
-}
+}

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

@@ -17,5 +17,6 @@
   "OwnerChange": "Besitzer ändern",
   "Copy": "Kopieren",
   "UploadingLabel": "Dateien hochgeladen: {{file}} von {{totalFiles}}",
-  "DeleteOperation": "Löschen"
-}
+  "DeleteOperation": "Löschen",
+  "Restore": "Wiederherstellen"
+}

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

@@ -1,5 +1,4 @@
 {
   "EditComment": "Kommentar bearbeiten",
-  "Restore": "Wiederherstellen",
   "Version": "Version {{version}}"
 }

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

@@ -62,7 +62,6 @@
   "RemovedFromFavorites": "Removed from favorites",
   "RemoveFromFavorites": "Remove from favorites",
   "Rename": "Rename",
-  "Restore": "Restore",
   "SendByEmail": "Send by email",
   "Share": "Share",
   "SharedEmptyContainerDescription": "The \u0027Shared with Me\u0027 section shows files shared to you by teammates. If you haven\u0027t seen the latest changes, they are marked as new. You can remove the files from the list using the context menu. ",
@@ -86,4 +85,4 @@
   "View": "View",
   "ViewList": "List",
   "ViewTiles": "Tiles"
-}
+}

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

@@ -1,4 +1,3 @@
 {
   "MoveToFolderMessage": "You can\u0027t move the folder to its subfolder",
-  "Restore": "Restore"
-}
+}

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

@@ -18,5 +18,6 @@
   "OwnerChange": "Change owner",
   "UploadingLabel": "Uploading files: {{file}} of {{totalFiles}}",
   "DeleteOperation": "Deleting",
-  "Copy": "Copy"
+  "Copy": "Copy",
+  "Restore": "Restore"
 }

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

@@ -1,5 +1,4 @@
 {
   "EditComment": "Edit comment",
-  "Restore": "Restore",
   "Version": "Ver.{{version}}"
 }

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

@@ -62,7 +62,6 @@
   "RemovedFromFavorites": "Удалено из избранного",
   "RemoveFromFavorites": "Удалить из избранного",
   "Rename": "Переименовать",
-  "Restore": "Восстановить",
   "SendByEmail": "Отправить по почте",
   "Share": "Доступ",
   "SharedEmptyContainerDescription": "Раздел «Доступно для меня» используется для отображения файлов, к которым ваши друзья или коллеги предоставили вам доступ. Если вы не видели последние изменения в документах, они помечаются как «новые». Вы можете удалить файлы из списка, нажав соответствующую кнопку.",
@@ -86,4 +85,4 @@
   "View": "Просмотр",
   "ViewList": "Список",
   "ViewTiles": "Плитки"
-}
+}

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

@@ -1,4 +1,3 @@
 {
   "MoveToFolderMessage": "Нельзя перенести папку в свою дочернюю папку",
-  "Restore": "Восстановить"
-}
+}

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

@@ -18,5 +18,6 @@
   "OwnerChange": "Сменить владельца",
   "UploadingLabel": "Загружено файлов: {{file}} из {{totalFiles}}",
   "DeleteOperation": "Удаление",
-  "Copy": "Копировать"
+  "Copy": "Копировать",
+  "Restore": "Восстановить"
 }

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

@@ -1,5 +1,4 @@
 {
   "EditComment": "Редактировать комментарий",
-  "Restore": "Восстановить",
   "Version": "Ver.{{version}}"
 }

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

@@ -324,7 +324,7 @@ export default function withContextOptions(WrappedComponent) {
           case "restore":
             return {
               key: option,
-              label: t("Restore"),
+              label: t("Translations:Restore"),
               icon: "images/move.react.svg",
               onClick: this.onMoveAction,
               disabled: false,

products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js

@@ -107,7 +107,7 @@ const OperationsPanelComponent = (props) => {
       >
         <ModalDialog.Header>
           {isRecycleBin
-            ? t("Restore")
+            ? t("Translations:Restore")
             : isCopy
             ? t("Translations:Copy")
             : t("Translations:Move")}

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

@@ -427,7 +427,7 @@ class SectionHeaderContent extends React.Component {
       });
 
       menu.splice(4, 2, {
-        label: t("Restore"),
+        label: t("Translations:Restore"),
         onClick: this.onMoveAction,
       });
 

products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js

@@ -75,7 +75,11 @@ const VersionRow = (props) => {
 
   const contextOptions = [
     canEdit && { key: "edit", label: t("EditComment"), onClick: onEditComment },
-    canEdit && { key: "restore", label: t("Restore"), onClick: onRestoreClick },
+    canEdit && {
+      key: "restore",
+      label: t("Translations:Restore"),
+      onClick: onRestoreClick,
+    },
     {
       key: "download",
       label: `${t("Common:Download")} (${info.contentLength})`,
@@ -188,7 +192,7 @@ const VersionRow = (props) => {
                 {...linkStyles}
                 className="version_link-action"
               >
-                {t("Restore")}
+                {t("Translations:Restore")}
               </Link>
             )}
             <Link
@@ -252,6 +256,8 @@ export default inject(({ auth, versionHistoryStore }) => {
   };
 })(
   withRouter(
-    withTranslation(["VersionHistory", "Common"])(observer(VersionRow))
+    withTranslation(["VersionHistory", "Common", "Translations"])(
+      observer(VersionRow)
+    )
   )
 );