Permalink
Browse files

Merge tag 'v10.9.8' into release-10.10.0

[twgit] Hotfix finish: hotfix-10.9.8
  • Loading branch information...
DominicWatson committed Aug 31, 2018
2 parents 4fd2003 + 0f560f8 commit 056f46afecacf02f274cd2e53c235acc9aa45862
Showing with 494 additions and 151 deletions.
  1. +0 −1 system/i18n/applications_fr.properties
  2. +21 −11 system/i18n/auditlog/datamanager_de.properties
  3. +9 −0 system/i18n/auditlog/emailblueprints_de.properties
  4. +3 −0 system/i18n/auditlog/emailresend_de.properties
  5. +2 −0 system/i18n/auditlog/frontendeditor_de.properties
  6. +112 −25 system/i18n/cms_de.properties
  7. +3 −19 system/i18n/cms_fr.properties
  8. +0 −1 system/i18n/email/layout/default_de.properties
  9. +1 −0 system/i18n/email/template/notification_de.properties
  10. +5 −0 system/i18n/email/template/resetCmsPasswordForTokenExpiry_de.properties
  11. +5 −0 system/i18n/email/template/resetWebsitePasswordForTokenExpiry_de.properties
  12. +6 −0 system/i18n/email/template/resetWebsitePassword_de.properties
  13. +6 −0 system/i18n/email/template/websiteWelcome_de.properties
  14. +6 −0 system/i18n/enum/assetAccessRestriction_de.properties
  15. +13 −0 system/i18n/enum/emailAction_de.properties
  16. +6 −0 system/i18n/enum/emailSendingLimit_de.properties
  17. +6 −0 system/i18n/enum/emailSendingMethod_de.properties
  18. +4 −0 system/i18n/enum/emailSendingScheduleType_de.properties
  19. +7 −0 system/i18n/enum/pageAccessRestriction_de.properties
  20. +8 −0 system/i18n/enum/pageIframeAccessRestriction_de.properties
  21. +4 −0 system/i18n/enum/redirectType_de.properties
  22. +6 −0 system/i18n/enum/searchAccess_de.properties
  23. +6 −0 system/i18n/formbuilder/actions/loggedInUserEmail_de.properties
  24. +2 −0 system/i18n/formbuilder/item-types/checkbox_de.properties
  25. +1 −0 system/i18n/formbuilder_de.properties
  26. +7 −0 system/i18n/page-types/forgotten_password_de.properties
  27. +8 −0 system/i18n/page-types/reset_password_de.properties
  28. +8 −0 system/i18n/permissions_de.properties
  29. +9 −0 system/i18n/preside-objects/asset_de.properties
  30. +10 −1 system/i18n/preside-objects/asset_folder_de.properties
  31. +0 −1 system/i18n/preside-objects/asset_folder_fr.properties
  32. +11 −0 system/i18n/preside-objects/email_blueprint_de.properties
  33. +4 −0 system/i18n/preside-objects/email_mass_send_queue_de.properties
  34. +51 −0 system/i18n/preside-objects/email_template_de.properties
  35. +7 −0 system/i18n/preside-objects/email_template_send_log_activity_de.properties
  36. +5 −0 system/i18n/preside-objects/email_template_send_log_content_de.properties
  37. +22 −0 system/i18n/preside-objects/email_template_send_log_de.properties
  38. +5 −0 system/i18n/preside-objects/formbuilder_formaction_de.properties
  39. +5 −0 system/i18n/preside-objects/page_de.properties
  40. +1 −1 system/i18n/preside-objects/site_de.properties
  41. +0 −2 system/i18n/preside-objects/site_fr.properties
  42. +2 −0 system/i18n/preside-objects/taskmanager_task_de.properties
  43. +1 −0 system/i18n/preside-objects/website_user_de.properties
  44. +3 −0 system/i18n/rest/auth/token_de.properties
  45. +2 −0 system/i18n/rules/contexts_de.properties
  46. +51 −87 system/i18n/rules/dynamicExpressions_de.properties
  47. +2 −0 system/i18n/rules/expressions/HttpReferer_de.properties
  48. +2 −0 system/i18n/rules/expressions/LastUserEmailBounced_de.properties
  49. +2 −0 system/i18n/rules/expressions/PageIsDescendant_de.properties
  50. +2 −0 system/i18n/rules/expressions/PageIsType_de.properties
  51. +3 −0 system/i18n/rules/expressions/UrlParameter_de.properties
  52. +2 −0 system/i18n/rules/expressions/UserAgent_de.properties
  53. +3 −0 system/i18n/rules/expressions/UserEmailInteraction_de.properties
  54. +2 −0 system/i18n/rules/expressions/formbuilderFormCheckboxFieldChecked_de.properties
  55. +2 −0 system/i18n/rules/expressions/formbuilderFormDateFieldMatches_de.properties
  56. +2 −0 system/i18n/rules/expressions/formbuilderFormFieldIsEmpty_de.properties
  57. +3 −0 system/i18n/rules/expressions/formbuilderFormMultiChoiceFieldMatches_de.properties
  58. +3 −0 system/i18n/rules/expressions/formbuilderFormNumericFieldMatches_de.properties
  59. +4 −0 system/i18n/rules/expressions/formbuilderFormTextFieldMatches_de.properties
  60. +0 −1 system/i18n/storage-providers/filesystem_de.properties
  61. +2 −0 system/i18n/system-config/asset-manager_de.properties
  62. +5 −0 system/i18n/system-config/tracking_de.properties
  63. +1 −1 zanata.xml
