From 064d3d11f7f7626f732e81a812dd94e048484d99 Mon Sep 17 00:00:00 2001
From: Tim Wagner <tim.wagner@sgalinski.de>
Date: Fri, 21 Jun 2019 16:06:14 -0400
Subject: [PATCH] [TASK] Clean up plugin TCA labels and label names

---
 Configuration/FlexForms/Latest.xml            | 19 ++--
 Configuration/FlexForms/ListByCategory.xml    | 32 +++----
 Configuration/FlexForms/Overview.xml          | 21 +++--
 .../Private/Language/de.locallang_db.xlf      | 94 ++++++++++---------
 Resources/Private/Language/locallang_db.xlf   | 75 ++++++++-------
 5 files changed, 125 insertions(+), 116 deletions(-)

diff --git a/Configuration/FlexForms/Latest.xml b/Configuration/FlexForms/Latest.xml
index 1830ec0..6c682bb 100644
--- a/Configuration/FlexForms/Latest.xml
+++ b/Configuration/FlexForms/Latest.xml
@@ -24,8 +24,8 @@
 
 					<settings.categories>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.categories</label>
-							<description>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.categories.description</description>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.latest.flexForm.categories</label>
+							<description>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.latest.flexForm.categories.description</description>
 							<config>
 								<type>select</type>
 								<renderType>selectMultipleSideBySide</renderType>
@@ -39,7 +39,8 @@
 
 					<settings.tags>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.listByCategory.tags</label>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.tags</label>
+							<description>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.tags.description</description>
 							<config>
 								<type>select</type>
 								<renderType>selectTree</renderType>
@@ -61,7 +62,7 @@
 
 					<settings.starttime>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.starttime</label>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.starttime</label>
 							<config>
 								<type>input</type>
 								<size>12</size>
@@ -72,7 +73,7 @@
 
 					<settings.endtime>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.endtime</label>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.endtime</label>
 							<config>
 								<type>input</type>
 								<size>12</size>
@@ -83,20 +84,20 @@
 
 					<settings.sortBy>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.sortBy</label>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.sortBy</label>
 							<config>
 								<type>select</type>
 								<items>
 									<numIndex index="0">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.systemDefault</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.systemDefault</numIndex>
 										<numIndex index="1">typoscript</numIndex>
 									</numIndex>
 									<numIndex index="1">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.dateOfPublication</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.dateOfPublication</numIndex>
 										<numIndex index="1">date</numIndex>
 									</numIndex>
 									<numIndex index="2">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.orderInPageTree</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.orderInPageTree</numIndex>
 										<numIndex index="1">positionInTree</numIndex>
 									</numIndex>
 								</items>
diff --git a/Configuration/FlexForms/ListByCategory.xml b/Configuration/FlexForms/ListByCategory.xml
index 9dbad11..5312f3b 100644
--- a/Configuration/FlexForms/ListByCategory.xml
+++ b/Configuration/FlexForms/ListByCategory.xml
@@ -12,8 +12,8 @@
 				<el>
 					<settings.newsLimitPerPage>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.newsLimitPerPage</label>
-							<description>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.newsLimitPerPage.description</description>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexForm.newsLimitPerPage</label>
+							<description>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexForm.newsLimitPerPage.description</description>
 							<config>
 								<type>input</type>
 								<size>5</size>
@@ -25,8 +25,8 @@
 
 					<settings.categories>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.listByCategory.categories</label>
-							<description>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.listByCategory.categories.description</description>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexForm.categories</label>
+							<description>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexForm.categories.description</description>
 							<config>
 								<type>select</type>
 								<renderType>selectMultipleSideBySide</renderType>
@@ -40,8 +40,8 @@
 
 					<settings.tags>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.listByCategory.tags</label>
-							<description>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.listByCategory.tags.description</description>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.tags</label>
+							<description>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.tags.description</description>
 							<config>
 								<type>select</type>
 								<renderType>selectTree</renderType>
