Fix merge conflicts i18n (#4624)

* Translated using Weblate (Turkish)

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/tr/

Translated using Weblate (Turkish)

Currently translated at 99.3% (627 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/tr/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/es/

* Translated using Weblate (Romanian)

Currently translated at 98.7% (623 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ro/

Translated using Weblate (Polish)

Currently translated at 98.4% (621 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/pl/

Translated using Weblate (Korean)

Currently translated at 98.4% (621 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ko/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.0% (625 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/pt_BR/

Translated using Weblate (Ukrainian)

Currently translated at 98.4% (621 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/uk/

Translated using Weblate (Italian)

Currently translated at 99.3% (627 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/it/

Translated using Weblate (Dutch)

Currently translated at 99.3% (627 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/nl/

Translated using Weblate (Japanese)

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ja/

Translated using Weblate (German)

Currently translated at 98.7% (623 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/de/

Translated using Weblate (French)

Currently translated at 98.4% (621 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/fr/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ja/

* Translated using Weblate (Russian)

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ru/

Translated using Weblate (Russian)

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ru/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/zh_Hans/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/nl/

* Translated using Weblate (Italian)

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/it/

* Translated using Weblate (Romanian)

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ro/

* Translated using Weblate (Korean)

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ko/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/pt_BR/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (631 of 631 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/zh_Hans/

Co-authored-by: Kaya Zeren <kayazeren@gmail.com>
Co-authored-by: Elias  Nahum <elias@mattermost.com>
Co-authored-by: Mattermost Weblate Notify Bot <dev-ops@mattermost.com>
Co-authored-by: kaakaa <stooner.hoe@gmail.com>
Co-authored-by: Alexey Napalkov <flynbit@gmail.com>
Co-authored-by: aeomin <lin@aeomin.net>
Co-authored-by: Tom De Moor <tom@controlaltdieliet.be>
Co-authored-by: mlongo <m.longo@metalsistem.com>
Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net>
Co-authored-by: Changho Park <pch4463@gmail.com>
Co-authored-by: rodrigocorsi <rodrigocorsi@gmail.com>
This commit is contained in:
Elisabeth Kulzer 2020-07-30 17:30:20 +02:00 committed by GitHub
parent d6a02a7c29
commit c2cfbb77c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 7 deletions

View file

@ -625,5 +625,9 @@
"mobile.unsupported_server.message": "Allegati, anteprima collegamenti, reazione e dati integrati potrebbero non essere visualizzati correttamente. Se il problema persiste contatta il tuo amministratore di sistema per aggiornare il server Mattermost.",
"mobile.more_messages_button.text": "{count} {isInitialMessage, select, true {new} other {more new}} {count, plural, one {message} other {messages}}",
"mobile.android.back_handler_exit": "Premi di nuovo indietro per uscire",
"mobile.post_textbox.groups.title": "Conferma invio notifica di gruppo"
"mobile.post_textbox.groups.title": "Conferma invio notifica di gruppo",
"mobile.post_textbox.one_group.message.without_timezones": "Utilizzando {mentions} e {finalMention} inviarea una notifica ad almento {totalMembers} persone. Sicuro di voler continuare?",
"mobile.post_textbox.one_group.message.with_timezones": "Usando {mentions} e {finalMention} invierai una notifica ad almeno {totalMembers} persone in {timezones, number}{timezones,plural,one {timezone} other {timezones}}. Sicuro di voler procedere?",
"mobile.post_textbox.multi_group.message.without_timezones": "Utilizzando {mentions} e {finalMention} inviarea una notifica ad almento {totalMembers} persone. Sicuro di voler continuare?",
"mobile.post_textbox.multi_group.message.with_timezones": "Usando {mentions} e {finalMention} invierai una notifica ad almeno {totalMembers} persone in {timezones, number}{timezones,plural,one {timezone} other {timezones}}. Sicuro di voler procedere?"
}

View file

@ -619,5 +619,15 @@
"mobile.server_upgrade.learn_more": "Learn More",
"mobile.server_upgrade.dismiss": "Dismiss",
"mobile.post_textbox.groups.title": "Confirm sending notifications to groups",
"mobile.unsupported_server.ok": "확인"
"mobile.unsupported_server.ok": "확인",
"mobile.message_length.message_split_left": "메시지가 문자 제한을 초과합니다",
"mobile.android.back_handler_exit": "종료하려면 뒤로 가기를 다시 눌러주세요",
"mobile.unsupported_server.title": "지원되지 않는 서버 버전",
"mobile.unsupported_server.message": "첨부 파일, 링크 미리보기, 반응 및 포함 데이터가 올바르게 표시되지 않을 수 있습니다. 이 문제가 지속되면 Mattermost 서버를 업그레이드하기 위해 시스템 관리자에게 문의하십시오.",
"mobile.server_upgrade.alert_description": "이 서버 버전은 지원되지 않으며, 사용자는 충돌이나 앱의 핵심 기능을 손상시키는 심각한 버그를 일으키는 호환성 문제에 노출이 될 수 있습니다. {serverVersion}이 상의 버전으로 업그레이드해야 합니다.",
"mobile.post_textbox.one_group.message.with_timezones": "{mention}을(를) 사용해서 {totalMembers}명의 {timezones, number} {timezones, plural, one {timezone} other {timezones}} 사람들에게 당신은 알림을 보내려고 합니다. 이 작업을 수행하시겠습니까?",
"mobile.post_textbox.one_group.message.without_timezones": "{mention}을(를) 사용해서 {totalMembers}명의 사람들에게 당신은 알림을 보내려고 합니다. 이 작업을 수행하시겠습니까?",
"mobile.post_textbox.multi_group.message.with_timezones": "{mentions}와 {finalMention}을(를) 사용해서 최소 {totalMembers}명의 {timezones, number} {timezones, plural, one {timezone} other {timezones}} 사람들에게 당신은 알림을 보내려고 합니다. 이 작업을 수행하시겠습니까?",
"mobile.post_textbox.multi_group.message.without_timezones": "{mentions}와 {finalMention}을(를) 사용해서 최소 {totalMembers}명의 사람들에게 당신은 알림을 보내려고 합니다. 이 작업을 수행하시겠습니까?",
"mobile.more_messages_button.text": "{count} {isInitialMessage, select, true {new} other {more new}} {count, plural, one {message} other {messages}}"
}

View file

@ -623,5 +623,11 @@
"mobile.android.back_handler_exit": "Pressione voltar novamente para sair",
"mobile.more_messages_button.text": "{count} {isInitialMessage, select, true {nova} other {novas}} {count, plural, one {mensagem} other {mensagens}}",
"mobile.post_textbox.groups.title": "Confirmar envio de notificações para grupos",
"mobile.unsupported_server.ok": "OK"
"mobile.unsupported_server.ok": "OK",
"mobile.unsupported_server.title": "Versão do servidor não suportada",
"mobile.unsupported_server.message": "Anexos, visualizações de links, reações e dados incorporados podem não ser exibidos corretamente. Se esse problema persistir, entre em contato com o administrador do sistema para atualizar o servidor Mattermost.",
"mobile.post_textbox.one_group.message.without_timezones": "Ao usar {mention}, você está prestes a enviar notificações para {totalMembers} pessoas. Você tem certeza de que quer fazer isso?",
"mobile.post_textbox.one_group.message.with_timezones": "Ao usar {mention}, você está prestes a enviar notificações para {totalMembers} pessoas em {timezones, number} {timezones, plural, one {fuso horário} other {fusos horários}}. Você tem certeza de que quer fazer isso?",
"mobile.post_textbox.multi_group.message.without_timezones": "Ao usar {mentions} e {finalMention}, você está prestes a enviar notificações para pelo menos {totalMembers} pessoas. Você tem certeza de que quer fazer isso?",
"mobile.post_textbox.multi_group.message.with_timezones": "Ao usar {mentions} e {finalMention}, você está prestes a enviar notificações para pelo menos {totalMembers} pessoas em {timezones, number} {timezones, plural, one {fuso horário} other {fusos horários}}. Você tem certeza de que quer fazer isso?"
}

View file

@ -621,5 +621,13 @@
"mobile.server_upgrade.dismiss": "Elimină",
"suggestion.mention.groups": "Mențiuni de grup",
"mobile.post_textbox.groups.title": "Confirmați trimiterea notificărilor către grupuri",
"mobile.unsupported_server.ok": "OK"
"mobile.unsupported_server.ok": "OK",
"mobile.unsupported_server.title": "Versiunea serverului neacceptat",
"mobile.unsupported_server.message": "Fișierele atașate, previzualizările linkurilor, reacțiile și datele încorporate nu pot fi afișate corect. Dacă această problemă persistă, contactați administratorul de sistem pentru a actualiza serverul dvs. Mattermost.",
"mobile.post_textbox.one_group.message.without_timezones": "Folosind {mentionare} sunteți pe punctul de a trimite notificări către {totalMembers} persoane. Ești sigur că vrei să faci asta?",
"mobile.post_textbox.one_group.message.with_timezones": "Folosind {mentionare} sunteți pe punctul de a trimite notificări către {totalMembers} persoane din {timezones, number} {timezones, plural, una {timezone} alte {timezones}}. Ești sigur că vrei să faci asta?",
"mobile.post_textbox.multi_group.message.without_timezones": "Folosind {mentions} și {finalMention} sunteți pe punctul de a trimite notificări la cel puțin {totalMembers} persoane. Ești sigur că vrei să faci asta?",
"mobile.post_textbox.multi_group.message.with_timezones": "Folosind {mentions} și {finalMention} sunteți pe punctul de a trimite notificări la cel puțin {totalMembers} persoane din {timezones, number} {timezones, plural, una {timezone} alte {timezones}}. Ești sigur că vrei să faci asta?",
"mobile.more_messages_button.text": "{count} {isInitialMessage, select, true {nou} other {mai multe noi}} {count, plural, one {mesaj} other {mesaje}}",
"mobile.android.back_handler_exit": "Apăsați inapoi din nou pentru a ieși"
}

View file

@ -429,7 +429,7 @@
"more_channels.title": "Выберите канал",
"msg_typing.areTyping": "{users} и {last} печатают...",
"msg_typing.isTyping": "{user} печатает...",
"navbar.leave": "Покинуть Канал",
"navbar.leave": "Покинуть канал",
"password_form.title": "Сброс пароля",
"password_send.checkInbox": "Проверьте свои входящие.",
"password_send.description": "Для сброса пароля введите email адрес, использованный при регистрации",

View file

@ -623,7 +623,7 @@
"mobile.android.back_handler_exit": ıkmak için yeniden geri üzerine tıklayın",
"mobile.more_messages_button.text": "{count} {isInitialMessage, select, true {yeni} other {daha yeni}} {count, plural, one {ileti} other {ileti}}",
"mobile.unsupported_server.title": "Sunucu sürümü desteklenmiyor",
"mobile.unsupported_server.message": "Ek dosyalar, bağlantı ön izlemeleri, tepkiler ve gömülü veriler doğru görüntülenmeyebilir. Bu sorun sürerse BT yöneticinizden Mattermost sürümünü yükseltmesi gerektiğini bildirin.",
"mobile.unsupported_server.message": "Ek dosyalar, bağlantı ön izlemeleri, tepkiler ve gömülü veriler doğru görüntülenmeyebilir. Bu sorun sürerse BT yöneticinize Mattermost sürümünü yükseltmesi gerektiğini bildirin.",
"mobile.unsupported_server.ok": "Tamam",
"mobile.post_textbox.groups.title": "Gruplara bildirim gönderilmesini onaylayın",
"mobile.post_textbox.one_group.message.without_timezones": "{mention} kullanarak {totalMembers} kişiye bildirim göndereceksiniz. Bunu yapmak istediğinize emin misiniz?",

View file

@ -508,7 +508,7 @@
"user.settings.general.username": "用户名",
"user.settings.modal.display": "显示",
"user.settings.modal.notifications": "通知",
"user.settings.notifications.allActivity": "所有操作",
"user.settings.notifications.allActivity": "所有活动",
"user.settings.notifications.comments": "回复通知",
"user.settings.notifications.email.disabled": "邮件通知未开启",
"user.settings.notifications.email.everyHour": "每小时",