Skip to content

Commit 5572dd1

Browse files
committed
fix(delete_project): Fixed delete project feature and rebase error
1 parent d90891a commit 5572dd1

File tree

11 files changed

+105
-36
lines changed

11 files changed

+105
-36
lines changed

messages/de.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,12 @@
196196
"Delete All Licenses": "",
197197
"Delete Attachment": "Löschen der Anlage",
198198
"Delete Component": "Löschen der Komponente",
199+
"Delete Project": "Projekt löschen",
199200
"Delete Release": "Löschen",
200201
"Delete Vulnerability": "Löschen der Schwachstelle",
201202
"Delete all License Information": "Alle Lizenzinformationen löschen",
202203
"Delete component success!": "Komponentenerfolg löschen!",
204+
"Delete project successful!": "Projekt löschen erfolgreich!",
203205
"Delete release success!": "Löschen Sie Release-Erfolg!",
204206
"Delivery start": "Lieferbeginn",
205207
"Delivery start date": "Liefertermin",
@@ -212,6 +214,7 @@
212214
"Do not create monitoring list, but use list from external id": "Erstellen Sie keine Überwachungsliste, sondern verwenden Sie die Liste von externen id",
213215
"Do you really want to delete the attachment?": "Möchten Sie wirklich den Anhang löschen?",
214216
"Do you really want to delete the component?": "Möchten Sie wirklich die Komponente löschen <strong>{name}</strong>?",
217+
"Do you really want to delete the project?": "Möchten Sie das Projekt wirklich löschen <strong>{name}</strong>?",
215218
"Do you really want to delete the release?": "Möchten Sie wirklich die Veröffentlichung löschen: <strong>{name}</strong>?",
216219
"Do you really want to delete the vulnerability?": "Möchten Sie wirklich die Schwachstelle löschen <strong>{}</strong>?",
217220
"Document": "Dokument",
@@ -423,6 +426,7 @@
423426
"Mercurial": "Merkur",
424427
"Merge": "Verschmelzung",
425428
"Metadata": "Metadaten",
429+
"Moderation request is created!": "Moderationsanfrage wurde erstellt!",
426430
"Moderators": "Moderatoren",
427431
"Modified By": "Geändert von",
428432
"Modified On": "Geändert auf",
@@ -659,6 +663,7 @@
659663
"Text": "Text",
660664
"The component cannot be deleted, since it contains releases Please delete the releases first": "Die Komponente <strong>{name}</strong> kann nicht gelöscht werden, da es enthält <strong>(ReleaseCount)</strong> Releases. Bitte löschen Sie die Freigaben zuerst.",
661665
"The new Component and new Release will be created, do you want to import?": "Die neue Komponente und neue Version werden erstellt, wollen Sie importieren?",
666+
"The project cannot be deleted, since it is used by another project!": "Das Projekt kann nicht gelöscht werden, da es von einem anderen Projekt verwendet wird!",
662667
"The projects have been successfully linked to project": "Die Projekte sind erfolgreich mit dem Projekt verbunden",
663668
"The release has been successfully linked to project": "Die Veröffentlichung <strong>(ReleaseName)</strong> wurde erfolgreich mit dem Projekt verbunden <strong>(Projektname)</strong>",
664669
"The verification of vulnerabilities will be changed to": "Überprüfung <strong>{number}</strong> Sicherheitslücken werden geändert",