@@ -63,7 +63,7 @@
 
 					<settings.starttime>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.starttime</label>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.starttime</label>
 							<config>
 								<type>input</type>
 								<size>12</size>
@@ -74,7 +74,7 @@
 
 					<settings.endtime>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.endtime</label>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.endtime</label>
 							<config>
 								<type>input</type>
 								<size>12</size>
@@ -85,20 +85,20 @@
 
 					<settings.sortBy>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.sortBy</label>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.sortBy</label>
 							<config>
 								<type>select</type>
 								<items>
 									<numIndex index="0">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.systemDefault</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.systemDefault</numIndex>
 										<numIndex index="1">typoscript</numIndex>
 									</numIndex>
 									<numIndex index="1">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.dateOfPublication</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.dateOfPublication</numIndex>
 										<numIndex index="1">date</numIndex>
 									</numIndex>
 									<numIndex index="2">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.orderInPageTree</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.orderInPageTree</numIndex>
 										<numIndex index="1">positionInTree</numIndex>
 									</numIndex>
 								</items>
@@ -108,20 +108,20 @@
 
 					<settings.sortDirection>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.sortOrder</label>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.sortOrder</label>
 							<config>
 								<type>select</type>
 								<items>
 									<numIndex index="0">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.systemDefault</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.systemDefault</numIndex>
 										<numIndex index="1">typoscript</numIndex>
 									</numIndex>
 									<numIndex index="1">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.desc</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.desc</numIndex>
 										<numIndex index="1">DESC</numIndex>
 									</numIndex>
 									<numIndex index="2">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.asc</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.asc</numIndex>
 										<numIndex index="1">ASC</numIndex>
 									</numIndex>
 								</items>
diff --git a/Configuration/FlexForms/Overview.xml b/Configuration/FlexForms/Overview.xml
index 23ae25f..6460a6e 100644
--- a/Configuration/FlexForms/Overview.xml
+++ b/Configuration/FlexForms/Overview.xml
@@ -45,6 +45,7 @@
 					<settings.newsLimit>
 						<TCEforms>
 							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.newsLimit</label>
+							<description>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.newsLimit.description</description>
 							<config>
 								<type>input</type>
 								<size>5</size>
@@ -64,7 +65,7 @@
 					</settings.onlyNewsWithinThisPageSection>
 					<settings.starttime>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.starttime</label>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.starttime</label>
 							<config>
 								<type>input</type>
 								<size>12</size>
@@ -74,7 +75,7 @@
 					</settings.starttime>
 					<settings.endtime>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.endtime</label>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.endtime</label>
 							<config>
 								<type>input</type>
 								<size>12</size>
@@ -84,20 +85,20 @@
 					</settings.endtime>
 					<settings.sortBy>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.sortBy</label>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.sortBy</label>
 							<config>
 								<type>select</type>
 								<items>
 									<numIndex index="0">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.systemDefault</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.systemDefault</numIndex>
 										<numIndex index="1">typoscript</numIndex>
 									</numIndex>
 									<numIndex index="1">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.dateOfPublication</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.dateOfPublication</numIndex>
 										<numIndex index="1">date</numIndex>
 									</numIndex>
 									<numIndex index="2">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.orderInPageTree</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.orderInPageTree</numIndex>
 										<numIndex index="1">positionInTree</numIndex>
 									</numIndex>
 								</items>
@@ -106,20 +107,20 @@
 					</settings.sortBy>
 					<settings.sortDirection>
 						<TCEforms>
-							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.sortOrder</label>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.sortOrder</label>
 							<config>
 								<type>select</type>
 								<items>
 									<numIndex index="0">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.systemDefault</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.systemDefault</numIndex>
 										<numIndex index="1">typoscript</numIndex>
 									</numIndex>
 									<numIndex index="1">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.desc</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.desc</numIndex>
 										<numIndex index="1">DESC</numIndex>
 									</numIndex>
 									<numIndex index="2">
