From a9566c33d162d795c09468b71db049ccfbde919d Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 10 Sep 2016 13:12:35 +0200
Subject: [PATCH] Added missing language variables

---
 .../files/acp/templates/articleAdd.tpl        |  6 +--
 .../install/files/acp/templates/boxAdd.tpl    |  6 +--
 .../install/files/acp/templates/mediaList.tpl |  5 +--
 wcfsetup/install/lang/de.xml                  | 40 +++++++++++++++++--
 wcfsetup/install/lang/en.xml                  | 10 +++--
 5 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl
index 4f3989bbd5..875a0f6ddb 100644
--- a/wcfsetup/install/files/acp/templates/articleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl
@@ -30,7 +30,7 @@
 		
 		require(['WoltLabSuite/Core/Media/Manager/Select'], function(MediaManagerSelect) {
 			new MediaManagerSelect({
-				dialogTitle: '{lang}wcf.acp.media.chooseImage{/lang}',
+				dialogTitle: '{lang}wcf.media.chooseImage{/lang}',
 				fileTypeFilters: {
 					isImage: 1
 				}
@@ -164,7 +164,7 @@
 								{@$images[0]->getThumbnailTag('small')}
 							{/if}
 						</div>
-						<p class="button jsMediaSelectButton" data-store="imageID0" data-display="imageDisplay">{lang}wcf.acp.media.chooseImage{/lang}</p>
+						<p class="button jsMediaSelectButton" data-store="imageID0" data-display="imageDisplay">{lang}wcf.media.chooseImage{/lang}</p>
 						<input type="hidden" name="imageID[0]" id="imageID0"{if $imageID[0]|isset} value="{@$imageID[0]}"{/if}>
 						{if $errorField == 'image'}
 							<small class="innerError">{lang}wcf.acp.article.image.error.{@$errorType}{/lang}</small>
@@ -278,7 +278,7 @@
 											{@$images[$availableLanguage->languageID]->getThumbnailTag('small')}
 										{/if}
 									</div>
-									<p class="button jsMediaSelectButton" data-store="imageID{@$availableLanguage->languageID}" data-display="imageDisplay{@$availableLanguage->languageID}">{lang}wcf.acp.media.chooseImage{/lang}</p>
+									<p class="button jsMediaSelectButton" data-store="imageID{@$availableLanguage->languageID}" data-display="imageDisplay{@$availableLanguage->languageID}">{lang}wcf.media.chooseImage{/lang}</p>
 									<input type="hidden" name="imageID[{@$availableLanguage->languageID}]" id="imageID{@$availableLanguage->languageID}"{if $imageID[$availableLanguage->languageID]|isset} value="{@$imageID[$availableLanguage->languageID]}"{/if}>
 									{if $errorField == 'image'|concat:$availableLanguage->languageID}
 										<small class="innerError">{lang}wcf.acp.article.image.error.{@$errorType}{/lang}</small>
diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl
index 6a259f760d..33d22a70ba 100644
--- a/wcfsetup/install/files/acp/templates/boxAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl
@@ -27,7 +27,7 @@
 			AcpUiBoxHandler.init(handlers);
 			
 			new MediaManagerSelect({
-				dialogTitle: '{lang}wcf.acp.media.chooseImage{/lang}',
+				dialogTitle: '{lang}wcf.media.chooseImage{/lang}',
 				fileTypeFilters: {
 					isImage: 1
 				}
@@ -253,7 +253,7 @@
 										{@$images[0]->getThumbnailTag('small')}
 									{/if}
 								</div>
-								<p class="button jsMediaSelectButton" data-store="imageID0" data-display="imageDisplay">{lang}wcf.acp.media.chooseImage{/lang}</p>
+								<p class="button jsMediaSelectButton" data-store="imageID0" data-display="imageDisplay">{lang}wcf.media.chooseImage{/lang}</p>
 								<input type="hidden" name="imageID[0]" id="imageID0"{if $imageID[0]|isset} value="{@$imageID[0]}"{/if}>
 								{if $errorField == 'image'}
 									<small class="innerError">{lang}wcf.acp.box.image.error.{@$errorType}{/lang}</small>
@@ -326,7 +326,7 @@
 														{@$images[$availableLanguage->languageID]->getThumbnailTag('small')}
 													{/if}
 												</div>
-												<p class="button jsMediaSelectButton" data-store="imageID{@$availableLanguage->languageID}" data-display="imageDisplay{@$availableLanguage->languageID}">{lang}wcf.acp.media.chooseImage{/lang}</p>
+												<p class="button jsMediaSelectButton" data-store="imageID{@$availableLanguage->languageID}" data-display="imageDisplay{@$availableLanguage->languageID}">{lang}wcf.media.chooseImage{/lang}</p>
 												<input type="hidden" name="imageID[{@$availableLanguage->languageID}]" id="imageID{@$availableLanguage->languageID}"{if $imageID[$availableLanguage->languageID]|isset} value="{@$imageID[$availableLanguage->languageID]}"{/if}>
 												{if $errorField == 'image'|concat:$availableLanguage->languageID}
 													<small class="innerError">{lang}wcf.acp.box.image.error.{@$errorType}{/lang}</small>
diff --git a/wcfsetup/install/files/acp/templates/mediaList.tpl b/wcfsetup/install/files/acp/templates/mediaList.tpl
index 12ac77e78b..8613705ce5 100644
--- a/wcfsetup/install/files/acp/templates/mediaList.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaList.tpl
@@ -1,4 +1,4 @@
-{include file='header' pageTitle='wcf.acp.media.list'}
+{include file='header' pageTitle='wcf.media.media'}
 
 <script data-relocate="true">
 	{include file='mediaJavaScript'}
@@ -16,8 +16,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.media.list{/lang}</h1>
-		<p class="contentHeaderDescription">{lang}wcf.acp.media.stats{/lang}</p>
+		<h1 class="contentTitle">{lang}wcf.media.media{/lang}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index ac8915190d..b86eb37ddb 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -338,6 +338,7 @@
 		<item name="wcf.acp.exceptionLog.search.logFile"><![CDATA[Datei]]></item>
 		<item name="wcf.acp.exceptionLog.exception.date"><![CDATA[Datum]]></item>
 		<item name="wcf.acp.exceptionLog.exception.userAgent"><![CDATA[Browser]]></item>
+		<item name="wcf.acp.exceptionLog.exception.memory"><![CDATA[Arbeitsspeicher]]></item>
 	</category>
 	
 	<category name="wcf.acp.group">
@@ -648,10 +649,6 @@
 		<item name="wcf.acp.masterPassword.init"><![CDATA[Hauptkennwort festlegen]]></item>
 		<item name="wcf.acp.masterPassword.init.description"><![CDATA[Das Hauptkennwort ist ein zusätzlicher Schutz für sicherheitskritische Funktionen. {if LANGUAGE_USE_INFORMAL_VARIANT}Du solltest{else}Sie sollten{/if} ein möglichst sicheres Kennwort verwenden, dass sich von {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} regulären Administrator-Kennwort unterscheidet, Dritten nicht bekannt ist und auch nicht auf anderen Internetseiten verwendet wird.]]></item>
 	</category>
-	
-	<category name="wcf.acp.media">
-		<item name="wcf.acp.media.chooseImage"><![CDATA[Bild auswählen]]></item>
-	</category>
 		
 	<category name="wcf.acp.menu">
 		<item name="wcf.acp.menu.link.management"><![CDATA[Verwaltung]]></item>
@@ -2581,6 +2578,41 @@ Fehler sind beispielsweise:
 		<item name="wcf.map.useLocationSuggestion"><![CDATA[Ort verwenden]]></item>
 	</category>
 	
+	<category name="wcf.media">
+		<item name="wcf.media.altText"><![CDATA[Alternativ-Text]]></item>
+		<item name="wcf.media.button.insert"><![CDATA[Einfügen]]></item>
+		<item name="wcf.media.button.select"><![CDATA[Auswählen]]></item>
+		<item name="wcf.media.caption"><![CDATA[Bildunterschrift]]></item>
+		<item name="wcf.media.chooseImage"><![CDATA[Bild auswählen]]></item>
+		<item name="wcf.media.delete.confirmMessage"><![CDATA[Möchten Sie die Datei <span class="confirmationObject">{$title}</span> wirklich löschen?]]></item>
+		<item name="wcf.media.edit"><![CDATA[Datei bearbeiten]]></item>
+		<item name="wcf.media.filename"><![CDATA[Dateiname]]></item>
+		<item name="wcf.media.filesize"><![CDATA[Dateigröße]]></item>
+		<item name="wcf.media.imageDimensions"><![CDATA[Bildformat]]></item>
+		<item name="wcf.media.imageDimensions.value"><![CDATA[{#$media->width}×{#$media->height}]]></item>
+		<item name="wcf.media.insert"><![CDATA[Datei einfügen]]></item>
+		<item name="wcf.media.insert.imageSize"><![CDATA[Bildgröße]]></item>
+		<item name="wcf.media.insert.imageSize.large"><![CDATA[Großes Vorschaubild]]></item>
+		<item name="wcf.media.insert.imageSize.medium"><![CDATA[Mittleres Vorschaubild]]></item>
+		<item name="wcf.media.insert.imageSize.original"><![CDATA[Original-Bild]]></item>
+		<item name="wcf.media.insert.imageSize.small"><![CDATA[Kleines Vorschaubild]]></item>
+		<item name="wcf.media.isMultilingual"><![CDATA[Mehrsprachigkeit aktivieren]]></item>
+		<item name="wcf.media.languageID"><![CDATA[Sprache]]></item>
+		<item name="wcf.media.manager"><![CDATA[Medien verwalten]]></item>
+		<item name="wcf.media.media"><![CDATA[Medien]]></item>
+		<item name="wcf.media.search.cancel"><![CDATA[Suche abbrechen]]></item>
+		<item name="wcf.media.search.filetype"><![CDATA[Dateityp]]></item>
+		<item name="wcf.media.search.filetype.all"><![CDATA[Alle]]></item>
+		<item name="wcf.media.search.filetype.image"><![CDATA[Bilder]]></item>
+		<item name="wcf.media.search.filetype.other"><![CDATA[Sonstige]]></item>
+		<item name="wcf.media.search.filetype.pdf"><![CDATA[PDF]]></item>
+		<item name="wcf.media.search.filetype.text"><![CDATA[Text]]></item>
+		<item name="wcf.media.search.placeholder"><![CDATA[Datei suchen]]></item>
+		<item name="wcf.media.upload.success"><![CDATA[Die Datei wurde erfolgreich hochgeladen.]]></item>
+		<item name="wcf.media.uploader"><![CDATA[Hochgeladen von]]></item>
+		<item name="wcf.media.uploadTime"><![CDATA[Datum hochgeladen]]></item>
+	</category>
+	
 	<category name="wcf.message">
 		<item name="wcf.message.autosave.prompt"><![CDATA[Gespeicherten Entwurf wiederherstellen?]]></item>
 		<item name="wcf.message.autosave.prompt.confirm"><![CDATA[Entwurf wiederherstellen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 78dd89342a..746b28d254 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -337,6 +337,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.exceptionLog.search.logFile"><![CDATA[Logfile]]></item>
 		<item name="wcf.acp.exceptionLog.exception.date"><![CDATA[Time]]></item>
 		<item name="wcf.acp.exceptionLog.exception.userAgent"><![CDATA[User Agent]]></item>
+		<item name="wcf.acp.exceptionLog.exception.memory"><![CDATA[Memory]]></item>
 	</category>
 	
 	<category name="wcf.acp.group">
@@ -648,10 +649,6 @@ Examples for medium ID detection:
 		<item name="wcf.acp.masterPassword.init.description"><![CDATA[The master password is the last line of defense, protecting both critical settings and sensitive data. One should choose a rather strong password which is neither known to any 3rd party person nor re-used on other web pages.]]></item>
 	</category>
 	
-	<category name="wcf.acp.media">
-		<item name="wcf.acp.media.chooseImage"><![CDATA[Select Image]]></item>
-	</category>
-	
 	<category name="wcf.acp.menu">
 		<item name="wcf.acp.menu.link.management"><![CDATA[Management]]></item>
 		<item name="wcf.acp.menu.link.maintenance"><![CDATA[Maintenance]]></item>
@@ -2549,7 +2546,9 @@ Errors are:
 	<category name="wcf.media">
 		<item name="wcf.media.altText"><![CDATA[Alternate Text]]></item>
 		<item name="wcf.media.button.insert"><![CDATA[Insert]]></item>
+		<item name="wcf.media.button.select"><![CDATA[Select]]></item>
 		<item name="wcf.media.caption"><![CDATA[Caption]]></item>
+		<item name="wcf.media.chooseImage"><![CDATA[Select Image]]></item>
 		<item name="wcf.media.delete.confirmMessage"><![CDATA[Do you really want to delete the media file <span class="confirmationObject">{$title}</span>?]]></item>
 		<item name="wcf.media.edit"><![CDATA[Edit Media File]]></item>
 		<item name="wcf.media.filename"><![CDATA[Filename]]></item>
@@ -2565,15 +2564,18 @@ Errors are:
 		<item name="wcf.media.isMultilingual"><![CDATA[Enable Multilingualism]]></item>
 		<item name="wcf.media.languageID"><![CDATA[Language]]></item>
 		<item name="wcf.media.manager"><![CDATA[Manage Media]]></item>
+		<item name="wcf.media.media"><![CDATA[Media]]></item>
 		<item name="wcf.media.search.cancel"><![CDATA[Cancel Search]]></item>
 		<item name="wcf.media.search.filetype"><![CDATA[File Types]]></item>
 		<item name="wcf.media.search.filetype.all"><![CDATA[All File Types]]></item>
 		<item name="wcf.media.search.filetype.image"><![CDATA[Images]]></item>
 		<item name="wcf.media.search.filetype.other"><![CDATA[Other]]></item>
+		<item name="wcf.media.search.filetype.pdf"><![CDATA[PDF]]></item>
 		<item name="wcf.media.search.filetype.text"><![CDATA[Texts]]></item>
 		<item name="wcf.media.search.placeholder"><![CDATA[Search Files]]></item>
 		<item name="wcf.media.upload.success"><![CDATA[The file has been successfully uploaded.]]></item>
 		<item name="wcf.media.uploader"><![CDATA[Uploaded By]]></item>
+		<item name="wcf.media.uploadTime"><![CDATA[Upload Date]]></item>
 	</category>
 	
 	<category name="wcf.message">
-- 
2.20.1