messages/en.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,12 @@
196196
"Delete All Licenses": "Delete All Licenses?",
197197
"Delete Attachment": "Delete Attachment",
198198
"Delete Component": "Delete Component",
199+
"Delete Project": "Delete Project",
199200
"Delete Release": "Delete Release",
200201
"Delete Vulnerability": "Delete Vulnerability",
201202
"Delete all License Information": "Delete all License Information",
202203
"Delete component success!": "Delete component success!",
204+
"Delete project successful!": "Delete project successful!",
203205
"Delete release success!": "Delete release success!",
204206
"Delivery start": "Delivery start",
205207
"Delivery start date": "Delivery start date",
@@ -212,6 +214,7 @@
212214
"Do not create monitoring list, but use list from external id": "Do not create monitoring list, but use list from external id",
213215
"Do you really want to delete the attachment?": "Do you really want to delete the attachment?",
214216
"Do you really want to delete the component?": "Do you really want to delete the component <strong>{name}</strong>?",
217+
"Do you really want to delete the project?": "Do you really want to delete the project <strong>{name}</strong>?",
215218
"Do you really want to delete the release?": "Do you really want to delete the release: <strong>{name}</strong>?",
216219
"Do you really want to delete the vulnerability?": "Do you really want to delete the vulnerability <strong>{id}</strong>?",
217220
"Document": "Document",
@@ -423,6 +426,7 @@
423426
"Mercurial": "Mercurial",
424427
"Merge": "Merge",
425428
"Metadata": "Metadata",
429+
"Moderation request is created!": "Moderation request is created!",
426430
"Moderators": "Moderators",
427431
"Modified By": "Modified By",
428432
"Modified On": "Modified On",
@@ -659,6 +663,7 @@
659663
"Text": "Text",
660664
"The component cannot be deleted, since it contains releases Please delete the releases first": "The component <strong>{name}</strong> cannot be deleted, since it contains <strong>{releaseCount}</strong> releases. Please delete the releases first.",
661665
"The new Component and new Release will be created, do you want to import?": "The new Component and new Release will be created, do you want to import?",
666+
"The project cannot be deleted, since it is used by another project!": "The project cannot be deleted, since it is used by another project!",
662667
"The projects have been successfully linked to project": "The projects have been successfully linked to project",
663668
"The release has been successfully linked to project": "The release <strong>{releaseName}</strong> has been successfully linked to project <strong>{projectName}</strong>",
664669
"The verification of vulnerabilities will be changed to": "The verification of <strong>{number}</strong> vulnerabilities will be changed to",

messages/es.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,12 @@
196196
"Delete All Licenses": "",
197197
"Delete Attachment": "Suprímase el adjunto",
198198
"Delete Component": "Suprimir el componente",
199+
"Delete Project": "Eliminar proyecto",
199200
"Delete Release": "Eliminar la liberación",
200201
"Delete Vulnerability": "Eliminar la vulnerabilidad",
201202
"Delete all License Information": "Eliminar toda la información de licencia",
202203
"Delete component success!": "Eliminar el éxito del componente!",
204+
"Delete project successful!": "¡Eliminar proyecto con éxito!",
203205
"Delete release success!": "Eliminar el éxito de la liberación!",
204206
"Delivery start": "Inicio de entrega",
205207
"Delivery start date": "Fecha de inicio de entrega",
@@ -212,6 +214,7 @@
212214
"Do not create monitoring list, but use list from external id": "No crear lista de monitoreo, pero usar lista de id externo",
213215
"Do you really want to delete the attachment?": "¿De verdad quieres eliminar el apego?",
214216
"Do you really want to delete the component?": "¿De verdad quieres eliminar el componente <strong>{Nombre}</strong>?",
217+
"Do you really want to delete the project?": "¿Realmente quieres eliminar el proyecto <strong>{name}</strong>?",
215218
"Do you really want to delete the release?": "¿De verdad quieres eliminar la liberación: <strong>{Nombre}</strong>?",
216219
"Do you really want to delete the vulnerability?": "¿De verdad quieres eliminar la vulnerabilidad <strong>{id}</strong>?",
217220
"Document": "Documento",
@@ -423,6 +426,7 @@
423426
"Mercurial": "Mercurial",
424427
"Merge": "Merge",
425428
"Metadata": "Metadatos",
429+
"Moderation request is created!": "¡Se crea la solicitud de moderación!",
426430
"Moderators": "Moderadores",
427431
"Modified By": "Modificado por",
428432
"Modified On": "Modificado en",
@@ -510,6 +514,7 @@
510514
"Project Vendor": "Project Vendor",
511515
"Project Version": "Versión del proyecto",
512516
"Project cannot be created/updated": "El proyecto no puede crearse ni actualizarse",
517+
"The project cannot be deleted, since it is used by another project!": "¡El proyecto no se puede eliminar porque está siendo utilizado por otro proyecto!",
513518
"Project state": "Project state",
514519
"Projects": "Proyectos",
515520
"Projects only": "Proyectos",

