diff --git a/src/CoreBundle/Resources/translations/metamodels_default.de.xlf b/src/CoreBundle/Resources/translations/metamodels_default.de.xlf
index 121e34908..10296395e 100644
--- a/src/CoreBundle/Resources/translations/metamodels_default.de.xlf
+++ b/src/CoreBundle/Resources/translations/metamodels_default.de.xlf
@@ -15,20 +15,16 @@
       </trans-unit>
       <trans-unit id="fallback_language_hint.label_fallback" resname="fallback_language_hint.label_fallback">
         <source>Fallback</source>
-        <target>Fallback</target>
       </trans-unit>
       <trans-unit id="fallback_language_hint.title_fallback" resname="fallback_language_hint.title_fallback">
-        <source>Value from fallback language "%source%" (not yet translated to "%target%")</source>
-        <target>Wert aus Fallback-Sprache „%source%" (noch nicht nach „%target%" übersetzt)</target>
+        <source>Value from fallback language &quot;%source%&quot; (not yet translated to &quot;%target%&quot;)</source>
       </trans-unit>
       <trans-unit id="fallback_language_hint.label_translated" resname="fallback_language_hint.label_translated">
         <source>Translated</source>
-        <target>Übersetzt</target>
       </trans-unit>
       <trans-unit id="fallback_language_hint.title_translated" resname="fallback_language_hint.title_translated">
-        <source>Value has its own translation in "%target%"</source>
-        <target>Wert hat eine eigene Übersetzung in „%target%"</target>
+        <source>Value has its own translation in &quot;%target%&quot;</source>
       </trans-unit>
     </body>
   </file>
-</xliff>
+</xliff>
\ No newline at end of file
diff --git a/src/CoreBundle/Resources/translations/metamodels_default.fr.xlf b/src/CoreBundle/Resources/translations/metamodels_default.fr.xlf
index 34034fad3..45bf0d3a2 100644
--- a/src/CoreBundle/Resources/translations/metamodels_default.fr.xlf
+++ b/src/CoreBundle/Resources/translations/metamodels_default.fr.xlf
@@ -13,6 +13,18 @@
         <source>%template% (%themes%)</source>
         <target>%template% (%themes%)]</target>
       </trans-unit>
+      <trans-unit id="fallback_language_hint.label_fallback" resname="fallback_language_hint.label_fallback">
+        <source>Fallback</source>
+      </trans-unit>
+      <trans-unit id="fallback_language_hint.title_fallback" resname="fallback_language_hint.title_fallback">
+        <source>Value from fallback language &quot;%source%&quot; (not yet translated to &quot;%target%&quot;)</source>
+      </trans-unit>
+      <trans-unit id="fallback_language_hint.label_translated" resname="fallback_language_hint.label_translated">
+        <source>Translated</source>
+      </trans-unit>
+      <trans-unit id="fallback_language_hint.title_translated" resname="fallback_language_hint.title_translated">
+        <source>Value has its own translation in &quot;%target%&quot;</source>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/src/CoreBundle/Resources/translations/tl_metamodel_attribute.de.xlf b/src/CoreBundle/Resources/translations/tl_metamodel_attribute.de.xlf
index 5d8fa6b16..b77d2b89d 100644
--- a/src/CoreBundle/Resources/translations/tl_metamodel_attribute.de.xlf
+++ b/src/CoreBundle/Resources/translations/tl_metamodel_attribute.de.xlf
@@ -100,14 +100,13 @@
         <target>Varianten überschreiben</target>
       </trans-unit>
       <trans-unit id="isvariant.description" resname="isvariant.description">
-        <source>Check this, if you want variants within the MetaModel to override the parent item&apos;s value</source>
-        <target>Anwählen, falls Sie innerhalb des MetaModels Varianten wünschen, um Elternwerte zu überschreiben.</target>
+        <source>Check this, if you want variants within the MetaModel to override the parent item&apos;s value.</source>
       </trans-unit>
       <trans-unit id="skip_fallback.label" resname="skip_fallback.label">
-        <source>Fallback-Modus deaktivieren</source>
+        <source>Disable fallback mode</source>
       </trans-unit>
       <trans-unit id="skip_fallback.description" resname="skip_fallback.description">
-        <source>Anwählen, wenn der Fallback.Modus deaktiviert werden soll - bei deaktiviertem Fallback-Modus werden die Werte unabhängig der Fallbacksprache gespeichert.</source>
+        <source>Check this, if you want to disable fallback mode — when fallback mode is disabled, the values are saved regardless of the fallback language.</source>
       </trans-unit>
       <trans-unit id="isunique.label" resname="isunique.label">
         <source>Unique values</source>