-										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.listByCategory.flexFrom.asc</numIndex>
+										<numIndex index="0">LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.flexForm.asc</numIndex>
 										<numIndex index="1">ASC</numIndex>
 									</numIndex>
 								</items>
diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf
index fa9d7e1..32d84d6 100644
--- a/Resources/Private/Language/de.locallang_db.xlf
+++ b/Resources/Private/Language/de.locallang_db.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2019-06-11T18:49:59Z">
+	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2019-06-21T20:03:43Z">
 		<header>
 			<type>database</type>
 			<description>Language labels for database tables/fields belonging to extension 'sg_news'</description>
@@ -85,54 +85,82 @@
 				<source><![CDATA[Settings]]></source>
 				<target><![CDATA[Einstellungen]]></target>
 			</trans-unit>
-			<trans-unit id="plugin.latest.flexForm.newsLimit" approved="yes">
-				<source><![CDATA[Max. number of news in front-end]]></source>
-				<target><![CDATA[Max. Anzahl von News im Frontend]]></target>
-			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.asc" approved="yes">
+			<trans-unit id="plugin.flexForm.asc" approved="yes">
 				<source><![CDATA[Ascending]]></source>
 				<target><![CDATA[Aufsteigend]]></target>
 			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.dateOfPublication" approved="yes">
+			<trans-unit id="plugin.flexForm.dateOfPublication" approved="yes">
 				<source><![CDATA[Date of publication]]></source>
 				<target><![CDATA[Tag der Veröffentlichung]]></target>
 			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.desc" approved="yes">
+			<trans-unit id="plugin.flexForm.desc" approved="yes">
 				<source><![CDATA[Descending]]></source>
 				<target><![CDATA[Absteigend]]></target>
 			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.orderInPageTree" approved="yes">
+			<trans-unit id="plugin.flexForm.endtime" approved="yes">
+				<source><![CDATA[Only show news published before]]></source>
+				<target><![CDATA[Zeige nur News veröffentlicht vor]]></target>
+			</trans-unit>
+			<trans-unit id="plugin.flexForm.orderInPageTree" approved="yes">
 				<source><![CDATA[Order in pagetree]]></source>
 				<target><![CDATA[Reihenfolge im Seitenbaum]]></target>
 			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.sortBy" approved="yes">
+			<trans-unit id="plugin.flexForm.sortBy" approved="yes">
 				<source><![CDATA[Sort by]]></source>
 				<target><![CDATA[Sortieren nach]]></target>
 			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.sortOrder" approved="yes">
+			<trans-unit id="plugin.flexForm.sortOrder" approved="yes">
 				<source><![CDATA[Sort order]]></source>
 				<target><![CDATA[Sortierreihenfolge]]></target>
 			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.systemDefault" approved="yes">
+			<trans-unit id="plugin.flexForm.starttime" approved="yes">
+				<source><![CDATA[Only show news published after]]></source>
+				<target><![CDATA[Zeige nur News veröffentlicht nach]]></target>
+			</trans-unit>
+			<trans-unit id="plugin.flexForm.systemDefault" approved="yes">
 				<source><![CDATA[System default]]></source>
 				<target><![CDATA[Systemstandard]]></target>
 			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.categories" approved="yes">
+			<trans-unit id="plugin.flexForm.tags" approved="yes">
+				<source><![CDATA[Tags]]></source>
+				<target><![CDATA[Tags]]></target>
+			</trans-unit>
+			<trans-unit id="plugin.flexForm.tags.description" approved="yes">
+				<source><![CDATA[If none are selected, news pages with any and without tags will be displayed.]]></source>
+				<target><![CDATA[Wenn keine ausgewählt sind, werden News aller Tags und ohne Tags angezeigt.]]></target>
+			</trans-unit>
+			<trans-unit id="plugin.latest.flexForm.categories" approved="yes">
 				<source><![CDATA[Categories]]></source>
 				<target><![CDATA[Kategorien]]></target>
 			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.categories.description" approved="yes">
