fix bad merge

This commit is contained in:
Elyor Djalilov 2024-05-02 19:00:45 +05:00
parent fca9c7a815
commit 74ccd82afb
32 changed files with 37 additions and 61 deletions

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "ادعوه مرة أخرى",
"MessageEmailActivationInstuctionsSentOnEmail": "تم إرسال تعليمات تفعيل البريد الإلكتروني إلى عنوان البريد الإلكتروني <1>{{email}}</1>.",
"UserStatus": "الحالة"
"MessageEmailActivationInstuctionsSentOnEmail": "تم إرسال تعليمات تفعيل البريد الإلكتروني إلى عنوان البريد الإلكتروني <1>{{email}}</1>."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Bir daha dəvət et",
"MessageEmailActivationInstuctionsSentOnEmail": "<1>{{email}}</1> elektron poçtuna aktivləşdirmə haqqında məlumat göndərilmişdir.",
"UserStatus": "Status"
"MessageEmailActivationInstuctionsSentOnEmail": "<1>{{email}}</1> elektron poçtuna aktivləşdirmə haqqında məlumat göndərilmişdir."
}

View File

@ -3,5 +3,4 @@
"MessageEmailActivationInstuctionsSentOnEmail": "Инструкциите за активиране на имейла бяха изпратени на имейл адрес <1>{{email}}</1>.",
"NotFoundUsers": "Няма намерени потребители",
"NotFoundUsersDescription": "Няма потребители, отговарящи на вашето търсене. Молим да коригирате параметрите си за търсене или да изчистите полето за търсене, за да видите пълния списък с потребители."
"UserStatus": "Статус"
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Pozvat znovu",
"MessageEmailActivationInstuctionsSentOnEmail": "Pokyny k aktivaci e-mailu byly zaslány na e-mailovou adresu <1>{{email}}</1>.",
"UserStatus": "Stav"
"MessageEmailActivationInstuctionsSentOnEmail": "Pokyny k aktivaci e-mailu byly zaslány na e-mailovou adresu <1>{{email}}</1>."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Erneut einladen",
"MessageEmailActivationInstuctionsSentOnEmail": "Anleitungen zur Änderung eines Passworts wurden an <1>{{email}}</1> gesendet.",
"UserStatus": "Status"
"MessageEmailActivationInstuctionsSentOnEmail": "Anleitungen zur Änderung eines Passworts wurden an <1>{{email}}</1> gesendet."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Πρόσκληση ξανά",
"MessageEmailActivationInstuctionsSentOnEmail": "Οι οδηγίες ενεργοποίησης μέσω email έχουν σταλεί στη διεύθυνση email <1>{{email}}</1>",
"UserStatus": "Κατάσταση"
"MessageEmailActivationInstuctionsSentOnEmail": "Οι οδηγίες ενεργοποίησης μέσω email έχουν σταλεί στη διεύθυνση email <1>{{email}}</1>"
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Invite again",
"MessageEmailActivationInstuctionsSentOnEmail": "The email activation instructions have been sent to the <1>{{email}}</1> email address.",
"UserStatus": "Status"
"MessageEmailActivationInstuctionsSentOnEmail": "The email activation instructions have been sent to the <1>{{email}}</1> email address."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Volver a invitar",
"MessageEmailActivationInstuctionsSentOnEmail": "Las instrucciones de activación se han enviado a la dirección de email <1>{{email}}</1>.",
"UserStatus": "Estado"
"MessageEmailActivationInstuctionsSentOnEmail": "Las instrucciones de activación se han enviado a la dirección de email <1>{{email}}</1>."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Kutsu uudelleen",
"MessageEmailActivationInstuctionsSentOnEmail": "Sähköpostin aktivointiohjeet on lähetetty sähköpostiosoitteeseen <1>{{email}}</1>.",
"UserStatus": "Tila"
"MessageEmailActivationInstuctionsSentOnEmail": "Sähköpostin aktivointiohjeet on lähetetty sähköpostiosoitteeseen <1>{{email}}</1>."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Inviter à nouveau",
"MessageEmailActivationInstuctionsSentOnEmail": "Les instructions d'activation ont été envoyées à l'adresse <1>{{email}}</1>.",
"UserStatus": "Statut"
"MessageEmailActivationInstuctionsSentOnEmail": "Les instructions d'activation ont été envoyées à l'adresse <1>{{email}}</1>."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Կրկին հրավիրել",
"MessageEmailActivationInstuctionsSentOnEmail": "Էլփոստի ակտիվացման հրահանգներն ուղարկվել են <1>{{email}}</1> Էլփոստի հասցե:",
"UserStatus": "Կարգավիճակ"
"MessageEmailActivationInstuctionsSentOnEmail": "Էլփոստի ակտիվացման հրահանգներն ուղարկվել են <1>{{email}}</1> Էլփոստի հասցե:"
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Invita di nuovo",
"MessageEmailActivationInstuctionsSentOnEmail": "Le istruzioni per l'attivazione sono state inviate tramite posta elettronica all'indirizzo <1>{{email}}</1>.",
"UserStatus": "Stato"
"MessageEmailActivationInstuctionsSentOnEmail": "Le istruzioni per l'attivazione sono state inviate tramite posta elettronica all'indirizzo <1>{{email}}</1>."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "もう一度招待する",
"MessageEmailActivationInstuctionsSentOnEmail": "電子メールによるアクティベーションの指示は、<1>{{email}}</1>のメールアドレスに送信されています。",
"UserStatus": "ステータス"
"MessageEmailActivationInstuctionsSentOnEmail": "電子メールによるアクティベーションの指示は、<1>{{email}}</1>のメールアドレスに送信されています。"
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "다시 초대",
"MessageEmailActivationInstuctionsSentOnEmail": "이메일 활성화 방법이 <1>{{email}}</1> 이메일 주소로 전송되었습니다.",
"UserStatus": "상태"
"MessageEmailActivationInstuctionsSentOnEmail": "이메일 활성화 방법이 <1>{{email}}</1> 이메일 주소로 전송되었습니다."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "ເຊີນອີກຄັ້ງ",
"MessageEmailActivationInstuctionsSentOnEmail": "ຄຳແນະນຳກ່ຽວກັບການເປີດໃຊ້ອີເມວໄດ້ຖືກສົ່ງໄປທີ່ອີເມວ <1> {{email}} </1> ທີ່ຢູ່ເມວ.",
"UserStatus": "ສະຖານະ"
"MessageEmailActivationInstuctionsSentOnEmail": "ຄຳແນະນຳກ່ຽວກັບການເປີດໃຊ້ອີເມວໄດ້ຖືກສົ່ງໄປທີ່ອີເມວ <1> {{email}} </1> ທີ່ຢູ່ເມວ."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Uzaicināt vēlreiz",
"MessageEmailActivationInstuctionsSentOnEmail": "Norādījumi par e-pasta aktivizēšanu ir nosūtīti uz <1>{{email}}</1> e-pasta adresi.",
"UserStatus": "Statuss"
"MessageEmailActivationInstuctionsSentOnEmail": "Norādījumi par e-pasta aktivizēšanu ir nosūtīti uz <1>{{email}}</1> e-pasta adresi."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Opnieuw uitnodigen",
"MessageEmailActivationInstuctionsSentOnEmail": "De e-mail activatie instructies zijn verzonden naar het <1>{{email}}</1> e-mailadres.",
"UserStatus": "Status"
"MessageEmailActivationInstuctionsSentOnEmail": "De e-mail activatie instructies zijn verzonden naar het <1>{{email}}</1> e-mailadres."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Zaproś ponownie",
"MessageEmailActivationInstuctionsSentOnEmail": "Instrukcje dotyczące aktywacji adresu e-mail zostały wysłane na adres <1>{{email}}</1>.",
"UserStatus": "Status"
"MessageEmailActivationInstuctionsSentOnEmail": "Instrukcje dotyczące aktywacji adresu e-mail zostały wysłane na adres <1>{{email}}</1>."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Convidar novamente",
"MessageEmailActivationInstuctionsSentOnEmail": "As instruções de ativação de e-mail foram enviadas para o endereço de e-mail <1>{{email}}</1>.",
"UserStatus": "Status"
"MessageEmailActivationInstuctionsSentOnEmail": "As instruções de ativação de e-mail foram enviadas para o endereço de e-mail <1>{{email}}</1>."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Convidar novamente",
"MessageEmailActivationInstuctionsSentOnEmail": "As instruções de ativação de e-mail foram enviadas para o endereço de e-mail <1>{{email}}</1>.",
"UserStatus": "Estado"
"MessageEmailActivationInstuctionsSentOnEmail": "As instruções de ativação de e-mail foram enviadas para o endereço de e-mail <1>{{email}}</1>."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Invită din nou",
"MessageEmailActivationInstuctionsSentOnEmail": "Instrucțiunile de activare a adresei e-mail au fost trimise la <1>{{email}}</1>.",
"UserStatus": "Statutul"
"MessageEmailActivationInstuctionsSentOnEmail": "Instrucțiunile de activare a adresei e-mail au fost trimise la <1>{{email}}</1>."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Выслать приглашение ещё раз",
"MessageEmailActivationInstuctionsSentOnEmail": "Инструкции по активации электронной почты были отправлены на адрес <1>{{email}}</1>.",
"UserStatus": "Статус"
"MessageEmailActivationInstuctionsSentOnEmail": "Инструкции по активации электронной почты были отправлены на адрес <1>{{email}}</1>."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "නැවතත් ආරාධනය",
"MessageEmailActivationInstuctionsSentOnEmail": "සක්‍රියන උපදෙස් <1>{{email}}</1> වි-තැපැල් ලිපිනයට යවා ඇත.",
"UserStatus": "තත්‍වය"
"MessageEmailActivationInstuctionsSentOnEmail": "සක්‍රියන උපදෙස් <1>{{email}}</1> වි-තැපැල් ලිපිනයට යවා ඇත."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Pozvať znova",
"MessageEmailActivationInstuctionsSentOnEmail": "Pokyny na aktiváciu e-mailu boli odoslané na <1>{{email}}</1> e-mail.",
"UserStatus": "Stav"
"MessageEmailActivationInstuctionsSentOnEmail": "Pokyny na aktiváciu e-mailu boli odoslané na <1>{{email}}</1> e-mail."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Povabi znova",
"MessageEmailActivationInstuctionsSentOnEmail": "Navodila za aktivacijo e-mail naslova so bila poslana na <1>{{email}}</1> email naslov.",
"UserStatus": "Status"
"MessageEmailActivationInstuctionsSentOnEmail": "Navodila za aktivacijo e-mail naslova so bila poslana na <1>{{email}}</1> email naslov."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Pozovi ponovo",
"MessageEmailActivationInstuctionsSentOnEmail": "Instrukcije o email aktivaciji su postulate na <1>{{email}}</1> email adresu.",
"UserStatus": "Status"
"MessageEmailActivationInstuctionsSentOnEmail": "Instrukcije o email aktivaciji su postulate na <1>{{email}}</1> email adresu."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Yeniden davet et",
"MessageEmailActivationInstuctionsSentOnEmail": "E-posta etkinleştirme talimatları <1>{{email}}</1> e-posta adresine gönderildi.",
"UserStatus": "Durum"
"MessageEmailActivationInstuctionsSentOnEmail": "E-posta etkinleştirme talimatları <1>{{email}}</1> e-posta adresine gönderildi."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Запросити знову",
"MessageEmailActivationInstuctionsSentOnEmail": "Інструкції з активації електронної пошти надіслано на адресу <1>{{email}}</1>.",
"UserStatus": "Статус"
"MessageEmailActivationInstuctionsSentOnEmail": "Інструкції з активації електронної пошти надіслано на адресу <1>{{email}}</1>."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "Mời lại",
"MessageEmailActivationInstuctionsSentOnEmail": "Email hướng dẫn kích hoạt đã được gửi đến địa chỉ email <1>{{email}}</1>.",
"UserStatus": "Trạng thái"
"MessageEmailActivationInstuctionsSentOnEmail": "Email hướng dẫn kích hoạt đã được gửi đến địa chỉ email <1>{{email}}</1>."
}

