From 34954cd9e042e6ba2afe10cc81700d05ecb064e3 Mon Sep 17 00:00:00 2001 From: Elyor Djalilov Date: Fri, 25 Nov 2022 17:51:13 +0500 Subject: [PATCH] Fix bad merge --- packages/client/public/locales/en/Files.json | 5 ----- packages/client/public/locales/en/InviteDialog.json | 1 - packages/client/public/locales/ru/Files.json | 1 - 3 files changed, 7 deletions(-) diff --git a/packages/client/public/locales/en/Files.json b/packages/client/public/locales/en/Files.json index 99bd7913a8..39c9b4b6fd 100644 --- a/packages/client/public/locales/en/Files.json +++ b/packages/client/public/locales/en/Files.json @@ -2,10 +2,7 @@ "AddMembersDescription": "You can add new team members manually or invite them via link.", "All": "All", "AllFiles": "All files", - "Archived": "Move to archive", "ArchiveAction": "Empty archive", - "ArchiveEmptyScreen": "You can archive rooms you don’t use and restore them in your DocSpace at any moment or delete them permanently. These rooms will appear here.", - "ArchiveEmptyScreenHeader": "No archived rooms here yet", "Archived": "Archived", "ArchivedRoomAction": "The room '{{name}}' is archived", "ArchivedRoomsAction": "The rooms are archived", @@ -94,7 +91,6 @@ "RemoveFromList": "Remove from list", "RemovedFromFavorites": "Removed from favorites", "Rename": "Rename", - "RestoreAll": "Restore all", "RestoreAllArchive": "Are you sure you want to restore all rooms?", "ReviewRooms": "Review", "RoomCreated": "Room created!", @@ -124,7 +120,6 @@ "ViewList": "List", "ViewOnlyRooms": "View-only", "ViewTiles": "Tiles", - "WithSubfolders": "With subfolders" "WithSubfolders": "With subfolders", "RoomPinned": "Room pinned", "RoomUnpinned": "Room unpinned", diff --git a/packages/client/public/locales/en/InviteDialog.json b/packages/client/public/locales/en/InviteDialog.json index 0d0a918b31..98400562e1 100644 --- a/packages/client/public/locales/en/InviteDialog.json +++ b/packages/client/public/locales/en/InviteDialog.json @@ -12,7 +12,6 @@ "LinkCopySuccess": "Link has been copied", "SearchPlaceholder": "Invite people by name or email", "SendInvitation": "Send invitation", - "СhooseFromList": "Сhoose from list" "СhooseFromList": "Сhoose from list", "InviteUsers": "Invite users" } diff --git a/packages/client/public/locales/ru/Files.json b/packages/client/public/locales/ru/Files.json index 77686b9493..b3d9e4b499 100644 --- a/packages/client/public/locales/ru/Files.json +++ b/packages/client/public/locales/ru/Files.json @@ -87,7 +87,6 @@ "VersionHistory": "История версий", "ViewList": "Список", "ViewOnlyRooms": "Просмотр", - "ViewTiles": "Плитки" "ViewTiles": "Плитки", "CreateRoom": "Создание комнаты" }