Merge pull request #241 from gianluca311/master
authorAlexander Ebert <ebert@woltlab.com>
Mon, 28 Nov 2011 15:39:06 +0000 (07:39 -0800)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 28 Nov 2011 15:39:06 +0000 (07:39 -0800)
Language option addition

1  2 
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

index bc028fb777f296e966eb49378116474554703c78,13999c429b9c8586bbac30424aa47952ec457e5a..5341e0a863f7a2dbb84ca5213c1bacb10fe3aadb
                <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>
index 792f12430558fa1626c00c22fe699db378f99da6,3f9012553510b5d653288d0b64227d4786d6cf4f..9c8d6d4537227106574c94960f7cd9517552b75a
                <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>