From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 28 Nov 2011 15:39:06 +0000 (-0800)
Subject: Merge pull request #241 from gianluca311/master
X-Git-Tag: 2.0.0_Beta_1~1545^2~3^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=04e433e8b2514d5c42701f646ca2c4ec55827f19;p=GitHub%2FWoltLab%2FWCF.git

Merge pull request #241 from gianluca311/master

Language option addition
---

04e433e8b2514d5c42701f646ca2c4ec55827f19
diff --cc wcfsetup/install/lang/de.xml
index bc028fb777,13999c429b..5341e0a863
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -260,14 -260,10 +260,17 @@@
  		<item name="wcf.acp.option.timezone"><![CDATA[Zeitzone]]></item>
  		<item name="wcf.acp.option.timezone.description"><![CDATA[Standard-Zeitzone Ihrer Seite]]></item>
  		<item name="wcf.acp.option.import.success"><![CDATA[Die Optionen wurden erfolgreich importiert.]]></item>
+ 		<item name="wcf.acp.option.image_adapter_type"><![CDATA[Bildmanipulation]]></item>
+ 		<item name="wcf.acp.option.image_adapter_type.gd"><![CDATA[GD Library (Standard)]]></item>
+ 		<item name="wcf.acp.option.image_adapter_type.imagick"><![CDATA[ImageMagick]]></item>
  	</category>
 +
 +	<category name="wcf.acp.package">
 +		<item name="wcf.acp.package.installation.step.install"><![CDATA[&bdquo;{$packageName}&ldquo; wird installiert &hellip;]]></item>
 +		<item name="wcf.acp.package.installation.step.install.success"><![CDATA[Installation abgeschlossen]]></item>
 +		<item name="wcf.acp.package.installation.step.prepare"><![CDATA[Installation wird vorbereitet &hellip;]]></item>
 +		<item name="wcf.acp.package.installation.title"><![CDATA[Installation]]></item>
 +	</category>
  	
  	<category name="wcf.acp.updateServer">
  		<item name="wcf.acp.updateServer.add"><![CDATA[Server hinzufügen]]></item>
diff --cc wcfsetup/install/lang/en.xml
index 792f124305,3f90125535..9c8d6d4537
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -260,14 -260,10 +260,17 @@@
  		<item name="wcf.acp.option.timezone"><![CDATA[Time zone offset]]></item>
  		<item name="wcf.acp.option.timezone.description"><![CDATA[Choose the default time zone for your site.]]></item>
  		<item name="wcf.acp.option.import.success"><![CDATA[The options have been successfully imported.]]></item>
+ 		<item name="wcf.acp.option.image_adapter_type"><![CDATA[Image library]]></item>
+ 		<item name="wcf.acp.option.image_adapter_type.gd"><![CDATA[GD Library (default)]]></item>
+ 		<item name="wcf.acp.option.image_adapter_type.imagick"><![CDATA[ImageMagick]]></item>
  	</category>
 +
 +	<category name="wcf.acp.package">
 +		<item name="wcf.acp.package.installation.step.install"><![CDATA[Installing &ldquo;{$packageName}&rdquo; &hellip;]]></item>
 +		<item name="wcf.acp.package.installation.step.install.success"><![CDATA[Installation completed]]></item>
 +		<item name="wcf.acp.package.installation.step.prepare"><![CDATA[Prepairing installation &hellip;]]></item>
 +		<item name="wcf.acp.package.installation.title"><![CDATA[Installation]]></item>
 +	</category>
  	
  	<category name="wcf.acp.updateServer">
  		<item name="wcf.acp.updateServer.add"><![CDATA[Add server]]></item>