From 649148e40df66609219d52edd958d7eb1e84b084 Mon Sep 17 00:00:00 2001 From: CI Server Date: Sat, 5 Oct 2024 04:16:46 +0000 Subject: [PATCH] Merge Translations --- .../resources/locale/portlet/notes/notesPortlet_en.properties | 2 +- .../resources/locale/portlet/wiki/WikiPortlet_de.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties index c810a90e6e..98c0b400b8 100644 --- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties +++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties @@ -55,7 +55,7 @@ popup.confirmation.delete=Deleting the page popup.confirmation.delete.draft=Delete draft popup.msg.confirmation.DeleteInfo1=Are you sure you want to delete this note? {0} popup.msg.confirmation.DeleteInfo2=Please note: -popup.msg.confirmation.DeleteInfo4=The links to this page will be broken when this page is removed. +popup.msg.confirmation.DeleteInfo4=The links to this page will be broken when this page is deleted. popup.msg.confirmation.DeleteInfo5=This note is child of the note: {0} popup.msg.confirmation.DeleteDraftInfo1=Are you sure you want to delete this note? {0} popup.msg.confirmation.DeleteDraftInfo5=This draft is child of the note: {0} diff --git a/notes-webapp/src/main/resources/locale/portlet/wiki/WikiPortlet_de.properties b/notes-webapp/src/main/resources/locale/portlet/wiki/WikiPortlet_de.properties index 4a7f352115..26736431a6 100644 --- a/notes-webapp/src/main/resources/locale/portlet/wiki/WikiPortlet_de.properties +++ b/notes-webapp/src/main/resources/locale/portlet/wiki/WikiPortlet_de.properties @@ -78,7 +78,7 @@ UIWikiPagePermissionForm.label.action.OpenSelectUserForm=Benutzer auswählen UIWikiPagePermissionForm.label.action.AddEntry=Hinzufügen UIWikiPagePermissionForm.label.action.DeleteEntry=Eintrag löschen -UIWikiSettingContainer_PermissionSetting_.msg.Save-permission-setting-success=The permission settings have been saved successfully. +UIWikiSettingContainer_PermissionSetting_.msg.Save-permission-setting-success=Die Berechtigungseinstellungen wurden erfolgreich gespeichert. UIWikiSettingContainer_PermissionSetting_.msg.NonExistID={0} existiert nicht. UIWikiSettingContainer_PermissionSetting_.action.Close=#{word.close} UIWikiSettingContainer_PermissionSetting_.action.Save=#{word.save} @@ -90,7 +90,7 @@ UIPermissionGrid.label.ADMINSPACE=Admin-Wiki UIPermissionGrid.label.VIEW_ATTACHMENT=Anhänge anzeigen UIPermissionGrid.label.EDIT_ATTACHMENT=Anhänge bearbeiten UIPermissionGrid.label.Action=#{word.action} -UIWikiPermissionForm.msg.Save-permission-setting-success=The permission settings have been saved successfully. +UIWikiPermissionForm.msg.Save-permission-setting-success=Die Berechtigungseinstellungen wurden erfolgreich gespeichert. UIWikiPermissionForm.msg.NonExistID={0} existiert nicht. UIWikiPermissionForm.msg.duplicate-id=Der/Die ausgewählte Benutzer/Gruppe/Mitgliedschaft ist bereits in der Liste vorhanden. UIWikiPermissionForm.action.Close=#{word.cancel}