Unverified Commit 6644a479 authored by Elisabeth Kulzer's avatar Elisabeth Kulzer Committed by GitHub
Browse files

Merge conflicts with weblate (#5985)

Automatic Merge
parent a3b5258d
......@@ -3975,8 +3975,8 @@
"channel_header.userHelpGuide": "Ayuda",
"admin.support.enableAskCommunityTitle": "Habilitar enlace Preguntar a la comunidad:",
"admin.support.enableAskCommunityDesc": "Cuando es verdadero, el enlace \"Preguntar a la comunidad\" aparece en la interfaz de usuario de Mattermost y en el Menú principal, que permite a los usuarios unirse a la Comunidad de Mattermost para hacer preguntas y ayudar a otros a solucionar problemas. Cuando es falso, el enlace está oculto para los usuarios.",
"admin.channel_list.group_sync": "",
"admin.channel_list.archived": "",
"admin.channel_list.public": "",
"admin.channel_list.private": ""
"admin.channel_list.group_sync": "Sincronización de Grupo",
"admin.channel_list.archived": "Archivado",
"admin.channel_list.public": "Público",
"admin.channel_list.private": "Privado"
}
......@@ -3913,8 +3913,8 @@
"admin.group_settings.group_detail.invalid_length": "Le nom doit être compris entre 1 et 64 caractères alphanumériques en minuscules.",
"generic_modal.confirm": "Confirmer",
"generic_modal.cancel": "Annuler",
"admin.channel_list.public": "",
"admin.channel_list.private": "",
"admin.channel_list.group_sync": "",
"admin.channel_list.archived": ""
"admin.channel_list.public": "Public",
"admin.channel_list.private": "Privé",
"admin.channel_list.group_sync": "Synchronisation de groupes",
"admin.channel_list.archived": "Archivé"
}
......@@ -3920,10 +3920,10 @@
"admin.experimental.experimentalDataPrefetch.desc": "Se vero, i messaggi non letti nei canali sono precaricati per ridurre il tempo di caricamento del canale. Se falso, i messaggi non sono caricati dal server finché gli utenti non aprono i canali.",
"admin.team_settings.team_list.search_teams_errored": "Qualcosa è andato storto. Riprovare",
"admin.channel_settings.channel_list.search_channels_errored": "Qualcosa è andato storto. Riprovare",
"admin.channel_list.public": "",
"admin.channel_list.private": "",
"admin.channel_list.group_sync": "",
"admin.channel_list.archived": "",
"admin.channel_list.public": "Pubblico",
"admin.channel_list.private": "Privato",
"admin.channel_list.group_sync": "Sincronia gruppo",
"admin.channel_list.archived": "Archiviato",
"admin.image.amazonS3PathPrefixDescription": "Il prefisso selezionato del S3 bucket di AWS.",
"admin.image.amazonS3PathPrefixExample": "Es.: \"subdir1\" o lasciare vuoto.",
"admin.image.amazonS3PathPrefixTitle": "Prefisso percorso Amazon S3:",
......@@ -3966,5 +3966,7 @@
"sidebar_left.sidebar_channel_menu.copyLink": "Copia collegamento",
"sidebar_left.sidebar_channel_menu.dropdownAriaLabel": "Modifica il menù dei canali",
"rename_category_modal.rename": "Rinomina",
"rename_category_modal.renameCategory": "Rinomina la categoria"
"rename_category_modal.renameCategory": "Rinomina la categoria",
"sidebar_left.sidebar_channel_menu.unmuteChannel": "De-Silenzia il canale",
"sidebar_left.sidebar_channel_menu.muteChannel": "Silenzia Canale"
}
......@@ -3974,8 +3974,8 @@
"sidebar_whats_new_modal.confirm": "了解",
"post_pre_header.flagged": "保存済み",
"admin.support.enableAskCommunityDesc": "有効な場合、ユーザーが質問したり、別のユーザーのトラブルシューティングに協力するためのMattermostコミュニティに参加できる \"コミュニティに質問する\" リンクがMattermostのユーザーインターフェースやメインメニューに表示されます。",
"admin.channel_list.public": "",
"admin.channel_list.private": "",
"admin.channel_list.group_sync": "",
"admin.channel_list.archived": ""
"admin.channel_list.public": "公開",
"admin.channel_list.private": "非公開",
"admin.channel_list.group_sync": "グループ同期",
"admin.channel_list.archived": "アーカイブ"
}
......@@ -3915,8 +3915,8 @@
"admin.channel_settings.channel_detail.archive_confirm.title": "채널 저장하고 보관하기",
"generic_modal.confirm": "확인",
"generic_modal.cancel": "취소",
"admin.channel_list.public": "",
"admin.channel_list.private": "",
"admin.channel_list.group_sync": "",
"admin.channel_list.archived": ""
"admin.channel_list.public": "공개",
"admin.channel_list.private": "비공개",
"admin.channel_list.group_sync": "그룹 동기화",
"admin.channel_list.archived": "보관됨"
}
......@@ -3964,8 +3964,8 @@
"admin.image.amazonS3PathPrefixDescription": "Voorvoegsel dat je selecteerde voor je S3 bucket in AWS.",
"generic_modal.confirm": "Bevestigen",
"generic_modal.cancel": "Annuleren",
"admin.channel_list.public": "",
"admin.channel_list.private": "",
"admin.channel_list.public": "Publiek",
"admin.channel_list.private": "Privé",
"admin.channel_list.group_sync": "Groepssynchronisatie",
"admin.channel_list.archived": "Gearchiveerd",
"admin.channel_list.manual_invites": "Manueel uitnodigen"
......
......@@ -3916,8 +3916,8 @@
"admin.group_settings.group_detail.invalid_length": "Nazwa musi być złożona z 1 do 64 małych znaków alfanumerycznych",
"generic_modal.confirm": "Potwierdź",
"generic_modal.cancel": "Anuluj",
"admin.channel_list.public": "",
"admin.channel_list.private": "",
"admin.channel_list.group_sync": "",
"admin.channel_list.archived": ""
"admin.channel_list.public": "Publiczny",
"admin.channel_list.private": "Prywatny",
"admin.channel_list.group_sync": "Synchronizacja grup",
"admin.channel_list.archived": "Zarchiwizowane"
}
......@@ -3963,8 +3963,8 @@
"admin.image.amazonS3PathPrefixDescription": "Prefixo que você selecionou para seu bucket S3 na AWS.",
"generic_modal.confirm": "Confirmar",
"generic_modal.cancel": "Cancelar",
"admin.channel_list.public": "",
"admin.channel_list.private": "",
"admin.channel_list.group_sync": "",
"admin.channel_list.archived": ""
"admin.channel_list.public": "Público",
"admin.channel_list.private": "Privado",
"admin.channel_list.group_sync": "Sincronização de Grupo",
"admin.channel_list.archived": "Arquivado"
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment