From 086315f3f2a51b5409f4ebdaa45a7b0d0594ae8e Mon Sep 17 00:00:00 2001
From: protos <cm@davitec.de>
Date: Thu, 7 Sep 2017 16:04:08 +0200
Subject: [PATCH] [TASK] EXT:form - cleanup of leftovers, better wording

Change some wording for better understanding in frontend and backend.

Resolves: #82326
Releases: master, 8.7
Change-Id: Idc43a1543a315f5d54fdaf6c575a2f7ef0084aae
Reviewed-on: https://review.typo3.org/53951
Reviewed-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Tested-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Reviewed-by: Mathias Brodala <mbrodala@pagemachine.de>
Tested-by: Mathias Brodala <mbrodala@pagemachine.de>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Daniel Lorenz <daniel.lorenz@extco.de>
Tested-by: Daniel Lorenz <daniel.lorenz@extco.de>
Reviewed-by: Susanne Moog <susanne.moog@typo3.org>
Tested-by: Susanne Moog <susanne.moog@typo3.org>
---
 .../FormEditor/Yaml/NewForms/BlankForm.yaml   |  2 +-
 .../Resources/Private/Language/Database.xlf   | 42 +++++++++----------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/typo3/sysext/form/Resources/Private/Backend/Templates/FormEditor/Yaml/NewForms/BlankForm.yaml b/typo3/sysext/form/Resources/Private/Backend/Templates/FormEditor/Yaml/NewForms/BlankForm.yaml
index 5a1b08a10dcc..d1297b6a43b7 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Templates/FormEditor/Yaml/NewForms/BlankForm.yaml
+++ b/typo3/sysext/form/Resources/Private/Backend/Templates/FormEditor/Yaml/NewForms/BlankForm.yaml
@@ -5,4 +5,4 @@ renderables:
     -
         type: 'Page'
         identifier: 'page-1'
-        label: 'Page'
\ No newline at end of file
+        label: 'Step'
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Language/Database.xlf b/typo3/sysext/form/Resources/Private/Language/Database.xlf
index 3e11f547ee44..34651b1e12bd 100644
--- a/typo3/sysext/form/Resources/Private/Language/Database.xlf
+++ b/typo3/sysext/form/Resources/Private/Language/Database.xlf
@@ -43,7 +43,7 @@
             </trans-unit>
 
             <trans-unit id="tt_content.finishersDefinition.EmailToSender.label" xml:space="preserve">
-                <source>Email to sender</source>
+                <source>Email to sender (form submitter)</source>
             </trans-unit>
             <trans-unit id="tt_content.finishersDefinition.EmailToSender.subject.label" xml:space="preserve">
                 <source>Subject of the email</source>
@@ -80,7 +80,7 @@
             </trans-unit>
 
             <trans-unit id="tt_content.finishersDefinition.EmailToReceiver.label" xml:space="preserve">
-                <source>Email to receiver</source>
+                <source>Email to receiver (you)</source>
             </trans-unit>
             <trans-unit id="tt_content.finishersDefinition.EmailToReceiver.subject.label" xml:space="preserve">
                 <source>Subject of the email</source>
@@ -196,7 +196,7 @@
             </trans-unit>
 
             <trans-unit id="formEditor.header" xml:space="preserve">
-                <source>Form Editor</source>
+                <source>Form editor</source>
             </trans-unit>
             <trans-unit id="formEditor.loading" xml:space="preserve">
                 <source>Loading...</source>
@@ -225,10 +225,6 @@
             <trans-unit id="formEditor.insert_elements" xml:space="preserve">
                 <source>Insert elements</source>
             </trans-unit>
-            <trans-unit id="formEditor.insert_pages" xml:space="preserve">
-                <source>Insert pages</source>
-            </trans-unit>
-
             <trans-unit id="formEditor.formElementPropertyValidatorsDefinition.NotEmpty.label" xml:space="preserve">
                 <source>Required</source>
             </trans-unit>
@@ -461,10 +457,10 @@
                 <source>Add finisher</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.editor.finishers.EmailToSender.label" xml:space="preserve">
-                <source>Email to sender (to website visitor)</source>
+                <source>Email to sender (form submitter)</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.editor.finishers.EmailToReceiver.label" xml:space="preserve">
-                <source>Email to receiver (to you)</source>
+                <source>Email to receiver (you)</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.editor.finishers.Redirect.label" xml:space="preserve">
                 <source>Redirect to a page</source>
@@ -477,7 +473,7 @@
             </trans-unit>
 
             <trans-unit id="formEditor.elements.Form.finisher.EmailToSender.editor.header.label" xml:space="preserve">
-                <source>Send email (to website visitor)</source>
+                <source>Email to sender (form submitter)</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToSender.editor.subject.label" xml:space="preserve">
                 <source>Subject</source>
@@ -492,19 +488,19 @@
                 <source>Recipient name</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToSender.editor.recipientName.fieldExplanationText" xml:space="preserve">
