diff --git a/Configuration/TCA/tx_sgjobs_domain_model_job_application.php b/Configuration/TCA/tx_sgjobs_domain_model_job_application.php
index 69ac6cc15f940196c445ad5ef191616391b00b04..36d084fa4806fb7fef2279af20e703e90c95a829 100644
--- a/Configuration/TCA/tx_sgjobs_domain_model_job_application.php
+++ b/Configuration/TCA/tx_sgjobs_domain_model_job_application.php
@@ -202,7 +202,7 @@ return [
 		],
 		'country' => [
 			'exclude' => 0,
-			'label' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang_db.xlf:tx_sgjobs_domain_model_job_application.zip',
+			'label' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang_db.xlf:tx_sgjobs_domain_model_job_application.country',
 			'config' => [
 				'type' => 'input',
 				'size' => 30,
@@ -211,7 +211,7 @@ return [
 		],
 		'nationality' => [
 			'exclude' => 0,
-			'label' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang_db.xlf:tx_sgjobs_domain_model_job_application.zip',
+			'label' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang_db.xlf:tx_sgjobs_domain_model_job_application.nationality',
 			'config' => [
 				'type' => 'input',
 				'size' => 30,
@@ -220,7 +220,7 @@ return [
 		],
 		'education' => [
 			'exclude' => 0,
-			'label' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang_db.xlf:tx_sgjobs_domain_model_job_application.zip',
+			'label' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang_db.xlf:tx_sgjobs_domain_model_job_application.education',
 			'config' => [
 				'type' => 'input',
 				'size' => 30,
diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf
index d677f0f59bce5a8745870727811c1050b6310962..66033413115f7e80f7bd009817189a88d59f04f4 100644
--- a/Resources/Private/Language/de.locallang_db.xlf
+++ b/Resources/Private/Language/de.locallang_db.xlf
@@ -101,18 +101,14 @@
 			<source>Job offer</source>
 			<target>Stellenanzeige</target>
 		</trans-unit>
-		<trans-unit id="tx_sgjobs_domain_model_job.plugin_options" approved="yes">
-			<source>Joblist plugin options</source>
-			<target>Joblist Plugin-Optionen</target>
+		<trans-unit id="tx_sgjobs_domain_model_job.alternative_start_date" approved="yes">
+			<source>Alternative start date</source>
+			<target>Alternativer Eintrittszeitpunkt</target>
 		</trans-unit>
 		<trans-unit id="tx_sgjobs_domain_model_job.application_form_page" approved="yes">
 			<source>Page containing the application form</source>
 			<target>Seite, die das Bewerbungs-Formular enthält</target>
 		</trans-unit>
-		<trans-unit id="tx_sgjobs_domain_model_job.alternative_start_date" approved="yes">
-			<source>Alternative start date</source>
-			<target>Alternativer Eintrittszeitpunkt</target>
-		</trans-unit>
 		<trans-unit id="tx_sgjobs_domain_model_job.area" approved="yes">
 			<source>Area</source>
 			<target>Bereich</target>
@@ -137,6 +133,10 @@
 			<source>Location</source>
 			<target>Arbeitsort</target>
 		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job.plugin_options" approved="yes">
+			<source>Joblist plugin options</source>
+			<target>Joblist Plugin-Optionen</target>
+		</trans-unit>
 		<trans-unit id="tx_sgjobs_domain_model_job.qualification" approved="yes">
 			<source>Qualification</source>
 			<target>Qualifikation</target>
@@ -161,6 +161,82 @@
 			<source>Job title</source>
 			<target>Stellenbezeichnung</target>
 		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application'" approved="yes">
+			<source>Application</source>
+			<target>Bewerbung</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.birth_date" approved="yes">
+			<source>Birthdate</source>
+			<target>Geburtsdatum</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.certificates" approved="yes">
+			<source>Certificates</source>
+			<target>Zeugnisse</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.city" approved="yes">
+			<source>City</source>
+			<target>Ort</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.country" approved="yes">
+			<source>Country</source>
+			<target>Land</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.cover_letter" approved="yes">
+			<source>Cover letter</source>
+			<target>Motivationsschreiben</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.cv" approved="yes">
+			<source>CV</source>
+			<target>Lebenslauf</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.education" approved="yes">
+			<source>Education</source>
+			<target>Höchster Abschluss</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.email" approved="yes">
+			<source>Email</source>
+			<target>E-Mail</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.first_name" approved="yes">
+			<source>First name</source>
+			<target>Vorname</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.gender" approved="yes">
+			<source>Gender</source>
+			<target>Geschlecht</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.job" approved="yes">
+			<source>Job</source>
+			<target>Stelle</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.last_name" approved="yes">
+			<source>Last name</source>
+			<target>Nachname</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.message" approved="yes">
+			<source>Message</source>
+			<target>Nachricht</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.mobile" approved="yes">
+			<source>Mobile</source>
+			<target>mobile</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.nationality" approved="yes">
+			<source>Nationality</source>
+			<target>Nationalität</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.phone" approved="yes">
+			<source>Phone</source>
+			<target>Telefon</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.street" approved="yes">
+			<source>Street</source>
+			<target>Strasse</target>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.zip" approved="yes">
+			<source>Zip</source>
+			<target>PLZ</target>
+		</trans-unit>
 		<trans-unit id="tx_sgjobs_domain_model_location" approved="yes">
 			<source>Location</source>
 			<target>Arbeitsort</target>
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
index cc41546a6fc48bf3a1cfdb7b335f3d631c912e47..79fbe5d21d4cfbb4b0b2a22e075750d1c1deaa5d 100644
--- a/Resources/Private/Language/locallang_db.xlf
+++ b/Resources/Private/Language/locallang_db.xlf
@@ -78,15 +78,12 @@
 		<trans-unit id="tx_sgjobs_domain_model_job">
 			<source>Job offer</source>
 		</trans-unit>
-		<trans-unit id="tx_sgjobs_domain_model_job.plugin_options">
-			<source>Joblist plugin options</source>
+		<trans-unit id="tx_sgjobs_domain_model_job.alternative_start_date">
+			<source>Alternative start date</source>
 		</trans-unit>
 		<trans-unit id="tx_sgjobs_domain_model_job.application_form_page">
 			<source>Page containing the application form</source>
 		</trans-unit>
-		<trans-unit id="tx_sgjobs_domain_model_job.alternative_start_date">
-			<source>Alternative start date</source>
-		</trans-unit>
 		<trans-unit id="tx_sgjobs_domain_model_job.area">
 			<source>Area</source>
 		</trans-unit>
@@ -102,9 +99,15 @@
 		<trans-unit id="tx_sgjobs_domain_model_job.function">
 			<source>Function</source>
 		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job.jobId">
+			<source>Job ID</source>
+		</trans-unit>
 		<trans-unit id="tx_sgjobs_domain_model_job.location">
 			<source>Location</source>
 		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job.plugin_options">
+			<source>Joblist plugin options</source>
+		</trans-unit>
 		<trans-unit id="tx_sgjobs_domain_model_job.qualification">
 			<source>Qualification</source>
 		</trans-unit>
@@ -123,8 +126,62 @@
 		<trans-unit id="tx_sgjobs_domain_model_job.title">
 			<source>Job title</source>
 		</trans-unit>
-		<trans-unit id="tx_sgjobs_domain_model_job.jobId">
-			<source>Job ID</source>
+		<trans-unit id="tx_sgjobs_domain_model_job_application'">
+			<source>Application</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.birth_date">
+			<source>Birthdate</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.certificates">
+			<source>Certificates</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.city">
+			<source>City</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.country">
+			<source>Country</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.cover_letter">
+			<source>Cover letter</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.cv">
+			<source>CV</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.education">
+			<source>Education</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.email">
+			<source>Email</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.first_name">
+			<source>First name</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.gender">
+			<source>Gender</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.job">
+			<source>Job</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.last_name">
+			<source>Last name</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.message">
+			<source>Message</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.mobile">
+			<source>Mobile</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.nationality">
+			<source>Nationality</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.phone">
+			<source>Phone</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.street">
+			<source>Street</source>
+		</trans-unit>
+		<trans-unit id="tx_sgjobs_domain_model_job_application.zip">
+			<source>Zip</source>
 		</trans-unit>
 		<trans-unit id="tx_sgjobs_domain_model_location">
 			<source>Location</source>