+			<trans-unit id="plugin.latest.flexForm.categories.description" approved="yes">
 				<source><![CDATA[If none are selected, news from all categories will be displayed.]]></source>
 				<target><![CDATA[Wenn keine ausgewählt sind, werden News aller Kategorien angezeigt.]]></target>
 			</trans-unit>
+			<trans-unit id="plugin.latest.flexForm.newsLimit" approved="yes">
+				<source><![CDATA[Max. number of news in front-end]]></source>
+				<target><![CDATA[Max. Anzahl von News im Frontend]]></target>
+			</trans-unit>
+			<trans-unit id="plugin.listByCategory.flexForm.categories" approved="yes">
+				<source><![CDATA[Categories]]></source>
+				<target><![CDATA[Kategorien]]></target>
+			</trans-unit>
+			<trans-unit id="plugin.listByCategory.flexForm.categories.description" approved="yes">
+				<source><![CDATA[If none are selected, only news subpages of the current page are taken into account. If more than one category is selected the pagination breaks so you need to make sure to set the news limit high enough to display all news on one page.]]></source>
+				<target><![CDATA[Falls keine ausgewählt werden, werden nur News-Unterseiten der aktuellen Seite beachtet. Falls mehr als eine Kategorie ausgewählt ist, bricht die Paginierung, deshalb muss sichergestellt werden, dass das Anzeigelimit ausreichend hoch eingestellt ist, dass alle News auf einer Seite angezeigt werden.]]></target>
+			</trans-unit>
+			<trans-unit id="plugin.listByCategory.flexForm.newsLimitPerPage" approved="yes">
+				<source><![CDATA[News Limit per Page]]></source>
+				<target><![CDATA[News-Limit pro Seite]]></target>
+			</trans-unit>
+			<trans-unit id="plugin.listByCategory.flexForm.newsLimitPerPage.description" approved="yes">
+				<source><![CDATA[only if endless scrolling is not enabled]]></source>
+				<target><![CDATA[nur wenn Endless Scrolling nicht aktiv ist]]></target>
+			</trans-unit>
 			<trans-unit id="plugin.overview.flexForm.enableFilter" approved="yes">
 				<source><![CDATA[Enable filtering by criteria that are not grouped in tabs]]></source>
 				<target><![CDATA[Filtern nach Kriterien, die nicht in Tabs sortiert sind, ermöglichen]]></target>
 			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.endtime" approved="yes">
-				<source><![CDATA[Only show news published before]]></source>
-				<target><![CDATA[Zeige nur News veröffentlicht vor]]></target>
-			</trans-unit>
 			<trans-unit id="plugin.overview.flexForm.groupBy" approved="yes">
 				<source><![CDATA[Group news pages in tabs by]]></source>
 				<target><![CDATA[News-Seiten nach folgendem Kriterium in Tabs gruppieren]]></target>
@@ -149,31 +177,11 @@
 				<source><![CDATA[Tags]]></source>
 				<target><![CDATA[Tags]]></target>
 			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.listByCategory.categories" approved="yes">
-				<source><![CDATA[Categories]]></source>
-				<target><![CDATA[Kategorien]]></target>
-			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.listByCategory.categories.description" approved="yes">
-				<source><![CDATA[If none are selected, only news subpages of the current page are taken into account. If more than one category is selected the pagination breaks so you need to make sure to set the news limit high enough to display all news on one page.]]></source>
-				<target><![CDATA[Falls keine ausgewählt werden, werden nur News-Unterseiten der aktuellen Seite beachtet. Falls mehr als eine Kategorie ausgewählt ist, bricht die Paginierung, deshalb muss sichergestellt werden, dass das Anzeigelimit ausreichend hoch eingestellt ist, dass alle News auf einer Seite angezeigt werden.]]></target>
-			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.listByCategory.tags" approved="yes">
-				<source><![CDATA[Tags]]></source>
-				<target><![CDATA[Tags]]></target>
-			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.listByCategory.tags.description" approved="yes">
-				<source><![CDATA[If none are selected, news pages with any and without tags will be displayed.]]></source>
-				<target><![CDATA[Wenn keine ausgewählt sind, werden News aller Tags und ohne Tags angezeigt.]]></target>
-			</trans-unit>
 			<trans-unit id="plugin.overview.flexForm.newsLimit" approved="yes">