-                <source>The name of the website visitor, which appears in the website visitor e-mail client. You can use the "insert formelement identifier" dropdown to choose one or more form elements which holds the website visitors name.</source>
+                <source>The name of the website visitor which appears in the website visitor email client. You can use the "insert formelement identifier" dropdown to choose one or more form elements which holds the website visitors name.</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToSender.editor.senderAddress.label" xml:space="preserve">
                 <source>Sender address</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToSender.editor.senderAddress.fieldExplanationText" xml:space="preserve">
-                <source>The email address of the sender (e.g. your company's email address), which appears in the website visitor e-mail client.</source>
+                <source>The email address of the sender (e.g. your company's email address) which appears in the website visitor email client.</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToSender.editor.senderName.label" xml:space="preserve">
                 <source>Sender name</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToSender.editor.senderName.fieldExplanationText" xml:space="preserve">
-                <source>The name of the sender (e.g. your company's name), which appears in the website visitor e-mail client.</source>
+                <source>The name of the sender (e.g. your company's name) which appears in the website visitor email client.</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToSender.editor.replyToAddress.label" xml:space="preserve">
                 <source>Reply-to address</source>
@@ -529,7 +525,7 @@
             </trans-unit>
 
             <trans-unit id="formEditor.elements.Form.finisher.EmailToReceiver.editor.header.label" xml:space="preserve">
-                <source>Send email (to you)</source>
+                <source>Email to receiver (you)</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToReceiver.editor.subject.label" xml:space="preserve">
                 <source>Subject</source>
@@ -544,19 +540,19 @@
                 <source>Recipient name</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToReceiver.editor.recipientName.fieldExplanationText" xml:space="preserve">
-                <source>The name of the recipient, which appears in your e-mail client (e.g. your company's name).</source>
+                <source>The name of the recipient which appears in your email client (e.g. your company's name).</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToReceiver.editor.senderAddress.label" xml:space="preserve">
                 <source>Sender address</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToReceiver.editor.senderAddress.fieldExplanationText" xml:space="preserve">
-                <source>The email address of the sender, which appears in your e-mail client. If you want, you can use the "insert formelement identifier" dropdown to choose a form element which holds the website visitors email address.</source>
+                <source>The email address of the sender which appears in your email client. If you want, you can use the "insert formelement identifier" dropdown to choose a form element which holds the website visitors email address.</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToReceiver.editor.senderName.label" xml:space="preserve">
                 <source>Sender name</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToReceiver.editor.senderName.fieldExplanationText" xml:space="preserve">
-                <source>The name of the sender, which appears in your e-mail client. If you want, you can use the "insert formelement identifier" dropdown to choose one or more form elements which holds the website visitors name.</source>
+                <source>The name of the sender which appears in your email client. If you want, you can use the "insert formelement identifier" dropdown to choose one or more form elements which holds the website visitors name.</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Form.finisher.EmailToReceiver.editor.replyToAddress.label" xml:space="preserve">
                 <source>Reply-to address</source>
@@ -672,13 +668,13 @@
                 <source>Previous button label</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Page.editor.previousButtonLabel.value" xml:space="preserve">
-                <source>previous Step</source>
+                <source>Previous step</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Page.editor.nextButtonLabel.label" xml:space="preserve">
                 <source>Next button label</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.Page.editor.nextButtonLabel.value" xml:space="preserve">
-                <source>next Step</source>
+                <source>Next step</source>
             </trans-unit>
 
             <trans-unit id="formEditor.elements.SummaryPage.label" xml:space="preserve">
@@ -691,13 +687,13 @@
                 <source>Previous button label</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.SummaryPage.editor.previousButtonLabel.value" xml:space="preserve">
-                <source>previous Step</source>
+                <source>Previous step</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.SummaryPage.editor.nextButtonLabel.label" xml:space="preserve">
                 <source>Next button label</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.SummaryPage.editor.nextButtonLabel.value" xml:space="preserve">
-                <source>next Step</source>
+                <source>Next step</source>
             </trans-unit>
 
             <trans-unit id="formEditor.elements.Fieldset.label" xml:space="preserve">
@@ -718,7 +714,7 @@
                 <source>Grid: Row</source>
             </trans-unit>
             <trans-unit id="formEditor.elements.GridRow.editor.label.label" xml:space="preserve">
-                <source>Row name (not visible within Frontend)</source>
+                <source>Row name (not visible within frontend)</source>
             </trans-unit>
 
             <trans-unit id="formEditor.elements.Text.label" xml:space="preserve">
@@ -880,7 +876,7 @@
             </trans-unit>
 
             <trans-unit id="formEditor.elements.UnknownElement" xml:space="preserve">
-                <source>Unknown Element</source>
+                <source>Unknown element</source>
             </trans-unit>
 
             <trans-unit id="formEditor.stage.toolbar.new_element" xml:space="preserve">
-- 
GitLab