Skip to content

Commit

Permalink
Merge branch 'DependencyTrack:master' into feat/customizable-login-page
Browse files Browse the repository at this point in the history
  • Loading branch information
Gepardgame authored Sep 6, 2024
2 parents 4631a46 + 0cd7651 commit 00c599e
Show file tree
Hide file tree
Showing 18 changed files with 408 additions and 52 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginxinc/nginx-unprivileged:1.27.1-alpine@sha256:0065303bfa2a20793f9b5db326e94d68bdc7a69f79822091b8db5b3ec4753491
FROM nginxinc/nginx-unprivileged:1.27.1-alpine@sha256:313aa0507d49c4e76b9f3ba43012688c8bf2af40e1a32024adeabaf06484a89f

# Arguments that can be passed at build time
ARG COMMIT_SHA=unknown
Expand Down
6 changes: 5 additions & 1 deletion src/i18n/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"bom_formats": "BOM-Formate",
"bom_formats_desc": "Aktiviert die Unterstützung für die Verarbeitung von BOMs verschiedener Formate. Nur aktivierte BOM-Formate werden verarbeitet.",
"bom_validation": "BOM-Validierung",
"bom_validation_info": "In der Vergangenheit hat Dependency-Track hochgeladene BOMs und VEXs nicht anhand des CycloneDX-Schemas validiert. \nDies ermöglichte zwar die Verarbeitung von BOMs, die nicht strikt dem Schema entsprachen, es konnte jedoch zu Verwirrungen führen, wenn hochgeladene Dateien akzeptiert wurden, dann aber während der asynchronen Verarbeitung nicht erfasst werden konnten. \nSeit dieser Version werden hochgeladene Dateien abgelehnt, wenn sie die Schemavalidierung nicht bestehen. \nBeachten Sie, dass dies möglicherweise Probleme in BOM-Generatoren aufdeckt, die derzeit ungültige CycloneDX-Dokumente erzeugen.",
"bom_validation_mode": "Validierungsmodus",
"cargo": "Cargo",
"change_password": "Passwort ändern",
"change_password_next_login": "Der Benutzer muss bei der nächsten Anmeldung sein Passwort ändern",
Expand Down Expand Up @@ -77,6 +77,8 @@
"delete_template": "Vorlage löschen",
"delete_user": "Benutzer löschen",
"destination": "Ziel",
"disabled": "Deaktiviert",
"disabled_for_tags": "Deaktiviert für Tags",
"distinguished_name": "Distinguished Name",
"edit_api_key_comment": "Kommentar zum API-Schlüssel bearbeiten",
"email": "E-Mail",
Expand All @@ -96,6 +98,7 @@
"enable_index_consistency_check": "Regelmäßige Konsistenzprüfungen aktivieren",
"enable_svg_badge": "SVG-Badge-Unterstützung aktivieren (nicht authentifiziert)",
"enabled": "Aktiviert",
"enabled_for_tags": "Aktiviert für Tags",
"experimental": "Experimentell",
"experimental_info": "Die folgenden Optionen sind experimentelle Optionen und sollten mit Vorsicht verwendet werden.",
"fortify_ssc": "Fortify SSC",
Expand Down Expand Up @@ -326,6 +329,7 @@
"affected_projects": "Betroffene Projekte",
"age": "Alter",
"age_tooltip": "Alter im ISO-8601-Periodenformat (z. B. P1Y = 1 Jahr; P2Y3M = 2 Jahre, 3 Monate)",
"alerts_tagged_with": "Benachrichtigungen mit dem Tag {tag}",
"aliases": "Aliase",
"analysis": "Analyse",
"analysis_details_tooltip": "Details (Erklärung, Details zur Problemumgehung und andere Informationen zu den Auswirkungen)",
Expand Down
8 changes: 6 additions & 2 deletions src/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"bom_formats": "BOM Formats",
"bom_formats_desc": "Enables support for processing BOMs of various formats. Only BOM formats which are enabled will be processed.",
"bom_validation": "BOM Validation",
"bom_validation_info": "Historically, Dependency-Track did not validate uploaded BOMs and VEXs against the CycloneDX schema. While this allowed BOMs to be processed that did not strictly adhere to the schema, it could lead to confusion when uploaded files were accepted, but then failed to be ingested during asynchronous processing. Starting with this release, uploaded files will be rejected if they fail schema validation. Note that this may reveal issues in BOM generators that currently produce invalid CycloneDX documents",
"bom_validation_mode": "Validation Mode",
"cargo": "Cargo",
"change_password": "Change Password",
"change_password_next_login": "User must change password at next login",
Expand Down Expand Up @@ -77,6 +77,8 @@
"delete_template": "Delete Template",
"delete_user": "Delete User",
"destination": "Destination",
"disabled": "Disabled",
"disabled_for_tags": "Disabled for tags",
"distinguished_name": "Distinguished name",
"edit_api_key_comment": "Edit API Key Comment",
"email": "Email",
Expand All @@ -96,6 +98,7 @@
"enable_index_consistency_check": "Enable periodic consistency check",
"enable_svg_badge": "Enable SVG badge support (unauthenticated)",
"enabled": "Enabled",
"enabled_for_tags": "Enabled for tags",
"experimental": "Experimental",
"experimental_info": "The following options are experimental options and should be used with precaution.",
"fortify_ssc": "Fortify SSC",
Expand Down Expand Up @@ -141,7 +144,7 @@
"ldap_users": "LDAP Users",
"limit_to": "Limit To",
"limit_to_projects": "Limit to projects",
"limit_to_tags": "Limit to Tags",
"limit_to_tags": "Limit to tags",
"managed_users": "Managed Users",
"mapped_ldap_groups": "Mapped LDAP groups",
"mapped_oidc_groups": "Mapped OpenID Connect Groups",
Expand Down Expand Up @@ -326,6 +329,7 @@
"affected_projects": "Affected Projects",
"age": "Age",
"age_tooltip": "Age in ISO-8601 period format (e.g. P1Y = 1 Year; P2Y3M = 2 Years, 3 Months)",
"alerts_tagged_with": "Alerts tagged with {tag}",
"aliases": "Aliases",
"analysis": "Analysis",
"analysis_details_tooltip": "Details (explanation, workaround details, and other impact information)",
Expand Down
6 changes: 5 additions & 1 deletion src/i18n/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"bom_formats": "Formatos de lista de materiales",
"bom_formats_desc": "Habilita la compatibilidad con el procesamiento de listas de materiales de varios formatos. Sólo se procesarán los formatos de lista de materiales que estén habilitados.",
"bom_validation": "Validación de lista de materiales",
"bom_validation_info": "Históricamente, Dependency-Track no validaba las BOM y VEX cargadas con el esquema CycloneDX. \nSi bien esto permitía procesar listas de materiales que no se ajustaban estrictamente al esquema, podía generar confusión cuando se aceptaban los archivos cargados, pero luego no se podían ingerir durante el procesamiento asincrónico. \nA partir de esta versión, los archivos cargados se rechazarán si no superan la validación del esquema. \nTenga en cuenta que esto puede revelar problemas en los generadores de listas de materiales que actualmente producen documentos CycloneDX no válidos.",
"bom_validation_mode": "Modo de validación",
"cargo": "Cargo",
"change_password": "Cambiar la contraseña",
"change_password_next_login": "El usuario debe cambiar la contraseña en el próximo inicio de sesión",
Expand Down Expand Up @@ -77,6 +77,8 @@
"delete_template": "Eliminar plantilla",
"delete_user": "Borrar usuario",
"destination": "Destino",
"disabled": "Desactivado",
"disabled_for_tags": "Deshabilitado para etiquetas",
"distinguished_name": "Nombre distinguido",
"edit_api_key_comment": "edit_api_key_comment",
"email": "Correo electrónico",
Expand All @@ -96,6 +98,7 @@
"enable_index_consistency_check": "Habilitar la verificación periódica de coherencia",
"enable_svg_badge": "Habilitar la compatibilidad con insignias SVG (sin autenticar)",
"enabled": "Activado",
"enabled_for_tags": "Habilitado para etiquetas",
"experimental": "Experimental",
"experimental_info": "Las siguientes opciones son opciones experimentales y deben usarse con precaución.",
"fortify_ssc": "Fortificar CSS",
Expand Down Expand Up @@ -326,6 +329,7 @@
"affected_projects": "Proyectos afectados",
"age": "Edad",
"age_tooltip": "Edad en formato de período ISO-8601 (por ejemplo, P1Y = 1 año; P2Y3M = 2 años, 3 meses)",
"alerts_tagged_with": "Alertas etiquetadas con {tag}",
"aliases": "Alias",
"analysis": "Análisis",
"analysis_details_tooltip": "Detalles (explicación, detalles de la solución alternativa y otra información sobre el impacto)",
Expand Down
6 changes: 5 additions & 1 deletion src/i18n/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"bom_formats": "Formats de nomenclature (BOM)",
"bom_formats_desc": "Permet la prise en charge du traitement des nomenclatures (BOM) de différents formats. Seuls les formats de nomenclature activés seront traités.",
"bom_validation": "Validation de la nomenclature (BOM)",
"bom_validation_info": "Historiquement, Dependency-Track ne validait pas les nomenclatures (BOM) et les VEX téléversés par rapport au schéma CycloneDX. \nMême si cela permettait de traiter des nomenclatures qui ne respectaient pas strictement le schéma, cela pouvait prêter à confusion lorsque les fichiers téléversés étaient acceptés, mais ne parvenaient pas à être ingérés lors du traitement asynchrone. \nÀ partir de cette version, les fichiers téléversés seront rejetés s'ils échouent à la validation du schéma. \nNotez que cela peut révéler des problèmes dans les générateurs de nomenclature qui produisent actuellement des documents CycloneDX non valides.",
"bom_validation_mode": "Mode de validation",
"cargo": "Cargo",
"change_password": "Changer le mot de passe",
"change_password_next_login": "L'utilisateur doit changer son mot de passe lors de sa prochaine connexion",
Expand Down Expand Up @@ -77,6 +77,8 @@
"delete_template": "Supprimer le modèle",
"delete_user": "Supprimer l'utilisateur",
"destination": "Destination",
"disabled": "Désactivé",
"disabled_for_tags": "Désactivé pour les balises",
"distinguished_name": "Nom distinctif (DN)",
"edit_api_key_comment": "Éditer le commentaire de clé d'API",
"email": "Courriel",
Expand All @@ -96,6 +98,7 @@
"enable_index_consistency_check": "Activer le contrôle de cohérence périodique",
"enable_svg_badge": "Activer la prise en charge des badges SVG (non authentifiés)",
"enabled": "Activé",
"enabled_for_tags": "Activé pour les balises",
"experimental": "Expérimental",
"experimental_info": "Les options suivantes sont des options expérimentales et doivent être utilisées avec précaution.",
"fortify_ssc": "Fortify SSC",
Expand Down Expand Up @@ -326,6 +329,7 @@
"affected_projects": "Projets concernés",
"age": "Âge",
"age_tooltip": "Âge au format de période ISO-8601 (par exemple, P1Y = 1 an ; P2Y3M = 2 ans, 3 mois)",
"alerts_tagged_with": "Alertes marquées avec {tag}",
"aliases": "Alias",
"analysis": "Analyse",
"analysis_details_tooltip": "Détails (explication, détails de la solution de contournement et autres informations sur l'impact)",
Expand Down
6 changes: 5 additions & 1 deletion src/i18n/locales/hi.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"bom_formats": "बीओएम प्रारूप",
"bom_formats_desc": "विभिन्न प्रारूपों के BOMs के प्रसंस्करण के लिए समर्थन सक्षम करता है। केवल सक्षम BOM प्रारूप ही संसाधित किए जाएँगे।",
"bom_validation": "बीओएम सत्यापन",
"bom_validation_info": "ऐतिहासिक रूप से, डिपेंडेंसी-ट्रैक ने CycloneDX स्कीमा के विरुद्ध अपलोड किए गए BOM और VEX को मान्य नहीं किया। \nहालाँकि इससे उन बीओएम को संसाधित करने की अनुमति मिली जो स्कीमा का कड़ाई से पालन नहीं करते थे, इससे अपलोड की गई फ़ाइलों को स्वीकार किए जाने पर भ्रम पैदा हो सकता था, लेकिन फिर अतुल्यकालिक प्रसंस्करण के दौरान अंतर्ग्रहण में विफल हो सकते थे। \nइस रिलीज़ से प्रारंभ करके, यदि अपलोड की गई फ़ाइलें स्कीमा सत्यापन में विफल रहती हैं तो उन्हें अस्वीकार कर दिया जाएगा। \nध्यान दें कि इससे BOM जेनरेटर में समस्याएँ सामने आ सकती हैं जो वर्तमान में अमान्य CycloneDX दस्तावेज़ उत्पन्न करते हैं",
"bom_validation_mode": "सत्यापन मोड",
"cargo": "माल",
"change_password": "पासवर्ड बदलें",
"change_password_next_login": "उपयोगकर्ता को अगली बार लॉगइन करते समय पासवर्ड बदलना होगा",
Expand Down Expand Up @@ -77,6 +77,8 @@
"delete_template": "टेम्पलेट हटाएं",
"delete_user": "उपभोक्ता मिटायें",
"destination": "गंतव्य",
"disabled": "अक्षम",
"disabled_for_tags": "टैग के लिए अक्षम",
"distinguished_name": "विशिष्ट नाम",
"edit_api_key_comment": "edit_api_key_comment",
"email": "ईमेल",
Expand All @@ -96,6 +98,7 @@
"enable_index_consistency_check": "आवधिक संगतता जांच सक्षम करें",
"enable_svg_badge": "SVG बैज समर्थन सक्षम करें (अप्रमाणित)",
"enabled": "सक्रिय",
"enabled_for_tags": "टैग के लिए सक्षम",
"experimental": "प्रयोगात्मक",
"experimental_info": "निम्नलिखित विकल्प प्रायोगिक विकल्प हैं और इनका उपयोग सावधानी के साथ किया जाना चाहिए।",
"fortify_ssc": "फोर्टिफाई एसएससी",
Expand Down Expand Up @@ -326,6 +329,7 @@
"affected_projects": "प्रभावित परियोजनाएँ",
"age": "आयु",
"age_tooltip": "ISO-8601 अवधि प्रारूप में आयु (उदाहरणार्थ P1Y = 1 वर्ष; P2Y3M = 2 वर्ष, 3 माह)",
"alerts_tagged_with": "अलर्ट {टैग} के साथ टैग किए गए",
"aliases": "उपनाम",
"analysis": "विश्लेषण",
"analysis_details_tooltip": "विवरण (स्पष्टीकरण, समाधान विवरण, और अन्य प्रभाव जानकारी)",
Expand Down
6 changes: 5 additions & 1 deletion src/i18n/locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"bom_formats": "Formati distinta base",
"bom_formats_desc": "Abilita il supporto per l'elaborazione di distinte base di vari formati. Verranno elaborati solo i formati BOM abilitati.",
"bom_validation": "Convalida della distinta base",
"bom_validation_info": "Storicamente, Dependency-Track non convalidava le distinte materiali e i VEX caricati rispetto allo schema CycloneDX. \nSebbene ciò consentisse l'elaborazione di distinte base che non aderivano strettamente allo schema, poteva creare confusione quando i file caricati venivano accettati, ma non potevano essere inseriti durante l'elaborazione asincrona. \nA partire da questa versione, i file caricati verranno rifiutati se non superano la convalida dello schema. \nTieni presente che ciò potrebbe rivelare problemi nei generatori di distinte base che attualmente producono documenti CycloneDX non validi",
"bom_validation_mode": "Modalità di convalida",
"cargo": "Carico",
"change_password": "Cambiare la password",
"change_password_next_login": "L'utente deve modificare la password al prossimo accesso",
Expand Down Expand Up @@ -77,6 +77,8 @@
"delete_template": "Elimina modello",
"delete_user": "Elimina utente",
"destination": "Destinazione",
"disabled": "Disabilitato",
"disabled_for_tags": "Disabilitato per i tag",
"distinguished_name": "Nome distinto",
"edit_api_key_comment": "edit_api_key_comment",
"email": "E-mail",
Expand All @@ -96,6 +98,7 @@
"enable_index_consistency_check": "Abilita il controllo periodico della coerenza",
"enable_svg_badge": "Abilita il supporto del badge SVG (non autenticato)",
"enabled": "Abilitato",
"enabled_for_tags": "Abilitato per i tag",
"experimental": "Sperimentale",
"experimental_info": "Le seguenti opzioni sono opzioni sperimentali e devono essere utilizzate con precauzione.",
"fortify_ssc": "Fortifica la SSC",
Expand Down Expand Up @@ -326,6 +329,7 @@
"affected_projects": "Progetti interessati",
"age": "Età",
"age_tooltip": "Età nel formato periodo ISO-8601 (ad esempio P1Y = 1 anno; P2Y3M = 2 anni, 3 mesi)",
"alerts_tagged_with": "Avvisi contrassegnati con {tag}",
"aliases": "Alias",
"analysis": "Analisi",
"analysis_details_tooltip": "Dettagli (spiegazione, dettagli della soluzione alternativa e altre informazioni sull'impatto)",
Expand Down
6 changes: 5 additions & 1 deletion src/i18n/locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"bom_formats": "BOM 形式",
"bom_formats_desc": "さまざまな形式の BOM の処理をサポートします。有効になっている BOM 形式のみが処理されます。",
"bom_validation": "BOM の検証",
"bom_validation_info": "従来、Dependency-Track はアップロードされた BOM と VEX に対して CycloneDX スキーマの検証をしていませんでした。\nこれにより、スキーマに厳密に準拠していない BOM を処理できるようになっていましたが、アップロードされたファイルは受け入れられたものの、非同期処理中に取り込みに失敗した場合に混乱が生じる可能性がありました。\nこのリリース以降、アップロードされたファイルはスキーマ検証に失敗すると拒否されます。\nこれにより、現在無効な CycloneDX ドキュメントを生成している BOM ジェネレーターの問題が明らかになる可能性があることに注意してください。",
"bom_validation_mode": "検証モード",
"cargo": "Cargo",
"change_password": "パスワードを変更する",
"change_password_next_login": "次回ログイン時にパスワード変更を要求",
Expand Down Expand Up @@ -77,6 +77,8 @@
"delete_template": "テンプレートを削除",
"delete_user": "ユーザーを削除",
"destination": "宛先",
"disabled": "無効",
"disabled_for_tags": "タグが無効になっています",
"distinguished_name": "識別名",
"edit_api_key_comment": "edit_api_key_comment",
"email": "Eメール",
Expand All @@ -96,6 +98,7 @@
"enable_index_consistency_check": "定期的な整合性チェックを有効にする",
"enable_svg_badge": "SVG バッジのサポートを有効にする (認証なし)",
"enabled": "有効",
"enabled_for_tags": "タグに対して有効化",
"experimental": "実験的",
"experimental_info": "次のオプションは実験的なオプションであり、使用には注意が必要です。",
"fortify_ssc": "Fortify SSC",
Expand Down Expand Up @@ -326,6 +329,7 @@
"affected_projects": "影響を受けるプロジェクト",
"age": "",
"age_tooltip": "ISO-8601 期間形式の年齢 (例: P1Y = 1 年、P2Y3M = 2 年 3 か月)",
"alerts_tagged_with": "{tag} でタグ付けされたアラート",
"aliases": "エイリアス",
"analysis": "分析",
"analysis_details_tooltip": "詳細(説明、回避策の詳細、その他の影響情報)",
Expand Down
Loading

0 comments on commit 00c599e

Please sign in to comment.