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

2021-05-27 12:15:53 +03:00 · 2021-05-27 12:15:53 +03:00 · 90821d3fe1
commit 90821d3fe1
parent a9ddfc0a4a 102f26ed3c
34 changed files with 51 additions and 56 deletions
--- a/products/ASC.Files/Client/public/locales/de/Home.json
+++ b/products/ASC.Files/Client/public/locales/de/Home.json
@ -1,7 +1,5 @@
 {
  "Administrator": "Administrator",
-  "ByFirstNameSorting": "Nach Vornamen",
-  "ByLastNameSorting": "Nach Familiennamen",
  "ChangeToGuest": "Zu {{guestCaption}} ändern",
  "ChangeToUser": "Zu {{userCaption}} ändern",
  "EmptyGroupDescription": "Sie können neue Teammitglieder manuell oder über den Link einladen.",
@ -18,4 +16,4 @@
  "NotFoundTitle": "Keine Teammitglieder gefunden",
  "SuccessfullyRemovedGroup": "Die Gruppe wurde erfolgreich entfernt",
  "UserStatus": "Status"
-}
+}
--- a/products/ASC.Files/Client/public/locales/en/Home.json
+++ b/products/ASC.Files/Client/public/locales/en/Home.json
@ -79,9 +79,7 @@
  "TrashEmptyContainerDescription": "Trash is where all the deleted files are moved. You can restore or delete them permanently by emptying Trash. ",
  "UnblockVersion": "Unblock/Check-in",
  "UploadToFolder": "Upload to folder",
-  "Version": "Ver.{{version}}",
  "ViewList": "List",
-  "Version": "Ver.{{version}}",
  "RemoveFromList": "Remove from list",
  "MarkRead": "Mark as read",
  "ViewTiles": "Tiles"
--- a/products/ASC.Files/Client/public/locales/ru/Home.json
+++ b/products/ASC.Files/Client/public/locales/ru/Home.json
@ -79,9 +79,7 @@
  "TrashEmptyContainerDescription": "В разделе «Корзина» находятся все удаленные файлы. Вы можете восстановить их, если они были удалены по ошибке, или удалить их навсегда. Обратите внимание, что когда вы удаляете файлы из корзины, они больше не могут быть восстановлены.",
  "UnblockVersion": "Заблокировать/Разблокировать",
  "UploadToFolder": "Загрузить в папку",
-  "Version": "Вер.{{version}}",
  "ViewList": "Список",
-  "Version": "Вер.{{version}}",
  "RemoveFromList": "Убрать из списка",
  "MarkRead": "Пометить прочтённым",
  "ViewTiles": "Плитки"