@@ -257,4 +256,4 @@
       </trans-unit>
     </body>
   </file>
-</xliff>
+</xliff>
\ No newline at end of file
diff --git a/src/CoreBundle/Resources/translations/tl_metamodel_attribute.fr.xlf b/src/CoreBundle/Resources/translations/tl_metamodel_attribute.fr.xlf
index 49b0d1660..6604dbe4d 100644
--- a/src/CoreBundle/Resources/translations/tl_metamodel_attribute.fr.xlf
+++ b/src/CoreBundle/Resources/translations/tl_metamodel_attribute.fr.xlf
@@ -100,8 +100,13 @@
         <target>Activer l&apos;annulation des variantes</target>
       </trans-unit>
       <trans-unit id="isvariant.description" resname="isvariant.description">
-        <source>Check this, if you want variants within the MetaModel to override the parent item&apos;s value</source>
-        <target>Cochez cette case si vous voulez que les variantes du MetaModel remplacent le parent. </target>
+        <source>Check this, if you want variants within the MetaModel to override the parent item&apos;s value.</source>
+      </trans-unit>
+      <trans-unit id="skip_fallback.label" resname="skip_fallback.label">
+        <source>Disable fallback mode</source>
+      </trans-unit>
+      <trans-unit id="skip_fallback.description" resname="skip_fallback.description">
+        <source>Check this, if you want to disable fallback mode — when fallback mode is disabled, the values are saved regardless of the fallback language.</source>
       </trans-unit>
       <trans-unit id="isunique.label" resname="isunique.label">
         <source>Unique values</source>
diff --git a/src/CoreBundle/Resources/translations/tl_metamodel_dcasetting.de.xlf b/src/CoreBundle/Resources/translations/tl_metamodel_dcasetting.de.xlf
index 7e8948a88..3e4ed06fc 100644
--- a/src/CoreBundle/Resources/translations/tl_metamodel_dcasetting.de.xlf
+++ b/src/CoreBundle/Resources/translations/tl_metamodel_dcasetting.de.xlf
@@ -271,11 +271,9 @@
       </trans-unit>
       <trans-unit id="highlight.label" resname="highlight.label">
         <source>Syntax highlighting mode</source>
-        <target>Syntax-Hervorhebungsmodus</target>
       </trans-unit>
       <trans-unit id="highlight.description" resname="highlight.description">
-        <source>Select the syntax highlighting mode for the ACE editor (e.g. "html", "css", "javascript"). Only relevant when an ACE editor configuration is selected.</source>
-        <target>Wählen Sie den Syntax-Hervorhebungsmodus für den ACE-Editor (z.B. "html", "css", "javascript"). Nur relevant, wenn eine ACE-Editor-Konfiguration ausgewählt ist.</target>
+        <source>Select the syntax highlighting mode for the ACE editor (e.g. &quot;html&quot;, &quot;css&quot;, &quot;javascript&quot;). Only relevant when an ACE editor configuration is selected.</source>
       </trans-unit>
       <trans-unit id="rows.label" resname="rows.label">
         <source>Rows</source>
diff --git a/src/CoreBundle/Resources/translations/tl_metamodel_dcasetting.fr.xlf b/src/CoreBundle/Resources/translations/tl_metamodel_dcasetting.fr.xlf
index 98d0ff1b7..ece488cf3 100644
--- a/src/CoreBundle/Resources/translations/tl_metamodel_dcasetting.fr.xlf
+++ b/src/CoreBundle/Resources/translations/tl_metamodel_dcasetting.fr.xlf
@@ -211,6 +211,12 @@
       <trans-unit id="rte.description" resname="rte.description">
         <source>Select the rich text configuration that shall be used on this field (if any).</source>
       </trans-unit>
+      <trans-unit id="highlight.label" resname="highlight.label">
+        <source>Syntax highlighting mode</source>
+      </trans-unit>
+      <trans-unit id="highlight.description" resname="highlight.description">
+        <source>Select the syntax highlighting mode for the ACE editor (e.g. &quot;html&quot;, &quot;css&quot;, &quot;javascript&quot;). Only relevant when an ACE editor configuration is selected.</source>
+      </trans-unit>
       <trans-unit id="rows.label" resname="rows.label">
         <source>Rows</source>
       </trans-unit>