messages/fr.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,12 @@
196196
"Delete All Licenses": "",
197197
"Delete Attachment": "Supprimer la pièce jointe",
198198
"Delete Component": "Supprimer le composant",
199+
"Delete Project": "Supprimer le projet",
199200
"Delete Release": "Supprimer la publication",
200201
"Delete Vulnerability": "Supprimer la vulnérabilité",
201202
"Delete all License Information": "Supprimer toutes les informations de licence",
202203
"Delete component success!": "Supprimer le succès du composant!",
204+
"Delete project successful!": "Suppression du projet réussie !",
203205
"Delete release success!": "Supprimer le succès de la publication!",
204206
"Delivery start": "Début de la livraison",
205207
"Delivery start date": "Date de début de livraison",
@@ -212,6 +214,7 @@
212214
"Do not create monitoring list, but use list from external id": "Ne créez pas de liste de surveillance, mais utilisez la liste depuis un id externe",
213215
"Do you really want to delete the attachment?": "Voulez-vous vraiment supprimer la pièce jointe ?",
214216
"Do you really want to delete the component?": "Voulez-vous vraiment supprimer le composant <strong>{nom}</strong>?",
217+
"Do you really want to delete the project?": "Voulez-vous vraiment supprimer le projet <strong>{name}</strong>?",
215218
"Do you really want to delete the release?": "Voulez-vous vraiment supprimer la version: <strong>{nom}</strong>?",
216219
"Do you really want to delete the vulnerability?": "Voulez-vous vraiment supprimer la vulnérabilité <strong>{id}</strong>?",
217220
"Document": "Numéro",
@@ -423,6 +426,7 @@
423426
"Mercurial": "Mercurial",
424427
"Merge": "Fusionner",
425428
"Metadata": "Métadonnées",
429+
"Moderation request is created!": "La demande de modération est créée !",
426430
"Moderators": "Animateurs",
427431
"Modified By": "Modifié par",
428432
"Modified On": "Modifié le",
@@ -510,6 +514,7 @@
510514
"Project Vendor": "Fournisseur de projet",
511515
"Project Version": "Version du projet",
512516
"Project cannot be created/updated": "Le projet ne peut pas être créé/mise à jour",
517+
"The project cannot be deleted, since it is used by another project!": "Le projet ne peut pas être supprimé, car il est utilisé par un autre projet !",
513518
"Project state": "État du projet",
514519
"Projects": "Projets",
515520
"Projects only": "Projets seulement",

messages/ja.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,12 @@
196196
"Delete All Licenses": "すべてのライセンスを削除します。",
197197
"Delete Attachment": "添付ファイルの削除",
198198
"Delete Component": "コンポーネント削除",
199+
"Delete Project": "プロジェクトの削除",
199200
"Delete Release": "リリースの削除",
200201
"Delete Vulnerability": "Delete Vulnerability",
201202
"Delete all License Information": "すべてのライセンス情報を削除します。",
202203
"Delete component success!": "コンポーネントの削除が成功しました。",
204+
"Delete project successful!": "プロジェクトの削除が成功しました。",
203205
"Delete release success!": "削除リリース成功!",
204206
"Delivery start": "Delivery start",
205207
"Delivery start date": "配信開始日",
@@ -212,6 +214,7 @@
212214
"Do not create monitoring list, but use list from external id": "監視リストを作成せず、外部IDからのリストを使用します。",
213215
"Do you really want to delete the attachment?": "您确实要删除该附件吗?",
214216
"Do you really want to delete the component?": "本当にコンポーネント <strong>{name}</strong> を削除しますか?",
217+
"Do you really want to delete the project?": "本当にプロジェクトを削除しますか <strong>{name}</strong>?",
215218
"Do you really want to delete the release?": "本当にリリース: <strong>{name}</strong>?",
216219
"Do you really want to delete the vulnerability?": "Do you really want to delete the vulnerability <strong>{id}</strong>?",
217220
"Document": "書類",
@@ -423,6 +426,7 @@
423426
"Mercurial": "マーキュリアル",
424427
"Merge": "マージ",
425428
"Metadata": "Metadata",
429+
"Moderation request is created!": "モデレーションリクエストが作成されました!",
426430
"Moderators": "モデレータ",
427431
"Modified By": "変更方法",
428432
"Modified On": "変更された",
@@ -510,6 +514,7 @@
510514
"Project Vendor": "Project Vendor",
511515
"Project Version": "プロジェクトのバージョン",
512516
"Project cannot be created/updated": "Project cannot be created/updated",
517+
"The project cannot be deleted, since it is used by another project!": "プロジェクトは別のプロジェクトで使用されているため削除できません。",
513518
"Project state": "プロジェクトの状態",
514519
"Projects": "プロジェクト",
515520
"Projects only": "プロジェクトのみ",