--- a/products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
+++ b/products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
@ -164,7 +164,7 @@ class SectionFilterContent extends React.Component {
        label: usersCaption,
        isSelector: true,
        defaultOptionLabel: t("Common:MeLabel"),
-        defaultSelectLabel: t("Common:LblSelect"),
+        defaultSelectLabel: t("Common:Select"),
        groupsCaption,
        defaultOption: user,
        selectedItem,
@ -173,7 +173,7 @@ class SectionFilterContent extends React.Component {
        key: "group",
        group: "filter-author",
        label: groupsCaption,
-        defaultSelectLabel: t("Common:LblSelect"),
+        defaultSelectLabel: t("Common:Select"),
        isSelector: true,
        selectedItem,
      },
--- a/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
+++ b/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
@ -328,7 +328,7 @@ class SectionHeaderContent extends React.Component {

    let menu = [
      {
-        label: t("Common:LblSelect"),
+        label: t("Common:Select"),
        isDropdown: true,
        isSeparator: true,
        isSelect: true,
--- a/products/ASC.People/Client/public/locales/de/GroupAction.json
+++ b/products/ASC.People/Client/public/locales/de/GroupAction.json
@ -1,7 +1,7 @@
 {
  "CustomNewDepartment": "{{groupCaption}} (Erstellung)",
  "GroupAction": "Arbeit mit Gruppe",
-  "LblSelect": "Auswählen",
+  "SelectAction": "Auswählen",
  "Members": "Mitglieder",
  "Name": "Name",
  "SearchAddedMembers": "Hinzugefügte Mitglieder suchen",
--- a/products/ASC.People/Client/public/locales/de/Profile.json
+++ b/products/ASC.People/Client/public/locales/de/Profile.json
@ -5,7 +5,7 @@
  "ContactInformation": "Kontaktdaten",
  "EditPhoto": "Bild bearbeiten",
  "EditSubscriptionsBtn": "Abonnements bearbeiten",
-  "EditUserDialogTitle": "Profil bearbeiten",
+  "EditUser": "Profil bearbeiten",
  "InviteAgainLbl": "Erneut einladen",
  "MessageEmailActivationInstuctionsSentOnEmail": "Die Hinweise für die Aktivierung wurden an \u003Cstrong\u003E{{ email }}\u003C/strong\u003E versandt.",
  "PhoneLbl": "Telefon",
--- a/products/ASC.People/Client/public/locales/de/ProfileAction.json
+++ b/products/ASC.People/Client/public/locales/de/ProfileAction.json
@ -8,7 +8,6 @@
  "ChangeButton": "Ändern",
  "ChangesSavedSuccessfully": "Änderungen wurden gespeichert",
  "ContactInformation": "Kontaktdaten",
-  "CopyEmailAndPassword": "E-Mail und Passwort kopieren",
  "CustomCreation": "{{user}} (Erstellung)",
  "EditPhoto": "Bild bearbeiten",
  "EditUserDialogTitle": "Profil bearbeiten",
--- a/products/ASC.People/Client/public/locales/en/GroupAction.json
+++ b/products/ASC.People/Client/public/locales/en/GroupAction.json
@ -1,7 +1,7 @@
 {
  "CustomNewDepartment": "{{groupCaption}} (creation)",
  "GroupAction": "Group action",
-  "LblSelect": "Select",
+  "SelectAction": "Select",
  "Members": "Members",
  "Name": "Name",
  "SearchAddedMembers": "Search added members",
--- a/products/ASC.People/Client/public/locales/en/Home.json
+++ b/products/ASC.People/Client/public/locales/en/Home.json
@ -12,11 +12,9 @@
  "ChangeToUser": "Change to {{userCaption}}",
  "ChangeToGuest": "Change to {{guestCaption}}",
  "LblInviteAgain": "Invite again",
-  "ByFirstNameSorting": "By first name",
-  "ByLastNameSorting": "By last name",
  "LblInvited": "Invited",
  "LblSetActive": "Set active",
  "LblSetDisabled": "Set disabled",
  "MakeInvitationLink": "Make invitation link",
  "SuccessfullyRemovedGroup": "Group has been removed successfully"
-}
+}
--- a/products/ASC.People/Client/public/locales/en/Profile.json
+++ b/products/ASC.People/Client/public/locales/en/Profile.json
@ -7,7 +7,7 @@
  "Disconnect": "Disconnect",
  "EditPhoto": "Edit photo",
  "EditSubscriptionsBtn": "Edit subscriptions",
-  "EditUserDialogTitle": "Edit profile",
+  "EditUser": "Edit profile",
  "InviteAgainLbl": "Invite again",
  "LoginSettings": "Login settings",
  "MessageEmailActivationInstuctionsSentOnEmail": "The email activation instructions have been sent to the \u003Cstrong\u003E{{ email }}\u003C/strong\u003E email address",
--- a/products/ASC.People/Client/public/locales/en/ProfileAction.json
+++ b/products/ASC.People/Client/public/locales/en/ProfileAction.json
@ -9,7 +9,6 @@
  "ChangesSavedSuccessfully": "Changes saved successfully",
  "ContactInformation": "Contact information",
  "CopiedResourceText": "Copied",
-  "CopyEmailAndPassword": "Copy email and password",
  "CustomCreation": "{{user}} (creation)",
  "EditPhoto": "Edit Photo",
  "EditUserDialogTitle": "Edit profile",
--- a/products/ASC.People/Client/public/locales/ru/GroupAction.json
+++ b/products/ASC.People/Client/public/locales/ru/GroupAction.json
@ -1,7 +1,7 @@
 {
  "CustomNewDepartment": "{{groupCaption}} (создание)",
  "GroupAction": "Работа с группой",
-  "LblSelect": "Выбрать",
+  "SelectAction": "Выбрать",
  "Members": "Участники",
  "Name": "Название",
  "SearchAddedMembers": "Поиск добавленных участников",
--- a/products/ASC.People/Client/public/locales/ru/Home.json
+++ b/products/ASC.People/Client/public/locales/ru/Home.json
@ -12,11 +12,9 @@
  "ChangeToUser": "Изменить на {{userCaption}}",
  "ChangeToGuest": "Изменить на {{guestCaption}}",
  "LblInviteAgain": "Выслать прилашение ещё раз",
-  "ByFirstNameSorting": "Имя",
-  "ByLastNameSorting": "Фамилия",
  "LblInvited": "Приглашен",
  "LblSetActive": "Разблокировать",
  "LblSetDisabled": "Заблокировать",
  "MakeInvitationLink": "Создать пригласительную ссылку",
  "SuccessfullyRemovedGroup": "Группа была успешно удалена"
-}
+}
--- a/products/ASC.People/Client/public/locales/ru/Profile.json
+++ b/products/ASC.People/Client/public/locales/ru/Profile.json
@ -7,7 +7,7 @@
  "Disconnect": "Отключить",
  "EditPhoto": "Изменить фотографию",
  "EditSubscriptionsBtn": "Изменить подписки",
-  "EditUserDialogTitle": "Редактировать",
+  "EditUser": "Редактировать",
  "InviteAgainLbl": "Активировать адрес email ещё раз",
  "LoginSettings": "Вход через социальные сети",
  "MessageEmailActivationInstuctionsSentOnEmail": "Инструкция по активации почты пользователя была отправлена по адресу \u003Cstrong\u003E{{ email }}\u003C/strong\u003E",
--- a/products/ASC.People/Client/public/locales/ru/ProfileAction.json
+++ b/products/ASC.People/Client/public/locales/ru/ProfileAction.json
@ -9,7 +9,6 @@
  "ChangesSavedSuccessfully": "Изменения успешно сохранены",
  "ContactInformation": "Контактные данные",
  "CopiedResourceText": "Скопировано",
-  "CopyEmailAndPassword": "Копировать email и пароль",
  "CustomCreation": "{{user}} (создание)",
  "EditPhoto": "Изменить фотографию",
  "EditUserDialogTitle": "Редактирование профиля",
--- a/products/ASC.People/Client/src/pages/GroupAction/Section/Body/index.js
+++ b/products/ASC.People/Client/src/pages/GroupAction/Section/Body/index.js
@ -274,7 +274,7 @@ const SectionBodyContent = ({
                newGroupManager.default ||
                newGroupManager.key === ID_NO_GROUP_MANAGER ||
                newGroupManager.displayName === "profile removed"
-                  ? { ...newGroupManager, label: t("LblSelect") }
+                  ? { ...newGroupManager, label: t("SelectAction") }
                  : newGroupManager
              }
              scaled={true}
--- a/products/ASC.People/Client/src/pages/Home/Section/Filter/index.js
+++ b/products/ASC.People/Client/src/pages/Home/Section/Filter/index.js
@ -160,7 +160,7 @@ class SectionFilterContent extends React.Component {
        group: "filter-other",
        subgroup: "filter-group",
        label: groupCaption,
-        defaultSelectLabel: t("Common:LblSelect"),
+        defaultSelectLabel: t("Common:Select"),
      },
      ...groupOptions,
    ];
@ -174,8 +174,12 @@ class SectionFilterContent extends React.Component {
    const { t } = this.props;

    return [
-      { key: "firstname", label: t("ByFirstNameSorting"), default: true },
-      { key: "lastname", label: t("ByLastNameSorting"), default: true },
+      {
+        key: "firstname",
+        label: t("Common:ByFirstNameSorting"),
+        default: true,
+      },
+      { key: "lastname", label: t("Common:ByLastNameSorting"), default: true },
    ];
  };

--- a/products/ASC.People/Client/src/pages/Home/Section/Header/index.js
+++ b/products/ASC.People/Client/src/pages/Home/Section/Header/index.js
@ -214,7 +214,7 @@ const SectionHeaderContent = (props) => {
  const menuItems = useMemo(
    () => [
      {
-        label: t("Common:LblSelect"),
+        label: t("Common:Select"),
        isDropdown: true,
        isSeparator: true,
        isSelect: true,
--- a/products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
+++ b/products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
@ -297,8 +297,8 @@ class SectionBodyContent extends React.PureComponent {
              <Button
                size="big"
                scale={true}
-                label={t("EditUserDialogTitle")}
-                title={t("EditUserDialogTitle")}
+                label={t("EditUser")}
+                title={t("EditUser")}
                onClick={this.onEditProfileClick}
              />
            </EditButtonWrapper>
--- a/products/ASC.People/Client/src/pages/Profile/Section/Header/index.js
+++ b/products/ASC.People/Client/src/pages/Profile/Section/Header/index.js
@ -315,7 +315,7 @@ class SectionHeaderContent extends React.PureComponent {
        return [
          {
            key: "edit",
-            label: t("EditUserDialogTitle"),
+            label: t("EditUser"),
            onClick: this.onEditClick,
          },
          {
--- a/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
+++ b/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
@ -531,7 +531,7 @@ class CreateUserForm extends React.Component {
              inputValue={profile.password}
              inputIsDisabled={isLoading || profile.passwordType === "link"}
              inputOnChange={this.onInputChange}
-              copyLinkText={t("CopyEmailAndPassword")}
+              copyLinkText={t("Common:CopyEmailAndPassword")}
              copiedResourceText={t("CopiedResourceText")}
              inputTabIndex={4}
              passwordSettings={passwordSettings}
--- a/public/locales/de/Common.json
+++ b/public/locales/de/Common.json
@ -74,7 +74,10 @@
  "Review": "Review",
  "Size": "Größe",
  "Active": "Aktiv",
-  "LblSelect": "Auswählen",
+  "Select": "Auswählen",
  "Version": "Version",
-  "SomethingWentWrong": "Ein Fehler ist aufgetreten."
-}
+  "SomethingWentWrong": "Ein Fehler ist aufgetreten.",
+  "CopyEmailAndPassword": "E-Mail und Passwort kopieren",
+  "ByFirstNameSorting": "Nach Vornamen",
+  "ByLastNameSorting": "Nach Familiennamen"
+}
--- a/public/locales/en/Common.json
+++ b/public/locales/en/Common.json
@ -76,7 +76,10 @@
  "Review": "Review",
  "Size": "Size",
  "Active": "Active",
-  "LblSelect": "Select",
+  "Select": "Select",
  "Version": "Version",
-  "SomethingWentWrong": "Something went wrong."
-}
+  "SomethingWentWrong": "Something went wrong.",
+  "CopyEmailAndPassword": "Copy email and password",
+  "ByFirstNameSorting": "By first name",
+  "ByLastNameSorting": "By last name"
+}
--- a/public/locales/ru/Common.json
+++ b/public/locales/ru/Common.json
@ -76,7 +76,10 @@
  "Review": "Рецензирование",
  "Size": "Размер",
  "Active": "Активный",
-  "LblSelect": "Выберите",
+  "Select": "Выберите",
  "Version": "Версия",
-  "SomethingWentWrong": "Что-то пошло не так."
-}
+  "SomethingWentWrong": "Что-то пошло не так.",
+  "CopyEmailAndPassword": "Скопировать email и пароль",
+  "ByFirstNameSorting": "Имя",
+  "ByLastNameSorting": "Фамилия"
+}
--- a/web/ASC.Web.Client/public/locales/de/Confirm.json
+++ b/web/ASC.Web.Client/public/locales/de/Confirm.json
@ -2,7 +2,6 @@
  "ChangePasswordSuccess": "Passwort wurde erfolgreich geändert",
  "ConfirmOwnerPortalSuccessMessage": "Der Portalbesitzer wurde erfolgreich geändert. {0} In 10 Sekunden werden Sie {1} hier {2} umgeleitet werden",
  "ConfirmOwnerPortalTitle": "Bitte bestätigen Sie, dass {{newOwner}} Portalbesitzer werden soll",
-  "CopyEmailAndPassword": "E-Mail und Passwort kopieren",
  "DeleteProfileBtn": "Mein Konto löschen",
  "DeleteProfileConfirmation": "Achtung! Dies wird Ihr Konto löschen.",
  "DeleteProfileConfirmationInfo": "Wenn Sie auf \u0022Mein Konto löschen\u0022 klicken, akzeptieren Sie unsere Datenschutzerklärung.",
--- a/web/ASC.Web.Client/public/locales/de/Settings.json
+++ b/web/ASC.Web.Client/public/locales/de/Settings.json
@ -9,8 +9,6 @@
  "AccessRightsUsersFromList": "{{users}} aus der Liste",
  "Backup": "Backup",
  "BrowserNoCanvasSupport": "Ihr Browser unterstützt die HTML5 Canvas-Tag nicht.",
-  "ByFirstNameSorting": "Nach Vornamen",
-  "ByLastNameSorting": "Nach Familiennamen",
  "ChangeLogoButton": "Logo ändern",
  "ChooseOwner": "Besitzer wählen",
  "CompanyNameForCanvasLogo": "Name des Unternehmens",
--- a/web/ASC.Web.Client/public/locales/en/Confirm.json
+++ b/web/ASC.Web.Client/public/locales/en/Confirm.json
@ -2,7 +2,6 @@
  "ChangePasswordSuccess": "Password has been successfully changed",
  "ConfirmOwnerPortalSuccessMessage": "Portal owner has been successfully changed. {0}In 10 seconds you will be redirected {1}here{2}",
  "ConfirmOwnerPortalTitle": "Please confirm that you want to change portal owner to {{newOwner}}",
-  "CopyEmailAndPassword": "Copy email and password",
  "DeleteProfileBtn": "Delete my account",
  "DeleteProfileConfirmation": "Attention! You are about to delete your account.",
  "DeleteProfileConfirmationInfo": "By clicking \u0022Delete my account\u0022 you agree with our Privacy policy.",
--- a/web/ASC.Web.Client/public/locales/en/Settings.json
+++ b/web/ASC.Web.Client/public/locales/en/Settings.json
@ -9,8 +9,6 @@
  "AddName": "Add Name",
  "Backup": "Backup",
  "BrowserNoCanvasSupport": "Your browser does not support the HTML5 canvas tag.",
-  "ByFirstNameSorting": "By first name",
-  "ByLastNameSorting": "By last name",
  "ChangeLogoButton": "Change Logo",
  "ChooseOwner": "Choose owner",
  "CompanyNameForCanvasLogo": "Company name",
--- a/web/ASC.Web.Client/public/locales/ru/Confirm.json
+++ b/web/ASC.Web.Client/public/locales/ru/Confirm.json
@ -2,7 +2,6 @@
  "ChangePasswordSuccess": "Пароль был успешно изменен",
  "ConfirmOwnerPortalSuccessMessage": "Portal owner has been successfully changed. {0}In 10 seconds you will be redirected {1}here{2}",
  "ConfirmOwnerPortalTitle": "Пожалуйста, подтвердите, что Вы хотите изменить владельца портала на {{newOwner}}",
-  "CopyEmailAndPassword": "Скопировать email и пароль",
  "EmailAndPasswordCopiedToClipboard": "Email и пароль скопированы",
  "FirstName": "Имя",
  "InviteTitle": "Вы приглашены присоединиться к этому порталу!",
--- a/web/ASC.Web.Client/public/locales/ru/Settings.json
+++ b/web/ASC.Web.Client/public/locales/ru/Settings.json
@ -9,8 +9,6 @@
  "AddName": "Добавьте наименование",
  "Backup": "Резервное копирование",
  "BrowserNoCanvasSupport": "Ваш браузер не поддерживает тег HTML5 canvas.",
-  "ByFirstNameSorting": "По имени",
-  "ByLastNameSorting": "По фамилии",
  "ChangeLogoButton": "Сменить логотип",
  "ChooseOwner": "Выбрать владельца",
  "CompanyNameForCanvasLogo": "Название компании",
--- a/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.js
+++ b/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.js
@ -314,7 +314,7 @@ class Confirm extends React.PureComponent {
              onChange={this.onChangePassword}
              onCopyToClipboard={this.onCopyToClipboard}
              onValidateInput={this.validatePassword}
-              clipActionResource={t("CopyEmailAndPassword")}
+              clipActionResource={t("Common:CopyEmailAndPassword")}
              clipEmailResource={`${t("Common:Email")}: `}
              clipPasswordResource={`${t("Common:Password")}: `}
              tooltipPasswordTitle={`${t("Common:PasswordLimitMessage")}:`}
--- a/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
+++ b/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
@ -493,7 +493,7 @@ class Confirm extends React.PureComponent {
              onChange={this.onChangePassword}
              onCopyToClipboard={this.onCopyToClipboard}
              onValidateInput={this.validatePassword}
-              clipActionResource={t("CopyEmailAndPassword")}
+              clipActionResource={t("Common:CopyEmailAndPassword")}
              clipEmailResource={`${t("Common:Email")}: `}
              clipPasswordResource={`${t("Common:Password")}: `}
              tooltipPasswordTitle={`${t("Common:PasswordLimitMessage")}:`}
--- a/web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
@ -336,8 +336,12 @@ class PureAdminsSettings extends Component {
    const { t } = this.props;

    return [
-      { key: "firstname", label: t("ByFirstNameSorting"), default: true },
-      { key: "lastname", label: t("ByLastNameSorting"), default: true },
+      {
+        key: "firstname",
+        label: t("Common:ByFirstNameSorting"),
+        default: true,
+      },
+      { key: "lastname", label: t("Common:ByLastNameSorting"), default: true },
    ];
  };