Fix merge

Author: zonky2

src/Resources/contao/languages/de/default.php

@@ -1 +1,25 @@
-<?php/** * This file is part of MetaModels/attribute_contentarticle. * * (c) 2012-2019 The MetaModels team. * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. * * This project is provided in good faith and hope to be usable by anyone. * * @package    MetaModels * @subpackage AttributeContentArticle * @author     Stefan Heimes <stefan_heimes@hotmail.com> * @copyright  2012-2019 The MetaModels team. * @license    https://github.com/MetaModels/attribute_contentarticle/blob/master/LICENSE LGPL-3.0-or-later * @filesource */$GLOBALS['TL_LANG']['attribute_contentarticle']['missing_id'] = 'Sie müssen den Hauptdatensatz speichern, bevor Sie neue Daten anlegen können.';
+<?php
+/**
+ * This file is part of MetaModels/attribute_contentarticle.
+ *
+ * (c) 2012-2022 The MetaModels team.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * This project is provided in good faith and hope to be usable by anyone.
+ *
+ * Translations are managed automatically using Transifex. To create a new translation
+ * or to help to maintain an existing one, please register at transifex.com.
+ *
+ * Last-updated: 2022-11-30T08:57:25+00:00
+ *
+ * @copyright 2012-2022 The MetaModels team.
+ * @license   https://github.com/MetaModels/attribute_contentarticle/blob/master/LICENSE LGPL-3.0-or-later
+ * @link      https://www.transifex.com/metamodels/public/
+ * @link      https://www.transifex.com/signup/?join_project=metamodels
+ */
+
+
+$GLOBALS['TL_LANG']['attribute_contentarticle']['missing_id'] = 'Sie müssen den Datensatz speichern, bevor Sie neue Daten anlegen können.';
+

src/Resources/contao/languages/de/tl_content.php

@@ -1,21 +1,25 @@
 <?php
-
 /**
  * This file is part of MetaModels/attribute_contentarticle.
  *
- * (c) 2012-2019 The MetaModels team.
+ * (c) 2012-2022 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
  * This project is provided in good faith and hope to be usable by anyone.
  *
- * @package    MetaModels
- * @subpackage AttributeContentArticle
- * @author     Andreas Dziemba <adziemba@web.de>
- * @copyright  2012-2019 The MetaModels team.
- * @license    https://github.com/MetaModels/attribute_contentarticle/blob/master/LICENSE LGPL-3.0-or-later
- * @filesource
+ * Translations are managed automatically using Transifex. To create a new translation
+ * or to help to maintain an existing one, please register at transifex.com.
+ *
+ * Last-updated: 2022-11-30T08:57:30+00:00
+ *
+ * @copyright 2012-2022 The MetaModels team.
+ * @license   https://github.com/MetaModels/attribute_contentarticle/blob/master/LICENSE LGPL-3.0-or-later
+ * @link      https://www.transifex.com/metamodels/public/
+ * @link      https://www.transifex.com/signup/?join_project=metamodels
  */
 
-$GLOBALS['TL_LANG']['tl_content']['addMainLangContent'] = ['Inhalt der Hauptsprache kopieren', ''];
+
+$GLOBALS['TL_LANG']['tl_content']['addMainLangContent']['0'] = 'Inhalt der Hauptsprache kopieren';
+

src/Resources/contao/languages/de/tl_metamodel_attribute.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * This file is part of MetaModels/attribute_contentarticle.
  *
@@ -10,13 +9,17 @@
  *
  * This project is provided in good faith and hope to be usable by anyone.
  *
- * @package    MetaModels
- * @subpackage AttributeContentArticle
- * @author     Andreas Dziemba <adziemba@web.de>
- * @author     Ingolf Steinhardt <info@e-spin.de>
- * @copyright  2012-2022 The MetaModels team.
- * @license    https://github.com/MetaModels/attribute_contentarticle/blob/master/LICENSE LGPL-3.0-or-later
- * @filesource
+ * Translations are managed automatically using Transifex. To create a new translation
+ * or to help to maintain an existing one, please register at transifex.com.
+ *
+ * Last-updated: 2022-11-30T08:57:34+00:00
+ *
+ * @copyright 2012-2022 The MetaModels team.
+ * @license   https://github.com/MetaModels/attribute_contentarticle/blob/master/LICENSE LGPL-3.0-or-later
+ * @link      https://www.transifex.com/metamodels/public/
+ * @link      https://www.transifex.com/signup/?join_project=metamodels
  */
 
-$GLOBALS['TL_LANG']['tl_metamodel_attribute']['typeOptions']['contentarticle'] = 'Content Artikel';
+
+$GLOBALS['TL_LANG']['tl_metamodel_attribute']['typeOptions']['contentarticle'] = 'Inhalt des Artikels';
+