View File

@ -1,5 +1,4 @@
{
"LblInviteAgain": "再次邀请",
"MessageEmailActivationInstuctionsSentOnEmail": "邮件激活指示已发送至<1>{{email}}</1>邮件地址。",
"UserStatus": "状态"
"MessageEmailActivationInstuctionsSentOnEmail": "邮件激活指示已发送至<1>{{email}}</1>邮件地址。"
}

View File

@ -69,6 +69,7 @@ import ShareFolderDialog from "./ShareFolderDialog";
import EditGroupMembersDialog from "./EditGroupMembersDialog";
import ChangeStorageQuotaDialog from "./ChangeStorageQuotaDialog";
import DeleteGroupDialog from "./DeleteGroupDialog";
import DisableUserDialog from "./DisableUserDialog";
export {
EmptyTrashDialog,
@ -116,4 +117,5 @@ export {
ChangeQuotaDialog,
ChangeStorageQuotaDialog,
DeleteGroupDialog,
DisableUserDialog,
};

View File

@ -236,8 +236,12 @@ const Accounts = (props) => {
{!standalone && (
<>
<Text className={"info_field"} noSelect title={t("UserStatus")}>
{t("UserStatus")}
<Text
className={"info_field"}
noSelect
title={t("Common:UserStatus")}
>
{t("Common:UserStatus")}
</Text>
<Text
className={"info_data first-row"}