Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1

This commit is contained in:
Tatiana Lopaeva 2024-08-29 12:02:52 +03:00
commit 1914417508
32 changed files with 1 additions and 32 deletions

View File

@ -59,7 +59,7 @@ class AuditTableHeader extends React.Component {
}, },
{ {
key: "Room", key: "Room",
title: t("Common:Context"), title: t("Common:Location"),
enable: true, enable: true,
resizable: true, resizable: true,
onChange: this.onColumnChange, onChange: this.onColumnChange,

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "الرجاء تحديد الإجراء:", "ConflictResolveSelectAction": "الرجاء تحديد الإجراء:",
"Connect": "ربط", "Connect": "ربط",
"Content": "المحتوى", "Content": "المحتوى",
"Context": "السياق",
"ContinueButton": "متابعة", "ContinueButton": "متابعة",
"ContinueWith": "المتابعة مع", "ContinueWith": "المتابعة مع",
"Copy": "نسخ", "Copy": "نسخ",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Xahiş edirik əməliyyatı seçin:", "ConflictResolveSelectAction": "Xahiş edirik əməliyyatı seçin:",
"Connect": "Qoşulmaq", "Connect": "Qoşulmaq",
"Content": "Kontent", "Content": "Kontent",
"Context": "Kontekst",
"ContinueButton": "Davam edin", "ContinueButton": "Davam edin",
"ContinueWith": "ilə davam edin", "ContinueWith": "ilə davam edin",
"Copy": "Köçür", "Copy": "Köçür",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Моля, изберете действие:", "ConflictResolveSelectAction": "Моля, изберете действие:",
"Connect": "Свържи", "Connect": "Свържи",
"Content": "Съдържание", "Content": "Съдържание",
"Context": "Контекст",
"ContinueButton": "Продължи", "ContinueButton": "Продължи",
"ContinueWith": "Продължи с", "ContinueWith": "Продължи с",
"Copy": "Копирай", "Copy": "Копирай",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Prosím, vyberte akci:", "ConflictResolveSelectAction": "Prosím, vyberte akci:",
"Connect": "Připojit", "Connect": "Připojit",
"Content": "Obsah", "Content": "Obsah",
"Context": "Kontext",
"ContinueButton": "Pokračovat", "ContinueButton": "Pokračovat",
"ContinueWith": "Pokračovat s", "ContinueWith": "Pokračovat s",
"Copy": "Zkopírovat", "Copy": "Zkopírovat",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Bitte wählen Sie die Aktion aus:", "ConflictResolveSelectAction": "Bitte wählen Sie die Aktion aus:",
"Connect": "Verbinden", "Connect": "Verbinden",
"Content": "Inhalt", "Content": "Inhalt",
"Context": "Kontext",
"ContinueButton": "Weiter", "ContinueButton": "Weiter",
"ContinueWith": "Weiter mit", "ContinueWith": "Weiter mit",
"Copy": "Kopieren", "Copy": "Kopieren",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Επιλέξτε την ενέργεια", "ConflictResolveSelectAction": "Επιλέξτε την ενέργεια",
"Connect": "Σύνδεση", "Connect": "Σύνδεση",
"Content": "Περιεχόμενο", "Content": "Περιεχόμενο",
"Context": "Συμφραζόμενα",
"ContinueButton": "Συνέχιση", "ContinueButton": "Συνέχιση",
"ContinueWith": "Συνέχιση με", "ContinueWith": "Συνέχιση με",
"Copy": "Αντιγραφή", "Copy": "Αντιγραφή",

View File

@ -61,7 +61,6 @@
"ConflictResolveSelectAction": "Please select the action:", "ConflictResolveSelectAction": "Please select the action:",
"Connect": "Connect", "Connect": "Connect",
"Content": "Content", "Content": "Content",
"Context": "Context",
"ContinueButton": "Continue", "ContinueButton": "Continue",
"ContinueWith": "Continue with", "ContinueWith": "Continue with",
"Copy": "Copy", "Copy": "Copy",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Por favor, seleccione la acción:", "ConflictResolveSelectAction": "Por favor, seleccione la acción:",
"Connect": "Conectar", "Connect": "Conectar",
"Content": "Contenido", "Content": "Contenido",
"Context": "Contexto",
"ContinueButton": "Continuar", "ContinueButton": "Continuar",
"ContinueWith": "Continuar con", "ContinueWith": "Continuar con",
"Copy": "Copiar", "Copy": "Copiar",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Valitse toiminto:", "ConflictResolveSelectAction": "Valitse toiminto:",
"Connect": "Yhdistä", "Connect": "Yhdistä",
"Content": "Sisältö", "Content": "Sisältö",
"Context": "Konteksti",
"ContinueButton": "Jatka", "ContinueButton": "Jatka",
"ContinueWith": "Jatka", "ContinueWith": "Jatka",
"Copy": "Kopio", "Copy": "Kopio",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Veuillez sélectionner une action :", "ConflictResolveSelectAction": "Veuillez sélectionner une action :",
"Connect": "Connexion", "Connect": "Connexion",
"Content": "Contenu", "Content": "Contenu",
"Context": "Contexte",
"ContinueButton": "Continuer", "ContinueButton": "Continuer",
"ContinueWith": "Continuer avec", "ContinueWith": "Continuer avec",
"Copy": "Copier", "Copy": "Copier",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Խնդրում ենք ընտրել գործողությունը:", "ConflictResolveSelectAction": "Խնդրում ենք ընտրել գործողությունը:",
"Connect": "Կապակցվել", "Connect": "Կապակցվել",
"Content": "Բովանդակություն", "Content": "Բովանդակություն",
"Context": "Համատեքստ",
"ContinueButton": "Շարունակել", "ContinueButton": "Շարունակել",
"ContinueWith": "Շարունակել", "ContinueWith": "Շարունակել",
"Copy": "Պատճենել", "Copy": "Պատճենել",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Ti preghiamo di selezionare l'azione:", "ConflictResolveSelectAction": "Ti preghiamo di selezionare l'azione:",
"Connect": "Collega", "Connect": "Collega",
"Content": "Contenuto", "Content": "Contenuto",
"Context": "Contesto",
"ContinueButton": "Continua", "ContinueButton": "Continua",
"ContinueWith": "Continua con", "ContinueWith": "Continua con",
"Copy": "Copiare", "Copy": "Copiare",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "アクションをお選びください:", "ConflictResolveSelectAction": "アクションをお選びください:",
"Connect": "接続", "Connect": "接続",
"Content": "コンテンツ", "Content": "コンテンツ",
"Context": "コンテキスト",
"ContinueButton": "続ける", "ContinueButton": "続ける",
"ContinueWith": "次の設定で進む", "ContinueWith": "次の設定で進む",
"Copy": "コピー", "Copy": "コピー",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "작업 선택:", "ConflictResolveSelectAction": "작업 선택:",
"Connect": "연결", "Connect": "연결",
"Content": "콘텐츠", "Content": "콘텐츠",
"Context": "문맥",
"ContinueButton": "계속", "ContinueButton": "계속",
"ContinueWith": "또는 다음을 이용:", "ContinueWith": "또는 다음을 이용:",
"Copy": "복사", "Copy": "복사",

View File

@ -55,7 +55,6 @@
"ConflictResolveSelectAction": "ກະລຸນາເລືອກການດຳເນີນການ", "ConflictResolveSelectAction": "ກະລຸນາເລືອກການດຳເນີນການ",
"Connect": "ຕິດຕໍ່", "Connect": "ຕິດຕໍ່",
"Content": "ເນື້ອຫາ", "Content": "ເນື້ອຫາ",
"Context": "ສະພາບການ",
"ContinueButton": "ສືບຕໍ່", "ContinueButton": "ສືບຕໍ່",
"ContinueWith": "ສືບຕໍ່ດ້ວຍ", "ContinueWith": "ສືບຕໍ່ດ້ວຍ",
"Copy": "ສໍາເນົາ", "Copy": "ສໍາເນົາ",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Lūdzu, atlasiet darbību:", "ConflictResolveSelectAction": "Lūdzu, atlasiet darbību:",
"Connect": "Savienot", "Connect": "Savienot",
"Content": "Saturs", "Content": "Saturs",
"Context": "Konteksts",
"ContinueButton": "Turpināt", "ContinueButton": "Turpināt",
"ContinueWith": "Turpināt ar", "ContinueWith": "Turpināt ar",
"Copy": "Kopēt", "Copy": "Kopēt",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Kies de actie:", "ConflictResolveSelectAction": "Kies de actie:",
"Connect": "Verbinden", "Connect": "Verbinden",
"Content": "Inhoud", "Content": "Inhoud",
"Context": "Context",
"ContinueButton": "Doorgaan", "ContinueButton": "Doorgaan",
"ContinueWith": "Doorgaan met", "ContinueWith": "Doorgaan met",
"Copy": "Kopieer", "Copy": "Kopieer",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Wybierz działanie:", "ConflictResolveSelectAction": "Wybierz działanie:",
"Connect": "Podłącz", "Connect": "Podłącz",
"Content": "Treść", "Content": "Treść",
"Context": "Kontekst",
"ContinueButton": "Kontynuuj", "ContinueButton": "Kontynuuj",
"ContinueWith": "Kontynuuj z", "ContinueWith": "Kontynuuj z",
"Copy": "Skopiuj", "Copy": "Skopiuj",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Selecione a ação:", "ConflictResolveSelectAction": "Selecione a ação:",
"Connect": "Conectar", "Connect": "Conectar",
"Content": "Conteúdo", "Content": "Conteúdo",
"Context": "Contexto",
"ContinueButton": "Continue", "ContinueButton": "Continue",
"ContinueWith": "Continue com", "ContinueWith": "Continue com",
"Copy": "Copiar", "Copy": "Copiar",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Selecione a ação:", "ConflictResolveSelectAction": "Selecione a ação:",
"Connect": "Ligar", "Connect": "Ligar",
"Content": "Conteúdo", "Content": "Conteúdo",
"Context": "Contexto",
"ContinueButton": "Continuar", "ContinueButton": "Continuar",
"ContinueWith": "Continue com", "ContinueWith": "Continue com",
"Copy": "Copiar", "Copy": "Copiar",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Selectați acțiune:", "ConflictResolveSelectAction": "Selectați acțiune:",
"Connect": "Adaugă cont", "Connect": "Adaugă cont",
"Content": "Conținut", "Content": "Conținut",
"Context": "Context",
"ContinueButton": "Continuare", "ContinueButton": "Continuare",
"ContinueWith": "Continuare cu", "ContinueWith": "Continuare cu",
"Copy": "Copiere", "Copy": "Copiere",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Пожалуйста, выберите действие:", "ConflictResolveSelectAction": "Пожалуйста, выберите действие:",
"Connect": "Подключить", "Connect": "Подключить",
"Content": "Контент", "Content": "Контент",
"Context": "Контекст",
"ContinueButton": "Продолжить", "ContinueButton": "Продолжить",
"ContinueWith": "Продолжить с", "ContinueWith": "Продолжить с",
"Copy": "Копировать", "Copy": "Копировать",

View File

@ -55,7 +55,6 @@
"ConflictResolveSelectAction": "ක්‍රියාමාර්ගය තෝරන්න:", "ConflictResolveSelectAction": "ක්‍රියාමාර්ගය තෝරන්න:",
"Connect": "සබඳින්න", "Connect": "සබඳින්න",
"Content": "අන්තර්ගතය", "Content": "අන්තර්ගතය",
"Context": "සන්දර්භය",
"ContinueButton": "ඉදිරියට", "ContinueButton": "ඉදිරියට",
"ContinueWith": "මෙය සමඟ ඉදිරියට", "ContinueWith": "මෙය සමඟ ඉදිරියට",
"Copy": "පිටපතක්", "Copy": "පිටපතක්",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Vyberte akciu:", "ConflictResolveSelectAction": "Vyberte akciu:",
"Connect": "Pripojiť", "Connect": "Pripojiť",
"Content": "Obsah", "Content": "Obsah",
"Context": "Kontext",
"ContinueButton": "POKRAČOVAŤ", "ContinueButton": "POKRAČOVAŤ",
"ContinueWith": "Pokračovať s", "ContinueWith": "Pokračovať s",
"Copy": "Kopírovať", "Copy": "Kopírovať",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Prosim, izberite akcijo:", "ConflictResolveSelectAction": "Prosim, izberite akcijo:",
"Connect": "Poveži", "Connect": "Poveži",
"Content": "Vsebina", "Content": "Vsebina",
"Context": "Kontekst",
"ContinueButton": "Nadaljuj", "ContinueButton": "Nadaljuj",
"ContinueWith": "Nadaljuj z", "ContinueWith": "Nadaljuj z",
"Copy": "Kopiraj", "Copy": "Kopiraj",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Изаберите радњу:", "ConflictResolveSelectAction": "Изаберите радњу:",
"Connect": "Повежи", "Connect": "Повежи",
"Content": "Садржај", "Content": "Садржај",
"Context": "Контекст",
"ContinueButton": "Настави", "ContinueButton": "Настави",
"ContinueWith": "Настави са", "ContinueWith": "Настави са",
"Copy": "Копирај", "Copy": "Копирај",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Molim vas odaberite akciju:", "ConflictResolveSelectAction": "Molim vas odaberite akciju:",
"Connect": "Poveži", "Connect": "Poveži",
"Content": "Sadržaj", "Content": "Sadržaj",
"Context": "Kontekst",
"ContinueButton": "Nastavi", "ContinueButton": "Nastavi",
"ContinueWith": "Nastavi sa", "ContinueWith": "Nastavi sa",
"Copy": "Kopiraj", "Copy": "Kopiraj",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Lütfen işlemi seçin:", "ConflictResolveSelectAction": "Lütfen işlemi seçin:",
"Connect": "Bağlan", "Connect": "Bağlan",
"Content": "İçerik", "Content": "İçerik",
"Context": "Bağlam",
"ContinueButton": "Devam et", "ContinueButton": "Devam et",
"ContinueWith": "ile devam et", "ContinueWith": "ile devam et",
"Copy": "Kopyala", "Copy": "Kopyala",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Оберіть дію:", "ConflictResolveSelectAction": "Оберіть дію:",
"Connect": "Підключити", "Connect": "Підключити",
"Content": "Зміст", "Content": "Зміст",
"Context": "Контекст",
"ContinueButton": "Продовжити", "ContinueButton": "Продовжити",
"ContinueWith": "Продовжити з", "ContinueWith": "Продовжити з",
"Copy": "Копіювати", "Copy": "Копіювати",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "Vui lòng chọn hành động:", "ConflictResolveSelectAction": "Vui lòng chọn hành động:",
"Connect": "Kết nối", "Connect": "Kết nối",
"Content": "Nội dung", "Content": "Nội dung",
"Context": "Bối cảnh",
"ContinueButton": "Tiếp tục", "ContinueButton": "Tiếp tục",
"ContinueWith": "Tiếp tục với", "ContinueWith": "Tiếp tục với",
"Copy": "Sao chép", "Copy": "Sao chép",

View File

@ -60,7 +60,6 @@
"ConflictResolveSelectAction": "请选择操作:", "ConflictResolveSelectAction": "请选择操作:",
"Connect": "连接", "Connect": "连接",
"Content": "内容", "Content": "内容",
"Context": "上下文",
"ContinueButton": "继续", "ContinueButton": "继续",
"ContinueWith": "继续使用", "ContinueWith": "继续使用",
"Copy": "复制", "Copy": "复制",