messages/ko.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,12 @@
196196
"Delete All Licenses": "",
197197
"Delete Attachment": "첨부파일",
198198
"Delete Component": "제거 구성",
199+
"Delete Project": "프로젝트 삭제",
199200
"Delete Release": "파일 삭제",
200201
"Delete Vulnerability": "취약점 삭제",
201202
"Delete all License Information": "모든 라이센스 정보 삭제",
202203
"Delete component success!": "부품 성공 삭제!",
204+
"Delete project successful!": "프로젝트 삭제가 완료되었습니다.",
203205
"Delete release success!": "릴리스 성공 삭제!",
204206
"Delivery start": "납품 시작",
205207
"Delivery start date": "납품 시작 날짜",
@@ -212,6 +214,7 @@
212214
"Do not create monitoring list, but use list from external id": "모니터링 목록을 만들지 않고 외부 ID에서 목록 사용",
213215
"Do you really want to delete the attachment?": "첨부 파일을 삭제하고 싶습니까?",
214216
"Do you really want to delete the component?": "컴포넌트를 삭제하고 싶습니다. <strong>이름 *</strong>·",
217+
"Do you really want to delete the project?": "정말로 프로젝트를 삭제하시겠습니까 <strong>{name}</strong>?",
215218
"Do you really want to delete the release?": "당신은 정말 출시를 삭제하려면: <strong>이름 *</strong>·",
216219
"Do you really want to delete the vulnerability?": "취약점을 삭제하고 싶습니다. <strong>이름 *</strong>·",
217220
"Document": "회사연혁",
@@ -423,6 +426,7 @@
423426
"Mercurial": "상품정보",
424427
"Merge": "한국어",
425428
"Metadata": "메타데이터",
429+
"Moderation request is created!": "검토 요청이 생성되었습니다!",
426430
"Moderators": "모더레이터",
427431
"Modified By": "수정 사항",
428432
"Modified On": "관련 기사",
@@ -510,6 +514,7 @@
510514
"Project Vendor": "프로젝트 Vendor",
511515
"Project Version": "프로젝트 버전",
512516
"Project cannot be created/updated": "프로젝트는 만들 수 없습니다/업데이트",
517+
"The project cannot be deleted, since it is used by another project!": "해당 프로젝트는 다른 프로젝트에서 사용 중이므로 삭제할 수 없습니다!",
513518
"Project state": "프로젝트 상태",
514519
"Projects": "프로젝트",
515520
"Projects only": "프로젝트",

messages/pt-BR.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,12 @@
196196
"Delete All Licenses": "Excluir todas as licenças?",
197197
"Delete Attachment": "Deletar Anexo",
198198
"Delete Component": "Excluir Componente",
199+
"Delete Project": "Excluir projeto",
199200
"Delete Release": "Excluir Liberação",
200201
"Delete Vulnerability": "Excluir Vulnerabilidade",
201202
"Delete all License Information": "Exclua todas as informações de licença",
202203
"Delete component success!": "Excluir componente com sucesso!",
204+
"Delete project successful!": "Excluir projeto com sucesso!",
203205
"Delete release success!": "Excluir release com sucesso!",
204206
"Delivery start": "Início da entrega",
205207
"Delivery start date": "Data inicial de entrega",
@@ -212,6 +214,7 @@
212214
"Do not create monitoring list, but use list from external id": "Não criar lista de monitoramento, mas usar lista de id externo",
213215
"Do you really want to delete the attachment?": "Tem certeza de que deseja excluir este anexo?",
214216
"Do you really want to delete the component?": "Deseja realmente excluir o componente <strong>{name}</strong>?",
217+
"Do you really want to delete the project?": "Você realmente deseja excluir o projeto <strong>{name}</strong>?",
215218
"Do you really want to delete the release?": "Deseja realmente excluir a versão: <strong>{name}</strong>?",
216219
"Do you really want to delete the vulnerability?": "Deseja realmente excluir a vulnerabilidade <strong>{id}</strong>?",
217220
"Document": "Documento",
@@ -423,6 +426,7 @@
423426
"Mercurial": "Mercurial",
424427
"Merge": "Fundir",
425428
"Metadata": "Metadados",
429+
"Moderation request is created!": "O pedido de moderação foi criado!",
426430
"Moderators": "Moderadores",
427431
"Modified By": "Modificado por",
428432
"Modified On": "Modificado em",
@@ -510,6 +514,7 @@
510514
"Project Vendor": "Fornecedor do Projeto",
511515
"Project Version": "Versionamento de Projeto",
512516
"Project cannot be created/updated": "O projeto não pode ser criado/atualizado",
517+
"The project cannot be deleted, since it is used by another project!": "O projeto não pode ser excluído, pois é utilizado por outro projeto!",
513518
"Project state": "Estado do Projeto",
514519
"Projects": "Projetos",
515520
"Projects only": "Apenas projetos",

0 commit comments

Comments
 (0)