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

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

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

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

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

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

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

web/ASC.Web.Login/public/locales/de/Login.json

@@ -7,10 +7,9 @@
   "MessageEmailConfirmed": "Ihre E-Mail-Adresse wurde erfolgreich aktiviert.",
   "MessageSendPasswordRecoveryInstructionsOnEmail": "Bitte E-Mail eingeben, das Sie bei der Registrierung verwendet haben. Anleitungen zur Änderung eines Passworts werden daran gesendet.",
   "Or": "oder",
-  "PasswordRecoveryPlaceholder": "Ihr Registrierungsemail",
+  "RegistrationEmail": "Ihr Registrierungsemail",
   "PasswordRecoveryTitle": "Kennwort wiederherstellen",
   "Register": "Registrieren",
-  "RegisterPlaceholder": "Ihr Registrierungsemail",
   "RegisterSendButton": "Anfrage senden",
   "RegisterTextBodyAfterDomainsList": "Für Registrierung geben Sie Ihre E-Mail-Adresse ein und klicken Sie auf Anfrage senden. Der Aktivierungslink wird an dieser Adresse gesendet.",
   "RegisterTextBodyBeforeDomainsList": "Für Registrierung sollen Benutzer E-Mail-Konten hier haben:",

web/ASC.Web.Login/public/locales/en/Login.json

@@ -7,10 +7,9 @@
   "MessageEmailConfirmed": "Your email was activated successfully.",
   "MessageSendPasswordRecoveryInstructionsOnEmail": "Please, enter the email you used for registration. The password recovery instructions will be sent to it.",
   "Or": "OR",
-  "PasswordRecoveryPlaceholder": "Your registration email",
+  "RegistrationEmail": "Your registration email",
   "PasswordRecoveryTitle": "Password recovery",
   "Register": "Register",
-  "RegisterPlaceholder": "Your registration email",
   "RegisterSendButton": "Send request",
   "RegisterTextBodyAfterDomainsList": "To register, enter your email and click Send request. An activation link will be sent to you.  ",
   "RegisterTextBodyBeforeDomainsList": "Registration is available to users with an email account at",

web/ASC.Web.Login/public/locales/fr/Login.json

@@ -7,10 +7,9 @@
   "MessageEmailConfirmed": "Votre adresse e-mail est activée avec succès.",
   "MessageSendPasswordRecoveryInstructionsOnEmail": "S\u0027il vous plaît entrez l\u0027adresse e-mail que vous avez utilisée lors de votre inscription sur le portail. Les instructions de récupération de votre mot de passe seront envoyées à cette adresse.",
   "Or": "Ou",
-  "PasswordRecoveryPlaceholder": "Votre mail d\u0027inscription",
+  "RegistrationEmail": "Votre mail d\u0027inscription",
   "PasswordRecoveryTitle": "Récupération de mot de passe",
   "Register": "Inscription",
-  "RegisterPlaceholder": "Votre mail d\u0027inscription",
   "RegisterSendButton": "Envoyer une demande",
   "RegisterTextBodyAfterDomainsList": "Pour vous inscrire, saisissez votre adresse de courriel et cliquez sur Envoyer une demande. Vous allez recevoir un courriel à l\u0027adresse spécifiée. Veuillez indiquer l\u0027adresse de courriel à laquelle votre invitation sera envoyée :",
   "RegisterTextBodyBeforeDomainsList": "L\u0027inscription est disponible aux utilisateurs avec le compte de mail à ",

web/ASC.Web.Login/public/locales/it/Login.json

@@ -7,10 +7,9 @@
   "MessageEmailConfirmed": "Il tuo indirizzo email è stato confermato con successo.",
   "MessageSendPasswordRecoveryInstructionsOnEmail": "‎Inserisci l\u0027e-mail che hai usato per la registrazione. Le istruzioni per il recupero della password verranno inviate su di esso.‎",
   "Or": "o",
-  "PasswordRecoveryPlaceholder": "la tua email di registrazione",
+  "RegistrationEmail": "la tua email di registrazione",
   "PasswordRecoveryTitle": "Recupero della password",
   "Register": "Registra",
-  "RegisterPlaceholder": "la tua email di registrazione",
   "RegisterSendButton": "‎Invia richiesta‎",
   "RegisterTextBodyAfterDomainsList": "‎Per registrarsi, immettere la posta elettronica e fare clic su Invia richiesta. Ti verrà inviato un link di attivazione. ‎",
   "RegisterTextBodyBeforeDomainsList": "‎La registrazione è disponibile per gli utenti con un account di posta elettronica all\u0027indirizzo‎",

web/ASC.Web.Login/public/locales/ru/Login.json

@@ -7,10 +7,9 @@
   "MessageEmailConfirmed": "Ваш email успешно активирован.",
   "MessageSendPasswordRecoveryInstructionsOnEmail": "Пожалуйста, введите адрес электронной почты, указанный при регистрации на портале. Инструкции для восстановления пароля будут отправлены на этот адрес электронной почты.",
   "Or": "ИЛИ",
-  "PasswordRecoveryPlaceholder": "Ваш регистрационный email",
+  "RegistrationEmail": "Ваш регистрационный email",
   "PasswordRecoveryTitle": "Восстановление пароля",
   "Register": "Регистрация",
-  "RegisterPlaceholder": "Ваш регистрационный email",
   "RegisterSendButton": "Отправить запрос",
   "RegisterTextBodyAfterDomainsList": "Чтобы зарегистрироваться, введите свой email и нажмите кнопку Отправить запрос. Сообщение со ссылкой для активации вашей учётной записи будет отправлено на указанный адрес.",
   "RegisterTextBodyBeforeDomainsList": "Регистрация доступна для пользователей, которые имеют почтовый ящик на",

web/ASC.Web.Login/src/sub-components/forgot-password-modal-dialog.js

@@ -80,7 +80,7 @@ const ForgotPasswordModalDialog = (props) => {
         >
           <TextInput
             hasError={emailError}
-            placeholder={t("PasswordRecoveryPlaceholder")}
+            placeholder={t("RegistrationEmail")}
             isAutoFocussed={true}
             id="e-mail"
             name="e-mail"

web/ASC.Web.Login/src/sub-components/register-modal-dialog.js

@@ -69,7 +69,7 @@ const RegisterModalDialog = ({
         >
           <TextInput
             hasError={emailErr}
-            placeholder={t("RegisterPlaceholder")}
+            placeholder={t("RegistrationEmail")}
             isAutoFocussed={true}
             id="e-mail"
             name="e-mail"