@@ -1,3 +1,2 @@
cms.title=Preside\: Gestion de contenu
cms.description=G\u00E9rez des sites, pages, fichiers et donn\u00E9es
cms.iconclass=fa-globe
@@ -1,25 +1,35 @@
title=Datenmanager
iconClass=fa-database
datamanager_add_record.title=Neuer Eintrag (Datenmanager)
datamanager_add_record.title=Neuer Datensatz
datamanager_add_record.message={1} hat einen neuen {2} Datensatz erstellt, {3}
datamanager_add_record.iconClass=fa-plus-circle green
datamanager_add_draft_record.title=Entwurf hinzuf\u00FCgen (Datamanager)
datamanager_add_draft_record.title=Entwurf hinzuf\u00FCgen
datamanager_add_draft_record.message={1} hat einen neuen {2} Entwurf erstellt, {3}
datamanager_add_draft_record.iconClass=fa-plus-circle light-grey
datamanager_delete_record.title=Eintrag l\u00F6schen (Datenmanager)
datamanager_delete_record.title=Datensatz l\u00F6schen
datamanager_delete_record.message={1} hat {2} gel\u00F6scht, {3}
datamanager_delete_record.iconClass=fa-trash red
datamanager_edit_record.title=Eintrag bearbeiten (Datenmanager)
datamanager_edit_record.title=Datensatz bearbeiten
datamanager_edit_record.message={1} hat {2} bearbeitet, {3}
datamanager_edit_record.iconClass=fa-pencil green
datamanager_save_draft_record.title=Entwurfs\u00E4nderungen speichern (Datenmanager)
datamanager_save_draft_record.title=Entwurfs\u00E4nderungen speichern
datamanager_save_draft_record.message={1} hat Entwurfs\u00E4nderungen an {2} gespeichert, {3}
datamanager_save_draft_record.iconClass=fa-pencil light-grey
datamanager_publish_record.title=\u00C4nderungen ver\u00F6ffentlichen (Datenmanager)
datamanager_publish_record.title=\u00C4nderungen ver\u00F6ffentlichen
datamanager_publish_record.message={1} hat \u00C4nderungen an {2} ver\u00F6ffentlicht, {3}
datamanager_publish_record.iconClass=fa-pencil green
datamanager_batch_edit_record.title=Mehrfachbearbeitung der Eintr\u00E4ge (Datenmanager)
datamanager_batch_edit_record.title=Massen\u00E4nderung des Datensatzes
datamanager_batch_edit_record.message={1} hat das {4} Feld von {2} im Rahmen einer Massen\u00E4nderung aktualisiert, {3}
datamanager_batch_edit_record.iconClass=fa-pencil green
datamanager_translate_record.title=Eintrag \u00FCbersetzen (Datenmanager)
datamanager_translate_record.title=Datensatz \u00FCbersetzen
datamanager_translate_record.message={1} hat die \u00DCbersetzung nach {4} von {2} bearbeitet, {3}
datamanager_translate_record.iconClass=fa-globe orange
datamanager_save_draft_translation.title=Entwurf der \u00DCbersetzung speichern (Datenmanager)
datamanager_save_draft_translation.title=Entwurf der \u00DCbersetzung speichern
datamanager_save_draft_translation.message={1} hat den Entwurf f\u00FCr die \u00DCbersetzung nach {4} von {2} gespeichert, {3}
datamanager_save_draft_translation.iconClass=fa-globe light-grey
datamanager_publish_translation.title=\u00DCbersetzung ver\u00F6ffentlichen (Datenmanager)
datamanager_publish_translation.title=\u00DCbersetzung ver\u00F6ffentlichen
datamanager_publish_translation.message={1} hat die \u00DCbersetzung nach {4} von {2} ver\u00F6ffentlicht, {3}
datamanager_publish_translation.iconClass=fa-globe green
edit_datamanager_object_admin_permissions.title=Admin Berechtigungen des Objekts bearbeiten
edit_datamanager_object_admin_permissions.message={1} hat die Admin Berechtigungen f\u00FCr das Datenobjekt {2} ge\u00E4ndert
edit_datamanager_object_admin_permissions.message={1} hat die Admin Berechtigungen f\u00FCr das Objekt {2} ge\u00E4ndert
edit_datamanager_object_admin_permissions.iconClass=fa-lock blue
@@ -1,5 +1,14 @@
title=E-Mail Blueprints
iconClass=fa-envelope
add_record.title=E-Mail Blueprint hinzuf\u00FCgen
add_record.message={1} hat einen neuen E-Mail Blueprint hinzugef\u00FCgt, {2}
add_record.iconClass=fa-plus-circle green
delete_record.title=E-Mail Blueprint l\u00F6schen
delete_record.message={1} hat einen E-Mail Blueprint gel\u00F6scht, {2}
delete_record.iconClass=fa-trash red
edit.title=E-Mail Blueprint bearbeiten
edit.message={1} hat einen E-Mail Blueprint bearbeitet, {2}
edit.iconClass=fa-pencil green
save_blueprint_layout_configuration.title=E-Mail Blueprint Layout Einstellungen bearbeiten
save_blueprint_layout_configuration.message={1} hat die E-Mail Blueprint Layout Einstellungen bearbeitet, {2}
save_blueprint_layout_configuration.iconClass=fa-cogs green
@@ -1,5 +1,8 @@
title=E-Mail sendet erneut
iconClass=fa-refresh
resend_original_email.title=Erneutes Senden der urspr\u00FCnglichen E-Mail
resend_original_email.message={1} hat den Original Inhalt der E-Mail "{2}" an <{3}> erneut gesendet
resend_original_email.iconClass=fa-refresh green
rebuild_and_resend_email.title=Erneutes Erstellen und Senden der E-Mail
rebuild_and_resend_email.message={1} hat die E-Mail "{2}" erneut erstellt und an <{3}> gesendet
rebuild_and_resend_email.iconClass=fa-refresh green
@@ -1,6 +1,8 @@
title=Frontend-Bearbeitung
iconclass=fa-pencil
frontend_save_draft.title=Frontend-Entwurf ge\u00E4ndert
frontend_save_draft.message={1} hat Entwurfs\u00E4nderungen an {2} gespeichert, '{3}'
frontend_save_draft.iconClass=fa-pencil light-grey
frontend_publish_changes.title=Frontend-Entwurf publizieren
frontend_publish_changes.message={1} hat \u00C4nderungen an {2} ver\u00F6ffentlicht, '{3}'
frontend_publish_changes.iconClass=fa-check green
Oops, something went wrong.

0 comments on commit 056f46a

Please sign in to comment.