-				<source><![CDATA[Max. number of news (if endless scrolling is disabled)]]></source>
-				<target><![CDATA[Max. Anzahl von News (falls Unendliches Scrolling deaktiviert ist)]]></target>
+				<source><![CDATA[Max. number of news]]></source>
+				<target><![CDATA[Max. Anzahl von News]]></target>
 			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.newsLimitPerPage" approved="yes">
-				<source><![CDATA[News Limit per Page]]></source>
-				<target><![CDATA[News-Limit pro Seite]]></target>
-			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.newsLimitPerPage.description" approved="yes">
+			<trans-unit id="plugin.overview.flexForm.newsLimit.description" approved="yes">
 				<source><![CDATA[only if endless scrolling is not enabled]]></source>
 				<target><![CDATA[nur wenn Endless Scrolling nicht aktiv ist]]></target>
 			</trans-unit>
@@ -181,10 +189,6 @@
 				<source><![CDATA[Include only news subpages of the page containing this overview]]></source>
 				<target><![CDATA[Beachte nur News-Unterseiten der Seite, die diese Ãœbersicht beinhaltet]]></target>
 			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.starttime" approved="yes">
-				<source><![CDATA[Only show news published after]]></source>
-				<target><![CDATA[Zeige nur News veröffentlicht nach]]></target>
-			</trans-unit>
 		</body>
 	</file>
 </xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
index 8b01107..3a4b39f 100644
--- a/Resources/Private/Language/locallang_db.xlf
+++ b/Resources/Private/Language/locallang_db.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2019-06-11T18:49:59Z">
+	<file source-language="en" datatype="plaintext" original="messages" date="2019-06-21T20:03:43Z">
 		<header>
 			<type>database</type>
 			<description>Language labels for database tables/fields belonging to extension 'sg_news'</description>
@@ -66,42 +66,63 @@
 			<trans-unit id="plugin.flexForm">
 				<source><![CDATA[Settings]]></source>
 			</trans-unit>
-			<trans-unit id="plugin.latest.flexForm.newsLimit">
-				<source><![CDATA[Max. number of news in front-end]]></source>
-			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.asc">
+			<trans-unit id="plugin.flexForm.asc">
 				<source><![CDATA[Ascending]]></source>
 			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.dateOfPublication">
+			<trans-unit id="plugin.flexForm.dateOfPublication">
 				<source><![CDATA[Date of publication]]></source>
 			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.desc">
+			<trans-unit id="plugin.flexForm.desc">
 				<source><![CDATA[Descending]]></source>
 			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.orderInPageTree">
+			<trans-unit id="plugin.flexForm.endtime">
+				<source><![CDATA[Only show news published before]]></source>
+			</trans-unit>
+			<trans-unit id="plugin.flexForm.orderInPageTree">
 				<source><![CDATA[Order in pagetree]]></source>
 			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.sortBy">
+			<trans-unit id="plugin.flexForm.sortBy">
 				<source><![CDATA[Sort by]]></source>
 			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.sortOrder">
+			<trans-unit id="plugin.flexForm.sortOrder">
 				<source><![CDATA[Sort order]]></source>
 			</trans-unit>
-			<trans-unit id="plugin.listByCategory.flexFrom.systemDefault">
+			<trans-unit id="plugin.flexForm.starttime">
+				<source><![CDATA[Only show news published after]]></source>
+			</trans-unit>
+			<trans-unit id="plugin.flexForm.systemDefault">
 				<source><![CDATA[System default]]></source>
 			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.categories">
