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

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",

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",

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

@@ -9,7 +9,6 @@
   "ChangesSavedSuccessfully": "Изменения успешно сохранены",
   "ContactInformation": "Контактные данные",
   "CopiedResourceText": "Скопировано",
-  "CopyEmailAndPassword": "Копировать email и пароль",
   "CustomCreation": "{{user}} (создание)",
   "EditPhoto": "Изменить фотографию",
   "EditUserDialogTitle": "Редактирование профиля",

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}

public/locales/de/Common.json

@@ -76,5 +76,6 @@
   "Active": "Aktiv",
   "Select": "Auswählen",
   "Version": "Version",
-  "SomethingWentWrong": "Ein Fehler ist aufgetreten."
+  "SomethingWentWrong": "Ein Fehler ist aufgetreten.",
+  "CopyEmailAndPassword": "E-Mail und Passwort kopieren"
 }

public/locales/en/Common.json

@@ -78,5 +78,6 @@
   "Active": "Active",
   "Select": "Select",
   "Version": "Version",
-  "SomethingWentWrong": "Something went wrong."
+  "SomethingWentWrong": "Something went wrong.",
+  "CopyEmailAndPassword": "Copy email and password"
 }

public/locales/ru/Common.json

@@ -78,5 +78,6 @@
   "Active": "Активный",
   "Select": "Выберите",
   "Version": "Версия",
-  "SomethingWentWrong": "Что-то пошло не так."
+  "SomethingWentWrong": "Что-то пошло не так.",
+  "CopyEmailAndPassword": "Скопировать email и пароль"
 }

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.",

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.",

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": "Вы приглашены присоединиться к этому порталу!",

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")}:`}

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")}:`}