+			<trans-unit id="plugin.flexForm.tags">
+				<source><![CDATA[Tags]]></source>
+			</trans-unit>
+			<trans-unit id="plugin.flexForm.tags.description">
+				<source><![CDATA[If none are selected, news pages with any and without tags will be displayed.]]></source>
+			</trans-unit>
+			<trans-unit id="plugin.latest.flexForm.categories">
 				<source><![CDATA[Categories]]></source>
 			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.categories.description">
+			<trans-unit id="plugin.latest.flexForm.categories.description">
 				<source><![CDATA[If none are selected, news from all categories will be displayed.]]></source>
 			</trans-unit>
+			<trans-unit id="plugin.latest.flexForm.newsLimit">
+				<source><![CDATA[Max. number of news in front-end]]></source>
+			</trans-unit>
+			<trans-unit id="plugin.listByCategory.flexForm.categories">
+				<source><![CDATA[Categories]]></source>
+			</trans-unit>
+			<trans-unit id="plugin.listByCategory.flexForm.categories.description">
+				<source><![CDATA[If none are selected, only news subpages of the current page are taken into account. If more than one category is selected the pagination breaks so you need to make sure to set the news limit high enough to display all news on one page.]]></source>
+			</trans-unit>
+			<trans-unit id="plugin.listByCategory.flexForm.newsLimitPerPage">
+				<source><![CDATA[News Limit per Page]]></source>
+			</trans-unit>
+			<trans-unit id="plugin.listByCategory.flexForm.newsLimitPerPage.description">
+				<source><![CDATA[only if endless scrolling is not enabled]]></source>
+			</trans-unit>
 			<trans-unit id="plugin.overview.flexForm.enableFilter">
 				<source><![CDATA[Enable filtering by criteria that are not grouped in tabs]]></source>
 			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.endtime">
-				<source><![CDATA[Only show news published before]]></source>
-			</trans-unit>
 			<trans-unit id="plugin.overview.flexForm.groupBy">
 				<source><![CDATA[Group news pages in tabs by]]></source>
 			</trans-unit>
@@ -114,33 +135,15 @@
 			<trans-unit id="plugin.overview.flexForm.groupBy.I.2">
 				<source><![CDATA[Tags]]></source>
 			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.listByCategory.categories">
-				<source><![CDATA[Categories]]></source>
-			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.listByCategory.categories.description">
-				<source><![CDATA[If none are selected, only news subpages of the current page are taken into account. If more than one category is selected the pagination breaks so you need to make sure to set the news limit high enough to display all news on one page.]]></source>
-			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.listByCategory.tags">
-				<source><![CDATA[Tags]]></source>
-			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.listByCategory.tags.description">
-				<source><![CDATA[If none are selected, news pages with any and without tags will be displayed.]]></source>
-			</trans-unit>
 			<trans-unit id="plugin.overview.flexForm.newsLimit">
-				<source><![CDATA[Max. number of news (if endless scrolling is disabled)]]></source>
+				<source><![CDATA[Max. number of news]]></source>
 			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.newsLimitPerPage">
-				<source><![CDATA[News Limit per Page]]></source>
-			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.newsLimitPerPage.description">
+			<trans-unit id="plugin.overview.flexForm.newsLimit.description">
 				<source><![CDATA[only if endless scrolling is not enabled]]></source>
 			</trans-unit>
 			<trans-unit id="plugin.overview.flexForm.onlyNewsWithinThisPageSection">
 				<source><![CDATA[Include only news subpages of the page containing this overview]]></source>
 			</trans-unit>
-			<trans-unit id="plugin.overview.flexForm.starttime">
-				<source><![CDATA[Only show news published after]]></source>
-			</trans-unit>
 		</body>
 	</file>
 </xliff>
\ No newline at end of file
-- 
GitLab