Language variable overhaul

author Marcel Werk <burntime@woltlab.com>

Tue, 20 Sep 2011 12:39:20 +0000 (14:39 +0200)

committer Marcel Werk <burntime@woltlab.com>

Tue, 20 Sep 2011 12:39:20 +0000 (14:39 +0200)
author Marcel Werk <burntime@woltlab.com>
Tue, 20 Sep 2011 12:39:20 +0000 (14:39 +0200)
committer Marcel Werk <burntime@woltlab.com>
Tue, 20 Sep 2011 12:39:20 +0000 (14:39 +0200)
diff --git a/com.woltlab.wcf/acpmenu.xml b/com.woltlab.wcf/acpmenu.xml

index 2d50de860a7bb3c21f2ccf8795e930168d1e4108..3e928ecfdf094263f5cf93bb7eab5cfd7fe70479 100644 (file)
--- a/com.woltlab.wcf/acpmenu.xml
+++ b/com.woltlab.wcf/acpmenu.xml
@@ -62,7 +62,7 @@
                         <showorder>2</showorder>
                 </acpmenuitem>
                 
-               <acpmenuitem name="wcf.acp.menu.link.autoupdate">
+               <acpmenuitem name="wcf.acp.menu.link.package.autoupdate">
                         <icon>icon/updateM.png</icon>
                         <link>index.php?page=PackageAutoUpdateList</link>
                         <parent>wcf.acp.menu.link.package.update</parent>
@@ -98,67 +98,53 @@
                 </acpmenuitem>
                 <!-- /packages -->      
                 
-               <!-- maintenance -->
-               <acpmenuitem name="wcf.acp.menu.link.maintenance">
+               <!-- cronjobs -->
+               <acpmenuitem name="wcf.acp.menu.link.cronjob">
                         <parent>wcf.acp.menu.link.system</parent>
                         <showorder>3</showorder>
                 </acpmenuitem>
-               <!-- /maintenance -->
                 
-               <!-- log -->
-               <acpmenuitem name="wcf.acp.menu.link.log">
-                       <parent>wcf.acp.menu.link.system</parent>
-                       <showorder>4</showorder>
+               <acpmenuitem name="wcf.acp.menu.link.cronjob.list">
+                       <icon>icon/cronjobM.png</icon>
+                       <link>index.php?page=CronjobList</link>
+                       <parent>wcf.acp.menu.link.cronjob</parent>
+                       <permissions>admin.system.cronjobs.canEditCronjob,admin.system.cronjob.canDeleteCronjob,admin.system.cronjobs.canEnableDisableCronjob</permissions>
+                       <showorder>1</showorder>
                 </acpmenuitem>
                 
-               <acpmenuitem name="wcf.acp.menu.link.log.system">
-                       <parent>wcf.acp.menu.link.log</parent>
+               <acpmenuitem name="wcf.acp.menu.link.cronjob.add">
+                       <link>index.php?form=CronjobAdd</link>
+                       <parent>wcf.acp.menu.link.cronjob</parent>
+                       <permissions>admin.system.cronjob.canAddCronjob</permissions>
+                       <showorder>2</showorder>
                 </acpmenuitem>
+               <!-- /cronjobs -->
                 
-               <acpmenuitem name="wcf.acp.menu.link.log.additional">
-                       <parent>wcf.acp.menu.link.log</parent>
+               <!-- log -->
+               <acpmenuitem name="wcf.acp.menu.link.log">
+                       <parent>wcf.acp.menu.link.system</parent>
+                       <showorder>4</showorder>
                 </acpmenuitem>
                 
                 <acpmenuitem name="wcf.acp.menu.link.log.session">
                         <icon>icon/sessionLogM.png</icon>
                         <link>index.php?page=ACPSessionLogList</link>
-                       <parent>wcf.acp.menu.link.log.system</parent>
+                       <parent>wcf.acp.menu.link.log</parent>
                         <permissions>admin.system.canViewLog</permissions>
                 </acpmenuitem>
                 
                 <acpmenuitem name="wcf.acp.menu.link.log.cache">
                         <link>index.php?page=CacheList</link>
-                       <parent>wcf.acp.menu.link.log.system</parent>
+                       <parent>wcf.acp.menu.link.log</parent>
                         <permissions>admin.system.canViewLog</permissions>
                 </acpmenuitem>
-               <!-- /log -->
-               
-               <!-- cronjobs -->
-               <acpmenuitem name="wcf.acp.menu.link.cronjob">
-                       <parent>wcf.acp.menu.link.maintenance</parent>
-               </acpmenuitem>
-               
-               <acpmenuitem name="wcf.acp.menu.link.cronjob.list">
-                       <icon>icon/cronjobM.png</icon>
-                       <link>index.php?page=CronjobList</link>
-                       <parent>wcf.acp.menu.link.cronjob</parent>
-                       <permissions>admin.system.cronjobs.canEditCronjob,admin.system.cronjob.canDeleteCronjob,admin.system.cronjobs.canEnableDisableCronjob</permissions>
-                       <showorder>1</showorder>
-               </acpmenuitem>
-               
-               <acpmenuitem name="wcf.acp.menu.link.cronjob.add">
-                       <link>index.php?form=CronjobAdd</link>
-                       <parent>wcf.acp.menu.link.cronjob</parent>
-                       <permissions>admin.system.cronjob.canAddCronjob</permissions>
-                       <showorder>2</showorder>
-               </acpmenuitem>
                 
-               <acpmenuitem name="wcf.acp.menu.link.cronjob.showLog">
+               <acpmenuitem name="wcf.acp.menu.link.log.cronjob">
                         <link>index.php?page=CronjobLogList</link>
-                       <parent>wcf.acp.menu.link.log.system</parent>
+                       <parent>wcf.acp.menu.link.log</parent>
                         <permissions>admin.system.cronjob.canEditCronjob,admin.system.cronjob.canDeleteCronjob</permissions>
                 </acpmenuitem>
-               <!-- /cronjobs -->
+               <!-- /log -->
                 
                 <acpmenuitem name="wcf.acp.menu.link.user">
                         <icon>icon/usersL.png</icon>
diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml

index 090bf9f06b733849670df01b7068ee7d486c3fff..31812b19edddc4a1b858a1f02ac33ebb7101c0fc 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -206,13 +206,8 @@ imagick:wcf.acp.option.image_adapter_type.imagick]]>
                         </option>
                         <option name="session_validate_ip_address">
                                 <categoryname>security.general.session</categoryname>
-                               <optiontype>select</optiontype>
-                               <selectoptions>0
-1
-2
-3
-4</selectoptions>
-                               <defaultvalue>2</defaultvalue>
+                               <optiontype>boolean</optiontype>
+                               <defaultvalue>0</defaultvalue>
                         </option>
                         <option name="session_validate_user_agent">
                                 <categoryname>security.general.session</categoryname>
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl

index 4501188c8148ed9a59abb4031a12890584c3dfc6..5cda6624e27c2f16a780aeccb7beafa0333c506d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
@@ -1,7 +1,5 @@
  {include file='header'}
  
-<script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
-
  <header class="mainHeading">
         <img src="{@RELATIVE_WCF_DIR}icon/session1.svg" alt="" />
         <hgroup>
@@ -22,13 +20,13 @@
                 <table>
                         <thead>
                                 <tr>
-                                       <th class="columnSessionAccessLogID{if $sortField == 'sessionAccessLogID'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=sessionAccessLogID&amp;sortOrder={if $sortField == 'sessionAccessLogID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.sessionAccessLogID{/lang}{if $sortField == 'sessionAccessLogID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnIpAddress{if $sortField == 'ipAddress'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=ipAddress&amp;sortOrder={if $sortField == 'ipAddress' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.ipAddress{/lang}{if $sortField == 'ipAddress'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnTime{if $sortField == 'time'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=time&amp;sortOrder={if $sortField == 'time' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnPackageName{if $sortField == 'packageName'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=packageName&amp;sortOrder={if $sortField == 'packageName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.packageName{/lang}{if $sortField == 'packageName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnClassName{if $sortField == 'className'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=className&amp;sortOrder={if $sortField == 'className' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.className{/lang}{if $sortField == 'className'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-                                       <th class="columnRequestURI{if $sortField == 'requestURI'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=requestURI&amp;sortOrder={if $sortField == 'requestURI' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.requestURI{/lang}{if $sortField == 'requestURI'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnRequestMethod{if $sortField == 'requestMethod'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=requestMethod&amp;sortOrder={if $sortField == 'requestMethod' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.requestMethod{/lang}{if $sortField == 'requestMethod'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnSessionAccessLogID{if $sortField == 'sessionAccessLogID'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=sessionAccessLogID&amp;sortOrder={if $sortField == 'sessionAccessLogID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.global.objectID{/lang}{if $sortField == 'sessionAccessLogID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnIpAddress{if $sortField == 'ipAddress'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=ipAddress&amp;sortOrder={if $sortField == 'ipAddress' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.ipAddress{/lang}{if $sortField == 'ipAddress'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnDate columnTime{if $sortField == 'time'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=time&amp;sortOrder={if $sortField == 'time' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnPackageName{if $sortField == 'packageName'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=packageName&amp;sortOrder={if $sortField == 'packageName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.packageName{/lang}{if $sortField == 'packageName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnClassName{if $sortField == 'className'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=className&amp;sortOrder={if $sortField == 'className' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.className{/lang}{if $sortField == 'className'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
+                                       <th class="columnText columnRequestURI{if $sortField == 'requestURI'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=requestURI&amp;sortOrder={if $sortField == 'requestURI' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.requestURI{/lang}{if $sortField == 'requestURI'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnRequestMethod{if $sortField == 'requestMethod'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=requestMethod&amp;sortOrder={if $sortField == 'requestMethod' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.requestMethod{/lang}{if $sortField == 'requestMethod'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         
                                         {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if}
                                 </tr>
@@ -37,13 +35,13 @@
                         <tbody>
                         {foreach from=$sessionAccessLogs item=sessionAccessLog}
                                 <tr>
-                                       <td class="columnSessionAccessLogID columnID"><p>{@$sessionAccessLog->sessionAccessLogID}</p></td>
-                                       <td class="columnIpAddress columnText"{if $sessionAccessLog->ipAddress != $sessionLog->ipAddress} style="color: red"{/if}><p>{$sessionAccessLog->ipAddress}</p></td>
-                                       <td class="columnTime columnText"><p>{@$sessionAccessLog->time|time}</p></td>
-                                       <td class="columnPackageName columnText"><p>{$sessionAccessLog->packageName}</p></td>
-                                       <td class="columnClassName columnText"><p>{$sessionAccessLog->className}</p></td>
-                                       <td class="columnRequestURI columnText" title="{$sessionAccessLog->requestURI}"><p>{if !$sessionAccessLog->hasProtectedURI()}<a href="{$sessionAccessLog->requestURI}{@SID_ARG_2ND}">{$sessionAccessLog->requestURI|truncate:50}</a>{else}{$sessionAccessLog->requestURI|truncate:50}{/if}</p></td>
-                                       <td class="columnRequestMethod columnText"><p>{$sessionAccessLog->requestMethod}</p></td>
+                                       <td class="columnID columnSessionAccessLogID"><p>{@$sessionAccessLog->sessionAccessLogID}</p></td>
+                                       <td class="columnText columnIpAddress"{if $sessionAccessLog->ipAddress != $sessionLog->ipAddress} style="color: red"{/if}><p>{$sessionAccessLog->ipAddress}</p></td>
+                                       <td class="columnDate columnTime"><p>{@$sessionAccessLog->time|time}</p></td>
+                                       <td class="columnText columnPackageName"><p>{$sessionAccessLog->packageName}</p></td>
+                                       <td class="columnText columnClassName"><p>{$sessionAccessLog->className}</p></td>
+                                       <td class="columnText columnRequestURI" title="{$sessionAccessLog->requestURI}"><p>{if !$sessionAccessLog->hasProtectedURI()}<a href="{$sessionAccessLog->requestURI}{@SID_ARG_2ND}">{$sessionAccessLog->requestURI|truncate:50}</a>{else}{$sessionAccessLog->requestURI|truncate:50}{/if}</p></td>
+                                       <td class="columnText columnRequestMethod"><p>{$sessionAccessLog->requestMethod}</p></td>
                                         
                                         {if $additionalColumns.$sessionAccessLog->sessionAccessLogID|isset}{@$additionalColumns.$sessionAccessLog->sessionAccessLogID}{/if}
                                 </tr>
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl

index 09ccd5699fdde10d906a59b438a298810c109ea2..bc0c382b6bc074ff9c8a53e9b46e9784b181e28d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
@@ -1,7 +1,5 @@
  {include file='header'}
  
-<script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
-
  <header class="mainHeading">
         <img src="{@RELATIVE_WCF_DIR}icon/session1.svg" alt="" />
         <hgroup>
@@ -22,10 +20,10 @@
                 <table>
                         <thead>
                                 <tr>
-                                       <th class="columnSessionLogID{if $sortField == 'sessionLogID'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=sessionLogID&amp;sortOrder={if $sortField == 'sessionLogID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.sessionLogID{/lang}{if $sortField == 'sessionLogID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnSessionLogID{if $sortField == 'sessionLogID'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=sessionLogID&amp;sortOrder={if $sortField == 'sessionLogID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.global.objectID{/lang}{if $sortField == 'sessionLogID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         <th class="columnTitle columnUsername{if $sortField == 'username'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=username&amp;sortOrder={if $sortField == 'username' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.username{/lang}{if $sortField == 'username'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnURL columnIpAddress{if $sortField == 'ipAddress'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=ipAddress&amp;sortOrder={if $sortField == 'ipAddress' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.ipAddress{/lang}{if $sortField == 'ipAddress'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnText columnUserAgent{if $sortField == 'userAgent'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=userAgent&amp;sortOrder={if $sortField == 'userAgent' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.userAgent{/lang}{if $sortField == 'userAgent'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnURL columnIpAddress{if $sortField == 'ipAddress'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=ipAddress&amp;sortOrder={if $sortField == 'ipAddress' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.ipAddress{/lang}{if $sortField == 'ipAddress'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnUserAgent{if $sortField == 'userAgent'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=userAgent&amp;sortOrder={if $sortField == 'userAgent' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.userAgent{/lang}{if $sortField == 'userAgent'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         <th class="columnDate columnTime{if $sortField == 'time'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=time&amp;sortOrder={if $sortField == 'time' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         <th class="columnDate columnLastActivityTime{if $sortField == 'lastActivityTime'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=lastActivityTime&amp;sortOrder={if $sortField == 'lastActivityTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.lastActivityTime{/lang}{if $sortField == 'lastActivityTime'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         <th class="columnDigits columnAccesses{if $sortField == 'accesses'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=accesses&amp;sortOrder={if $sortField == 'accesses' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.accesses{/lang}{if $sortField == 'accesses'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl

index 9287c9b92293bbf4610e3343f585c6c758e9639e..0d4ffb91c71949cdbfe071850917e06da4886e39 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -13,7 +13,7 @@
  {/if}
  
  {if $success|isset}
-       <p class="success">{lang}wcf.acp.cronjob.{$action}.success{/lang}</p>   
+       <p class="success">{lang}wcf.global.form.{$action}.success{/lang}</p>   
  {/if}
  
  <p class="info">{lang}wcf.acp.cronjob.intro{/lang}</p>
@@ -31,7 +31,7 @@
         <div class="border content">
                 
                 <fieldset>
-                       <legend>{lang}wcf.acp.cronjob.edit.data{/lang}</legend>
+                       <legend>{lang}wcf.acp.cronjob.data{/lang}</legend>
                         
                         <dl id="classNameDiv"{if $errorField == 'className'} class="formError"{/if}>
                                 <dt><label for="className">{lang}wcf.acp.cronjob.className{/lang}</label></dt>
@@ -39,8 +39,8 @@
                                         <input type="text" id="className" name="className" value="{$className}" class="long" />
                                         {if $errorField == 'className'}
                                                 <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.acp.cronjob.error.empty{/lang}{/if}
-                                                       {if $errorType == 'doesNotExist'}{lang}wcf.acp.cronjob.error.doesNotExist{/lang}{/if}
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                                       {if $errorType == 'doesNotExist'}{lang}wcf.acp.cronjob.error.className.doesNotExist{/lang}{/if}
                                                 </small>
                                         {/if}
                                         <small id="classNameHelpMessage">{lang}wcf.acp.cronjob.className.description{/lang}</small>
@@ -57,7 +57,7 @@
                 </fieldset>
                 
                 <fieldset>
-                       <legend>{lang}wcf.acp.cronjob.edit.timing{/lang}</legend>
+                       <legend>{lang}wcf.acp.cronjob.timing{/lang}</legend>
                         
                         <dl id="startMinuteDiv"{if $errorField == 'startMinute'} class="formError"{/if}>
                                 <dt><label for="startMinute">{lang}wcf.acp.cronjob.startMinute{/lang}</label></dt>
@@ -65,7 +65,7 @@
                                         <input type="text" id="startMinute" name="startMinute" value="{$startMinute}" class="short" />
                                         {if $errorField == 'startMinute'}
                                                 <small class="innerError">
-                                                       {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
+                                                       {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.timing.notValid{/lang}{/if}
                                                 </small>
                                         {/if}
                                         <small id="startMinuteHelpMessage">{lang}wcf.acp.cronjob.startMinute.description{/lang}</small>
@@ -78,7 +78,7 @@
                                         <input type="text" id="startHour" name="startHour" value="{$startHour}" class="short" />
                                         {if $errorField == 'startHour'}
                                                 <small class="innerError">
-                                                       {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
+                                                       {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.timing.notValid{/lang}{/if}
                                                 </small>
                                         {/if}
                                         <small id="startHourHelpMessage">{lang}wcf.acp.cronjob.startHour.description{/lang}</small>
@@ -91,7 +91,7 @@
                                         <input type="text" id="startDom" name="startDom" value="{$startDom}" class="short" />
                                         {if $errorField == 'startDom'}
                                                 <small class="innerError">
-                                                       {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
+                                                       {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.timing.notValid{/lang}{/if}
                                                 </small>
                                         {/if}
                                         <small id="startDomHelpMessage">{lang}wcf.acp.cronjob.startDom.description{/lang}</small>
@@ -104,7 +104,7 @@
                                         <input type="text" id="startMonth" name="startMonth" value="{$startMonth}" class="short" />
                                         {if $errorField == 'startMonth'}
                                                 <small class="innerError">
-                                                       {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
+                                                       {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.timing.notValid{/lang}{/if}
                                                 </small>
                                         {/if}
                                         <small id="startMonthHelpMessage">{lang}wcf.acp.cronjob.startMonth.description{/lang}</small>
@@ -117,7 +117,7 @@
                                         <input type="text" id="startDow" name="startDow" value="{$startDow}" class="short" />
                                         {if $errorField == 'startDow'}
                                                 <small class="innerError">
-                                                       {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
+                                                       {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.timing.notValid{/lang}{/if}
                                                 </small>
                                         {/if}
                                         <small id="startDowHelpMessage">{lang}wcf.acp.cronjob.startDow.description{/lang}</small>
diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl

index 69b107926f72d57eeac77249bcceb1f88c3ab8a0..9eca1b2e160ba669bd1c4c23cec8553da590cdd3 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -1,7 +1,5 @@
  {include file='header'}
  
-<script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
-
  <header class="mainHeading">
         <img src="{@RELATIVE_WCF_DIR}icon/time1.svg" alt="" />
         <hgroup>
@@ -61,14 +59,14 @@
                 <table>
                         <thead>
                                 <tr>
-                                       <th class="columnCronjobID{if $sortField == 'cronjobID'} active{/if}" colspan="2"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=cronjobID&amp;sortOrder={if $sortField == 'cronjobID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.cronjobID{/lang}{if $sortField == 'cronjobID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnStartMinute{if $sortField == 'startMinute'} active{/if}" title="{lang}wcf.acp.cronjob.startMinute{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startMinute&amp;sortOrder={if $sortField == 'startMinute' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startMinuteShort{/lang}{if $sortField == 'startMinute'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnStartHour{if $sortField == 'startHour'} active{/if}" title="{lang}wcf.acp.cronjob.startHour{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startHour&amp;sortOrder={if $sortField == 'startHour' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startHourShort{/lang}{if $sortField == 'startHour'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnStartDom{if $sortField == 'startDom'} active{/if}" title="{lang}wcf.acp.cronjob.startDom{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startDom&amp;sortOrder={if $sortField == 'startDom' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startDomShort{/lang}{if $sortField == 'startDom'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnStartMonth{if $sortField == 'startMonth'} active{/if}" title="{lang}wcf.acp.cronjob.startMonth{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startMonth&amp;sortOrder={if $sortField == 'startMonth' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startMonthShort{/lang}{if $sortField == 'startMonth'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnStartDow{if $sortField == 'startDow'} active{/if}" title="{lang}wcf.acp.cronjob.startDow{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startDow&amp;sortOrder={if $sortField == 'startDow' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startDowShort{/lang}{if $sortField == 'startDow'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnDescription{if $sortField == 'description'} active{/if}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=description&amp;sortOrder={if $sortField == 'description' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnNextExec{if $sortField == 'nextExec'} active{/if}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=nextExec&amp;sortOrder={if $sortField == 'nextExec' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.nextExec{/lang}{if $sortField == 'nextExec'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnCronjobID{if $sortField == 'cronjobID'} active{/if}" colspan="2"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=cronjobID&amp;sortOrder={if $sortField == 'cronjobID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.global.objectID{/lang}{if $sortField == 'cronjobID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnStartMinute{if $sortField == 'startMinute'} active{/if}" title="{lang}wcf.acp.cronjob.startMinute{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startMinute&amp;sortOrder={if $sortField == 'startMinute' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startMinuteShort{/lang}{if $sortField == 'startMinute'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnStartHour{if $sortField == 'startHour'} active{/if}" title="{lang}wcf.acp.cronjob.startHour{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startHour&amp;sortOrder={if $sortField == 'startHour' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startHourShort{/lang}{if $sortField == 'startHour'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnStartDom{if $sortField == 'startDom'} active{/if}" title="{lang}wcf.acp.cronjob.startDom{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startDom&amp;sortOrder={if $sortField == 'startDom' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startDomShort{/lang}{if $sortField == 'startDom'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnStartMonth{if $sortField == 'startMonth'} active{/if}" title="{lang}wcf.acp.cronjob.startMonth{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startMonth&amp;sortOrder={if $sortField == 'startMonth' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startMonthShort{/lang}{if $sortField == 'startMonth'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnStartDow{if $sortField == 'startDow'} active{/if}" title="{lang}wcf.acp.cronjob.startDow{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startDow&amp;sortOrder={if $sortField == 'startDow' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startDowShort{/lang}{if $sortField == 'startDow'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnDescription{if $sortField == 'description'} active{/if}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=description&amp;sortOrder={if $sortField == 'description' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnDate columnNextExec{if $sortField == 'nextExec'} active{/if}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=nextExec&amp;sortOrder={if $sortField == 'nextExec' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.nextExec{/lang}{if $sortField == 'nextExec'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         
                                         {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
                                 </tr>
@@ -85,7 +83,7 @@
                                                 {/if}
                                                 
                                                 {if $cronjob->canBeDisabled()}
-                                                       <img src="{@RELATIVE_WCF_DIR}icon/{if $cronjob->active}enabled{else}disabled{/if}1.svg" alt="" data-objectID="{@$cronjob->cronjobID}" data-disableMessage="{lang}wcf.acp.cronjob.disable{/lang}" data-enableMessage="{lang}wcf.acp.cronjob.enable{/lang}" title="{lang}wcf.acp.cronjob.{if $cronjob->active}disable{else}enable{/if}{/lang}" class="toggleButton balloonTooltip" />
+                                                       <img src="{@RELATIVE_WCF_DIR}icon/{if $cronjob->active}enabled{else}disabled{/if}1.svg" alt="" data-objectID="{@$cronjob->cronjobID}" data-disableMessage="{lang}wcf.global.button.disable{/lang}" data-enableMessage="{lang}wcf.global.button.enable{/lang}" title="{lang}wcf.global.button.{if $cronjob->active}disable{else}enable{/if}{/lang}" class="toggleButton balloonTooltip" />
                                                 {else}
                                                         {if $cronjob->active}
                                                                 <img src="{@RELATIVE_WCF_DIR}icon/enabled1D.svg" alt="" title="{lang}wcf.acp.cronjob.disabled{/lang}" />
@@ -95,31 +93,31 @@
                                                 {/if}
                                                 
                                                 {if $cronjob->isEditable()}
-                                                       <a href="index.php?form=CronjobEdit&amp;cronjobID={@$cronjob->cronjobID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.acp.cronjob.edit{/lang}" class="balloonTooltip" /></a>
+                                                       <a href="index.php?form=CronjobEdit&amp;cronjobID={@$cronjob->cronjobID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="balloonTooltip" /></a>
                                                 {else}
                                                         <img src="{@RELATIVE_WCF_DIR}icon/edit1D.svg" alt="" title="{lang}wcf.acp.cronjob.edit.disabled{/lang}" />
                                                 {/if}
                                                 {if $cronjob->isDeletable()}
-                                                       <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" data-objectID="{@$cronjob->cronjobID}" data-confirmMessage="{lang}wcf.acp.cronjob.delete.sure{/lang}" title="{lang}wcf.acp.cronjob.delete{/lang}" class="deleteButton balloonTooltip" />
+                                                       <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" data-objectID="{@$cronjob->cronjobID}" data-confirmMessage="{lang}wcf.acp.cronjob.delete.sure{/lang}" title="{lang}wcf.global.button.delete{/lang}" class="deleteButton balloonTooltip" />
                                                 {else}
                                                         <img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.acp.cronjob.delete.disabled{/lang}" />
                                                 {/if}
                                                 {if $additionalButtons[$cronjob->cronjobID]|isset}{@$additionalButtons[$cronjob->cronjobID]}{/if}
                                         </td>
-                                       <td class="columnID"><p>{@$cronjob->cronjobID}</p></td>
-                                       <td class="columnStartMinute"><p>{$cronjob->startMinute|truncate:30:' ...'}</p></td>
-                                       <td class="columnStartHour"><p>{$cronjob->startHour|truncate:30:' ...'}</p></td>
-                                       <td class="columnStartDom"><p>{$cronjob->startDom|truncate:30:' ...'}</p></td>
-                                       <td class="columnStartMonth"><p>{$cronjob->startMonth|truncate:30:' ...'}</p></td>
-                                       <td class="columnStartDow"><p>{$cronjob->startDow|truncate:30:' ...'}</p></td>
-                                       <td class="columnDescription columnText" title="{$cronjob->description}">
-                                               {if $cronjob->editable}
+                                       <td class="columnID columnCronjobID"><p>{@$cronjob->cronjobID}</p></td>
+                                       <td class="columnText columnStartMinute"><p>{$cronjob->startMinute|truncate:30:' ...'}</p></td>
+                                       <td class="columnText columnStartHour"><p>{$cronjob->startHour|truncate:30:' ...'}</p></td>
+                                       <td class="columnText columnStartDom"><p>{$cronjob->startDom|truncate:30:' ...'}</p></td>
+                                       <td class="columnText columnStartMonth"><p>{$cronjob->startMonth|truncate:30:' ...'}</p></td>
+                                       <td class="columnText columnStartDow"><p>{$cronjob->startDow|truncate:30:' ...'}</p></td>
+                                       <td class="columnText columnDescription" title="{$cronjob->description}">
+                                               {if $cronjob->isEditable()}
                                                         <p><a title="{lang}wcf.acp.cronjob.edit{/lang}" href="index.php?form=CronjobEdit&amp;cronjobID={@$cronjob->cronjobID}{@SID_ARG_2ND}">{$cronjob->description|truncate:50:" ..."}</a></p>
                                                 {else}
                                                         <p>{$cronjob->description|truncate:50:' ...'}</p>
                                                 {/if}
                                         </td>
-                                       <td class="columnNextExec columnDate">
+                                       <td class="columnDate columnNextExec">
                                                 {if $cronjob->active && $cronjob->nextExec != 1}
                                                         <p>{@$cronjob->nextExec|plainTime}</p>
                                                 {/if}
diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl

index 2198248e87f3b562ba5af40ea2125ab9a8e2b7b5..a702f773185943e90859712ef9e6f436509823a9 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -1,7 +1,5 @@
  {include file='header'}
  
-<script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
-
  <header class="mainHeading">
         <img src="{@RELATIVE_WCF_DIR}icon/time1.svg" alt="" />
         <hgroup>
@@ -24,7 +22,7 @@
                         <table>
                                 <thead>
                                         <tr>
-                                               <th class="columnID columnCronjobID{if $sortField == 'cronjobID'} active{/if}"><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=cronjobID&amp;sortOrder={if $sortField == 'cronjobID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.cronjobID{/lang}{if $sortField == 'cronjobID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                               <th class="columnID columnCronjobID{if $sortField == 'cronjobID'} active{/if}"><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=cronjobID&amp;sortOrder={if $sortField == 'cronjobID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.global.objectID{/lang}{if $sortField == 'cronjobID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                                 <th class="columnTitle columnClassName{if $sortField == 'className'} active{/if}"><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=className&amp;sortOrder={if $sortField == 'className' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.className{/lang}{if $sortField == 'className'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                                 <th class="columnText columnDescription{if $sortField == 'description'} active{/if}"><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=description&amp;sortOrder={if $sortField == 'description' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                                 <th class="columnDate columnExecTime{if $sortField == 'execTime'} active{/if}"><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=execTime&amp;sortOrder={if $sortField == 'execTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.log.execTime{/lang}{if $sortField == 'execTime'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl

index 957de57765ef22bd3d1ed94c57be01b6440d148e..c36441b947283c99915365cc29b20811c5a8bbfe 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -58,11 +58,11 @@
                         WCF.Language.addObject({
                                 'wcf.global.button.next': '{lang}wcf.global.button.next{/lang}',
                                 'wcf.global.loading': '{lang}wcf.global.loading{/lang}',
-                               'wcf.global.date.relative.minutes': '{capture assign=relativeMinutes}{lang}wcf.global.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
-                               'wcf.global.date.relative.hours': '{capture assign=relativeHours}{lang}wcf.global.date.relative.hours{/lang}{/capture}{@$relativeHours|encodeJS}',
-                               'wcf.global.date.relative.pastDays': '{capture assign=relativePastDays}{lang}wcf.global.date.relative.pastDays{/lang}{/capture}{@$relativePastDays|encodeJS}',
-                               'wcf.global.date.dateTimeFormat': '{lang}wcf.global.date.dateTimeFormat{/lang}',
-                               '__days': [ '{lang}wcf.global.date.day.sunday{/lang}', '{lang}wcf.global.date.day.monday{/lang}', '{lang}wcf.global.date.day.tuesday{/lang}', '{lang}wcf.global.date.day.wednesday{/lang}', '{lang}wcf.global.date.day.thursday{/lang}', '{lang}wcf.global.date.day.friday{/lang}', '{lang}wcf.global.date.day.saturday{/lang}' ],
+                               'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang}wcf.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
+                               'wcf.date.relative.hours': '{capture assign=relativeHours}{lang}wcf.date.relative.hours{/lang}{/capture}{@$relativeHours|encodeJS}',
+                               'wcf.date.relative.pastDays': '{capture assign=relativePastDays}{lang}wcf.date.relative.pastDays{/lang}{/capture}{@$relativePastDays|encodeJS}',
+                               'wcf.date.dateTimeFormat': '{lang}wcf.date.dateTimeFormat{/lang}',
+                               '__days': [ '{lang}wcf.date.day.sunday{/lang}', '{lang}wcf.date.day.monday{/lang}', '{lang}wcf.date.day.tuesday{/lang}', '{lang}wcf.date.day.wednesday{/lang}', '{lang}wcf.date.day.thursday{/lang}', '{lang}wcf.date.day.friday{/lang}', '{lang}wcf.date.day.saturday{/lang}' ],
                                 'wcf.global.thousandsSeparator': '{capture assign=thousandsSeparator}{lang}wcf.global.thousandsSeparator{/lang}{/capture}{@$thousandsSeparator|encodeJS}',
                                 'wcf.global.decimalPoint': '{capture assign=decimalPoint}{lang}wcf.global.decimalPoint{/lang}{/capture}{$decimalPoint|encodeJS}',
                                 'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}',
@@ -85,7 +85,8 @@
                         <nav id="topMenu" class="topMenu">
                                 <div>
                                         <ul>
-                                               <li><a href="#" title="Hello World" class="balloonTooltip">Hello World!</a></li>
+                                               <li>{lang}wcf.acp.user.userNote{/lang}</li>
+                                               <li><a href="{link}index.php?action=Logout&amp;t={@SECURITY_TOKEN}{/link}" onclick="return confirm('{lang}wcf.user.logout.sure{/lang}')">{lang}wcf.user.logout{/lang}</a></li>
                                         </ul>
                                 </div>
                         </nav>
diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl

index f8269a290b329062afc8a9febf9e0a94fcf8075d..962578339377909aef9406d9115388b47eda6172 100644 (file)
--- a/wcfsetup/install/files/acp/templates/login.tpl
+++ b/wcfsetup/install/files/acp/templates/login.tpl
@@ -1,4 +1,4 @@
-{capture assign='pageTitle'}{lang}wcf.acp.login{/lang}{/capture}
+{capture assign='pageTitle'}{lang}wcf.user.login{/lang}{/capture}
  {include file='setupHeader'}
  
  <script type="text/javascript">
@@ -20,14 +20,14 @@
  
  <form method="post" action="index.php?form=Login">
         <fieldset>
-               <legend>{lang}wcf.acp.login.data{/lang}</legend>
+               <legend>{lang}wcf.user.login.data{/lang}</legend>
                 
                 <dl{if $errorField == 'username'} class="errorField"{/if}>
                         <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
                         <dd><input type="text" id="username" name="username" value="{$username}" class="medium" />
                                 {if $errorField == 'username'}
                                         <small>
-                                               {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                 {if $errorType == 'notFound'}{lang}wcf.user.error.username.notFound{/lang}{/if}
                                         </small>
                                 {/if}
@@ -40,7 +40,7 @@
                                 {if $errorField == 'password'}
                                         <small>
                                                 <img src="{@RELATIVE_WCF_DIR}icon/errorS.png" alt="" />
-                                               {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                 {if $errorType == 'false'}{lang}wcf.user.error.password.false{/lang}{/if}
                                         </small>
                                 {/if}
diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl

index b599bfd82ee14de54fbd6cbc03b87c3030345852..8fcefa6a64d35d4772e69618d8ee8cc0f3ecafec 100644 (file)
--- a/wcfsetup/install/files/acp/templates/masterPassword.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl
@@ -23,7 +23,7 @@
                                         <input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
                                         {if $errorField == 'masterPassword'}
                                                 <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                         {if $errorType == 'invalid'}{lang}wcf.acp.masterPassword.error.invalid{/lang}{/if}
                                                 </small>
                                         {/if}
diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl

index 4cf2846c9cdbe1f0ae120804441a0f2a6a1823da..944696604c1e5de8a656a02dd01060608c9e803b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
@@ -35,7 +35,7 @@
                                         <input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
                                         {if $errorField == 'masterPassword'}
                                                 <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                         {if $errorType == 'notSecure'}{lang}wcf.acp.masterPassword.error.notSecure{/lang}{/if}
                                                 </small>
                                         {/if}
@@ -49,7 +49,7 @@
                                         <input type="password" id="confirmMasterPassword" name="confirmMasterPassword" value="{$confirmMasterPassword}" class="medium" />
                                         {if $errorField == 'confirmMasterPassword'}
                                                 <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                         {if $errorType == 'notEqual'}{lang}wcf.acp.masterPassword.error.notEqual{/lang}{/if}
                                                 </small>
                                         {/if}
diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl

index b024bad3a0c6e8204d2d3f6651bd9807e2309b98..84db769475897801f1855aaf6ff4952d4750b50e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/option.tpl
+++ b/wcfsetup/install/files/acp/templates/option.tpl
@@ -18,7 +18,7 @@
  </header>
  
  {if $success|isset}
-       <p class="success">{lang}wcf.acp.option.success{/lang}</p>
+       <p class="success">{lang}wcf.global.form.edit.success{/lang}</p>
  {/if}
  
  {if $errorField}
diff --git a/wcfsetup/install/files/acp/templates/optionFieldList.tpl b/wcfsetup/install/files/acp/templates/optionFieldList.tpl

index da48ab8e3695b85a06b0f71c73f1e8c10de3d98b..c815e94b5d65cc0363a25e0d742a155ba61ca117 100644 (file)
--- a/wcfsetup/install/files/acp/templates/optionFieldList.tpl
+++ b/wcfsetup/install/files/acp/templates/optionFieldList.tpl
@@ -11,7 +11,7 @@
                         {if $error}
                                 <small class="innerError">
                                         {if $error == 'empty'}
-                                               {lang}wcf.global.error.empty{/lang}
+                                               {lang}wcf.global.form.error.empty{/lang}
                                         {else}  
                                                 {lang}wcf.user.option.error.{$error}{/lang}
                                         {/if}
diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl

index a42ec2fefbc80375220d5995f045fa0d44146d6f..28bbcdf568eb54a2d4606721a6ccfc7657d04a02 100644 (file)
--- a/wcfsetup/install/files/acp/templates/optionImport.tpl
+++ b/wcfsetup/install/files/acp/templates/optionImport.tpl
@@ -27,7 +27,7 @@
                                         <input type="file" id="optionImport" name="optionImport" value="" />
                                         {if $errorField == 'optionImport'}
                                                 <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                         {if $errorType == 'importFailed'}{lang}wcf.acp.option.import.error.importFailed{/lang}{/if}
                                                         {if $errorType == 'uploadFailed'}{lang}wcf.acp.option.import.error.uploadFailed{/lang}{/if}
                                                 </small>
diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl

index 2e18b67e1691fa2539190e04dd116adef8207963..d0bfa55778fd2c7348b0abb9022e5a7bd8ac80aa 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -39,7 +39,7 @@
                                         <input type="file" id="uploadPackage" name="uploadPackage" value="" />
                                         {if $errorField == 'uploadPackage'}
                                                 <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                         {if $errorType == 'noValidPackage'}{lang}wcf.acp.package.startInstall.error.noValidPackage{/lang}{/if}
                                                         {if $errorType == 'noValidUpdate'}{lang}wcf.acp.package.startInstall.error.noValidUpdate{/lang}{/if}
                                                         {if $errorType == 'noValidInstall'}{lang}wcf.acp.package.startInstall.error.noValidInstall{/lang}{/if}
diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl

index f11cb61f8c41d35e0ae17e21a35c3aadd0629254..d4e29b2101f11f4892df815bacca2da132a43942 100644 (file)
--- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
@@ -12,7 +12,7 @@
  {/if}
  
  {if $success|isset}
-       <p class="success">{lang}wcf.acp.updateServer.{$action}.success{/lang}</p>      
+       <p class="success">{lang}wcf.global.form.{$action}.success{/lang}</p>   
  {/if}
  
  {if $packageUpdateServer|isset && $packageUpdateServer->errorMessage}
@@ -37,7 +37,7 @@
                                         <input type="text" id="serverURL" name="serverURL" value="{$serverURL}" class="long" />
                                         {if $errorField == 'serverURL'}
                                                 <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                         {if $errorType == 'notValid'}{lang}wcf.acp.updateServer.serverURL.error.notValid{/lang}{/if}
                                                 </small>
                                         {/if}
diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl

index e4c0839333c1982078d096a3d49835836db58bc8..1ab2c58ca98aee9192cdb9a0e5dac0a5eb844e6f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/updateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl
@@ -21,12 +21,14 @@
  {/if}
  
  <div class="contentHeader">
+       {pages print=true assign=pagesLinks link="index.php?page=UpdateServerList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"|concat:SID_ARG_2ND_NOT_ENCODED}
+       
         <nav class="largeButtons">
                 <ul><li><a href="index.php?form=UpdateServerAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/updateServerAddM.png" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>
         </nav>
  </div>
  
-{if !$updateServers|count}
+{if !$items}
         <div class="border content">
                 <p class="warning">{lang}wcf.acp.updateServer.list.noneAvailable{/lang}</p>
         </div>
@@ -39,7 +41,7 @@
                 <table class="bigList">
                         <thead>
                                 <tr>
-                                       <th class="columnID columnPackageUpdateServerID{if $sortField == 'packageUpdateServerID'} active{/if}" colspan="2"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=packageUpdateServerID&amp;sortOrder={if $sortField == 'packageUpdateServerID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.packageUpdateServerID{/lang}{if $sortField == 'packageUpdateServerID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnID columnPackageUpdateServerID{if $sortField == 'packageUpdateServerID'} active{/if}" colspan="2"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=packageUpdateServerID&amp;sortOrder={if $sortField == 'packageUpdateServerID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.global.objectID{/lang}{if $sortField == 'packageUpdateServerID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         <th class="columnTitle columnURL columnServer{if $sortField == 'serverURL'} active{/if}"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=serverURL&amp;sortOrder={if $sortField == 'serverURL' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.serverURL{/lang}{if $sortField == 'serverURL'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         <th class="columnDigits columnPackages{if $sortField == 'packages'} active{/if}"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=packages&amp;sortOrder={if $sortField == 'packages' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.packages{/lang}{if $sortField == 'packages'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         <th class="columnStatus{if $sortField == 'status'} active{/if}"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=status&amp;sortOrder={if $sortField == 'status' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.status{/lang}{if $sortField == 'status'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
@@ -54,14 +56,14 @@
                                 {foreach from=$updateServers item=updateServer}
                                         <tr class="updateServerRow">
                                                 <td class="columnIcon">
-                                                       <img src="{@RELATIVE_WCF_DIR}icon/{if !$updateServer->disabled}enabled{else}disabled{/if}1.svg" alt="" title="{lang}wcf.acp.updateServer.{if !$updateServer->disabled}disable{else}enable{/if}{/lang}" data-objectID="{@$updateServer->packageUpdateServerID}" data-disableMessage="{lang}wcf.acp.updateServer.disable{/lang}" data-enableMessage="{lang}wcf.acp.updateServer.enable{/lang}" class="toggleButton balloonTooltip" />
-                                                       <a href="index.php?form=UpdateServerEdit&amp;packageUpdateServerID={@$updateServer->packageUpdateServerID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.acp.updateServer.edit{/lang}" class="balloonTooltip" /></a>
-                                                       <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.acp.updateServer.delete{/lang}" data-objectID="{@$updateServer->packageUpdateServerID}" data-confirmMessage="{lang}wcf.acp.updateServer.delete.sure{/lang}" class="deleteButton balloonTooltip" />
+                                                       <img src="{@RELATIVE_WCF_DIR}icon/{if !$updateServer->disabled}enabled{else}disabled{/if}1.svg" alt="" title="{lang}wcf.global.button.{if !$updateServer->disabled}disable{else}enable{/if}{/lang}" data-objectID="{@$updateServer->packageUpdateServerID}" data-disableMessage="{lang}wcf.global.button.disable{/lang}" data-enableMessage="{lang}wcf.global.button.enable{/lang}" class="toggleButton balloonTooltip" />
+                                                       <a href="index.php?form=UpdateServerEdit&amp;packageUpdateServerID={@$updateServer->packageUpdateServerID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="balloonTooltip" /></a>
+                                                       <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" data-objectID="{@$updateServer->packageUpdateServerID}" data-confirmMessage="{lang}wcf.acp.updateServer.delete.sure{/lang}" class="deleteButton balloonTooltip" />
                                                         
                                                         {if $additionalButtons[$updateServer->packageUpdateServerID]|isset}{@$additionalButtons[$updateServer->packageUpdateServerID]}{/if}
                                                 </td>
                                                 <td class="columnID"><p>{@$updateServer->packageUpdateServerID}</p></td>
-                                               <td class="columnText columnTitle"><p><a href="index.php?form=UpdateServerEdit&amp;packageUpdateServerID={@$updateServer->packageUpdateServerID}{@SID_ARG_2ND}">{@$updateServer->serverURL}</a></p></td>
+                                               <td class="columnText columnTitle"><p><a href="index.php?form=UpdateServerEdit&amp;packageUpdateServerID={@$updateServer->packageUpdateServerID}{@SID_ARG_2ND}" title="{lang}wcf.global.button.edit{/lang}">{$updateServer->serverURL}</a></p></td>
                                                 <td class="columnDigits"><p>{#$updateServer->packages}</p></td>
                                                 <td class="columnStatus"><p class="badge{if $updateServer->status == 'online'} badgeSuccess{else} badgeError{/if}">{@$updateServer->status}</p></td>
                                                 <td class="columnText"><p title="{@$updateServer->errorMessage}">{@$updateServer->errorMessage|truncate:"30"}</p></td>
@@ -76,6 +78,8 @@
         </div>
         
         <div class="contentFooter">
+               {@$pagesLinks}
+               
                 <nav class="largeButtons">
                         <ul><li><a href="index.php?form=UpdateServerAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/updateServerAddM.png" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>
                 </nav>
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl

index b65fbb0f7fdf69da7a7c739d30cd1cb46f4fd8a2..8b8504192da52a98d574df0e35efe1c3c814e69a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -62,7 +62,7 @@
  {/if}
  
  {if $success|isset}
-       <p class="success">{lang}wcf.acp.user.{@$action}.success{/lang}</p>     
+       <p class="success">{lang}wcf.global.form.{@$action}.success{/lang}</p>  
  {/if}
  
  {if $userID|isset && $__wcf->user->userID == $userID}
@@ -87,7 +87,7 @@
                                 <input type="text" id="username" name="username" value="{$username}" class="medium" />
                                 {if $errorType.username|isset}
                                         <small class="innerError">
-                                               {if $errorType.username == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                               {if $errorType.username == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                 {if $errorType.username == 'notValid'}{lang}wcf.user.error.username.notValid{/lang}{/if}
                                                 {if $errorType.username == 'notUnique'}{lang}wcf.user.error.username.notUnique{/lang}{/if}
                                         </small>
@@ -124,7 +124,7 @@
                                                 <input type="email" id="email" name="email" value="{$email}" class="medium" />
                                                 {if $errorType.email|isset}
                                                         <small class="innerError">
-                                                               {if $errorType.email == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                               {if $errorType.email == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                                 {if $errorType.email == 'notValid'}{lang}wcf.user.error.email.notValid{/lang}{/if}
                                                                 {if $errorType.email == 'notUnique'}{lang}wcf.user.error.email.notUnique{/lang}{/if}
                                                         </small>
@@ -156,7 +156,7 @@
                                                 <input type="password" id="password" name="password" value="{$password}" class="medium" />
                                                 {if $errorType.password|isset}
                                                         <small class="innerError">
-                                                               {if $errorType.password == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                               {if $errorType.password == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                         </small>
                                                 {/if}
                                         </dd>
diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl

index 9c0cb2b23da1524ccb0c62ab9361ced39ac8a3e9..f1afa421cf4284c1095609626d4a4e165a7d7af8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
+++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
@@ -31,7 +31,7 @@
                                         {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
                                         {if $errorField == 'groupIDs'}
                                                 <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                 </small>
                                         {/if}
                                 </div>
diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl

index 4acdf3cb8cc72047d9d91fe95d3583c14ecd5095..81f94e10f09b9ed8b92d141ebc5d4af9a01f9d4a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -20,7 +20,7 @@
  {/if}
  
  {if $success|isset}
-       <p class="success">{lang}wcf.acp.group.{@$action}.success{/lang}</p>    
+       <p class="success">{lang}wcf.global.form.{@$action}.success{/lang}</p>  
  {/if}
  
  {if $warningSelfEdit|isset}
@@ -48,7 +48,7 @@
                                         <input type="text" id="groupName" name="groupName" value="{$groupName}" class="medium" />
                                         {if $errorType.groupName|isset}
                                                 <small class="innerError">
-                                                       {if $errorType.groupName == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                       {if $errorType.groupName == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                 </small>
                                         {/if}
                                         <small id="groupNameHelpMessage">{lang}wcf.acp.group.groupName.description{/lang}</small>
diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl

index 74e5aab7a478f71a6350b17a5e226f24aa06118d..862e35d01b77f1e74298f6e6b64be9f9a8bf8695 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -1,21 +1,5 @@
  {include file='header'}
  
-<script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
-<script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/RemoveObjectAction.class.js"></script>
-
-<script type="text/javascript">
-       //<![CDATA[
-       var removeGroup = new RemoveObjectAction();
-       removeGroup.setOptions({
-               actionClass: 'UserGroup',
-               containerPrefix: 'groupContainer',
-               iconPrefix: 'groupDeleteIcon',
-               langDeleteSure: '{lang}wcf.acp.group.delete.sure{/lang}',
-               url: 'index.php?action=RemoveObject'
-       });
-       //]]>
-</script>
-
  <header class="mainHeading">
         <img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" />
         <hgroup>
@@ -23,10 +7,6 @@
         </hgroup>
  </header>
  
-{if $deletedGroups}
-       <p class="success">{lang}wcf.acp.group.delete.success{/lang}</p>
-{/if}
-
  <div class="contentHeader">
         {pages print=true assign=pagesLinks link="index.php?page=UserGroupList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"|concat:SID_ARG_2ND_NOT_ENCODED}
         <nav class="largeButtons">
@@ -46,7 +26,7 @@
                 <table class="bigList">
                         <thead>
                                 <tr class="tableHead">
-                                       <th class="columnID columnGroupID{if $sortField == 'groupID'} active{/if}" colspan="2"><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=groupID&amp;sortOrder={if $sortField == 'groupID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.groupID{/lang}{if $sortField == 'groupID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnID columnGroupID{if $sortField == 'groupID'} active{/if}" colspan="2"><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=groupID&amp;sortOrder={if $sortField == 'groupID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.global.objectID{/lang}{if $sortField == 'groupID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         <th class="columnTitle columnGroupName{if $sortField == 'groupName'} active{/if}"><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=groupName&amp;sortOrder={if $sortField == 'groupName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.groupName{/lang}{if $sortField == 'groupName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         <th class="columnDigits columnMembers{if $sortField == 'members'} active{/if}"><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=members&amp;sortOrder={if $sortField == 'members' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.members{/lang}{if $sortField == 'members'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         
@@ -59,21 +39,14 @@
                                         <tr id="groupContainer{@$group->groupID}">
                                                 <td class="columnIcon">
                                                         {if $group->isEditable()}
-                                                               <a href="index.php?form=UserGroupEdit&amp;groupID={@$group->groupID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.acp.group.edit{/lang}" class="balloonTooltip" /></a>
+                                                               <a href="index.php?form=UserGroupEdit&amp;groupID={@$group->groupID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="balloonTooltip" /></a>
                                                         {else}
                                                                 <img src="{@RELATIVE_WCF_DIR}icon/edit1D.svg" alt="" title="{lang}wcf.acp.group.edit{/lang}" />
                                                         {/if}
                                                         {if $group->isDeletable()}
-                                                               <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" id="groupDeleteIcon{@$group->groupID}" alt="" title="{lang}wcf.acp.group.delete{/lang}" class="balloonTooltip" />
-                                                               <script type="text/javascript">
-                                                                       //<![CDATA[
-                                                                       removeGroup.registerObject({@$group->groupID}, {
-                                                                               objectID: {@$group->groupID}
-                                                                       });
-                                                                       //]]>
-                                                               </script>
+                                                               <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" data-objectID="{@$group->groupID}" data-confirmMessage="{lang}wcf.acp.group.delete.sure{/lang}" title="{lang}wcf.global.button.delete{/lang}" class="deleteButton balloonTooltip" />
                                                         {else}
-                                                               <img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.acp.group.delete{/lang}" />
+                                                               <img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" />
                                                         {/if}
                                                         
                                                         {if $additionalButtons[$group->groupID]|isset}{@$additionalButtons[$group->groupID]}{/if}
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl

index e82897aac197a4f6cc4891c825339f1bcc6e1225..349007032ed1d5d516bded88c00c9e4243fc5f9f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -46,7 +46,7 @@
                         <thead>
                                 <tr class="tableHead">
                                         <th class="columnMark"><label><input type="checkbox" class="clipboardMarkAll" /></label></th>
-                                       <th class="columnID columnUserID{if $sortField == 'userID'} active{/if}" colspan="2"><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField=userID&amp;sortOrder={if $sortField == 'userID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.userID{/lang}{if $sortField == 'userID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnID columnUserID{if $sortField == 'userID'} active{/if}" colspan="2"><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField=userID&amp;sortOrder={if $sortField == 'userID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.global.objectID{/lang}{if $sortField == 'userID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         <th class="columnTitle columnUsername{if $sortField == 'username'} active{/if}"><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField=username&amp;sortOrder={if $sortField == 'username' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.username{/lang}{if $sortField == 'username'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                         
                                         {foreach from=$columnHeads key=column item=columnLanguageVariable}
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl

index 4014fe6d018847c84b4dfc58c449a54eac43a7a1..3a17171a8797059eececb107bca4fa0141f2b76c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -74,7 +74,7 @@
                                                 </fieldset>
                                                 {if $errorField == 'groupIDs'}
                                                         <small class="innerError">
-                                                               {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                         </small>
                                                 {/if}
                                         </dd>
@@ -90,7 +90,7 @@
                                 <dd>
                                         <input type="text" id="subject" name="subject" value="{$subject}" class="long" />
                                         {if $errorField == 'subject'}
-                                               <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
+                                               <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}</small>
                                         {/if}
                                         <small id="subjectHelpMessage">{lang}wcf.acp.user.sendMail.subject.description{/lang}</small>
                                 </dd>
@@ -101,7 +101,7 @@
                                 <dd>
                                         <input type="text" id="from" name="from" value="{$from}" class="medium" />
                                         {if $errorField == 'from'}
-                                               <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
+                                               <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}</small>
                                         {/if}
                                         <small id="fromHelpMessage">{lang}wcf.acp.user.sendMail.from.description{/lang}</small><!-- ToDo: Language variable contains paragraphs! -->
                                 </dd>
@@ -112,7 +112,7 @@
                                 <dd>
                                         <textarea id="text" name="text" rows="15" cols="40" class="long">{$text}</textarea>
                                         {if $errorField == 'text'}
-                                               <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
+                                               <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}</small>
                                         {/if}
                                         <small id="textHelpMessage">{lang}wcf.acp.user.sendMail.text.description{/lang}</small>
                                 </dd>
diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl

index b6dea85fd72566f39f0341b6917af418cffbcdfc..804a4138a52aff071693c8a7a97577a1019bdbdf 100644 (file)
--- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
@@ -202,7 +202,7 @@
                                                         
                                                         {if $errorField == 'action'}
                                                                 <small class="innerError">
-                                                                       {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                                 </small>
                                                         {/if}
                                                 </dd>
@@ -221,7 +221,7 @@
                                                 <input type="email" id="from" name="from" value="{$from}" class="medium" />
                                                 {if $errorField == 'from'}
                                                         <small class="innerError">
-                                                               {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                         </small>
                                                 {/if}
                                                 <small id="fromHelpMessage">{lang}wcf.acp.user.sendMail.from.description{/lang}</small>
@@ -234,7 +234,7 @@
                                                 <input type="text" id="subject" name="subject" value="{$subject}" class="long" />
                                                 {if $errorField == 'subject'}
                                                         <small class="innerError">
-                                                               {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                         </small>
                                                 {/if}
                                                 <small id="subjectHelpMessage">{lang}wcf.acp.user.sendMail.subject.description{/lang}</small>
@@ -247,7 +247,7 @@
                                                 <textarea id="text" name="text" rows="15" cols="40">{$text}</textarea>
                                                 {if $errorField == 'text'}
                                                         <small class="innerError" class="long">
-                                                               {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                         </small>
                                                 {/if}
                                                 <small id="textHelpMessage">{lang}wcf.acp.user.sendMail.text.description{/lang}</small>
@@ -306,7 +306,7 @@
                                                 {htmlCheckboxes options=$availableGroups name=assignToGroupIDArray selected=$assignToGroupIDArray}
                                                 {if $errorField == 'assignToGroupIDArray'}
                                                         <small class="innerError">
-                                                               {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+                                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                         </small>
                                                 {/if}
                                         </dd>
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js

index 43b8a5d83ab6360271f432b9aeab3e316dd442b3..0c3c166a4cd4f221e6305f7e611e9fb00d9b8823 100644 (file)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -1270,17 +1270,17 @@ WCF.Date.Time.prototype = {
                 // timestamp is less than 60 minutes ago (display 1 hour ago rather than 60 minutes ago)
                 if (this.timestamp < ($timestamp + 3540)) {
                         var $minutes = Math.round((this.timestamp - $timestamp) / 60);
-                       $(element).text(eval(WCF.Language.get('wcf.global.date.relative.minutes')));
+                       $(element).text(eval(WCF.Language.get('wcf.date.relative.minutes')));
                 }
                 // timestamp is less than 24 hours ago
                 else if (this.timestamp < ($timestamp + 86400)) {
                         var $hours = Math.round((this.timestamp - $timestamp) / 3600);
-                       $(element).text(eval(WCF.Language.get('wcf.global.date.relative.hours')));
+                       $(element).text(eval(WCF.Language.get('wcf.date.relative.hours')));
                 }
                 // timestamp is less than a week ago
                 else if (this.timestamp < ($timestamp + 604800)) {
                         var $days = Math.round((this.timestamp - $timestamp) / 86400);
-                       var $string = eval(WCF.Language.get('wcf.global.date.relative.pastDays'));
+                       var $string = eval(WCF.Language.get('wcf.date.relative.pastDays'));
                 
                         // get day of week
                         var $dateObj = WCF.Date.Util.getTimezoneDate(($timestamp * 1000), $offset);
@@ -1290,7 +1290,7 @@ WCF.Date.Time.prototype = {
                 }
                 // timestamp is between ~700 million years BC and last week
                 else {
-                       var $string = WCF.Language.get('wcf.global.date.dateTimeFormat');
+                       var $string = WCF.Language.get('wcf.date.dateTimeFormat');
                         $(element).text($string.replace(/\%date\%/, $date).replace(/\%time\%/, $time));
                 }
         }
diff --git a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php

index 52d4bffd7c494ef2a153292ddac86060f782108d..7da37780a9200cb8344fac80ba7268c1807d1f47 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
@@ -87,7 +87,7 @@ class CronjobLogListPage extends SortablePage {
          */
         public function show() {
                 // set active menu item.
-               ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.cronjob.showLog');
+               ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.log.cronjob');
                 
                 parent::show();
         }
diff --git a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php

index 2b1d8ccfd8a95b9d7374a1c64573d4437696ccbd..c12fe3a2bc356b59d9fa3a6f5a07136110dfcdb9 100644 (file)
--- a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
+++ b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
@@ -148,7 +148,7 @@ class CronjobAction extends AbstractDatabaseObjectAction {
                                         str_replace(
                                                 '%date%', 
                                                 DateUtil::format($dateTime, DateUtil::DATE_FORMAT), 
-                                               WCF::getLanguage()->get('wcf.global.date.dateTimeFormat')
+                                               WCF::getLanguage()->get('wcf.date.dateTimeFormat')
                                         )
                                 )
                         );
diff --git a/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php b/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php

index c8a1ea1b5c6995b004ee689ee9ed8888f742fcfd..52d973caf5a4d594002206de9564b5666175cbbf 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
@@ -23,7 +23,7 @@ class TimezoneOptionType extends AbstractOptionType {
         public function getFormElement(Option $option, $value) {
                 $timezoneOptions = array();
                 foreach (DateUtil::getAvailableTimezones() as $timezone) {
-                       $timezoneOptions[$timezone] = WCF::getLanguage()->get('wcf.global.date.timezone.'.str_replace('/', '.', strtolower($timezone)));
+                       $timezoneOptions[$timezone] = WCF::getLanguage()->get('wcf.date.timezone.'.str_replace('/', '.', strtolower($timezone)));
                 }
                 
                 WCF::getTPL()->assign(array(
diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php

index 27425ca3fd69232a67e35a4331247fb6019f5704..7df2f252e2c01172ab83171ed81cf907b404ae17 100644 (file)
--- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
@@ -321,13 +321,22 @@ class SessionHandler extends SingletonFactory {
         }
         
         /**
-        * Validates the ip address of this session.
+        * Validates the ip address and the user agent of this session.
          * 
          * @return      boolean
-        * 
-        * @todo        Needs to be implemented, keep proper IPv6 support in mind!
          */
         protected function validate() {
+               if (SESSION_VALIDATE_IP_ADDRESS) {
+                       if ($this->session->ipAddress != UserUtil::getIpAddress()) {
+                               return false;
+                       }
+               }
+               if (SESSION_VALIDATE_USER_AGENT) {
+                       if ($this->session->userAgent != UserUtil::getUserAgent()) {
+                               return false;
+                       }
+               }
+               
                 return true;
         }
         
diff --git a/wcfsetup/install/files/lib/system/template/plugin/PlainTimeModifierTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/PlainTimeModifierTemplatePlugin.class.php

index ec1123beeb1262dcb03b52bb3366f0090f3d46b0..c6ba6e0a6270776a7f098888699bea63b4c206fd 100644 (file)
--- a/wcfsetup/install/files/lib/system/template/plugin/PlainTimeModifierTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/PlainTimeModifierTemplatePlugin.class.php
@@ -25,6 +25,6 @@ class PlainTimeModifierTemplatePlugin implements IModifierTemplatePlugin {
          */
         public function execute($tagArgs, TemplateEngine $tplObj) {
                 $dateTime = DateUtil::getDateTimeByTimestamp($tagArgs[0]);
-               return str_replace('%time%', DateUtil::format($dateTime, DateUtil::TIME_FORMAT), str_replace('%date%', DateUtil::format($dateTime, DateUtil::DATE_FORMAT), WCF::getLanguage()->get('wcf.global.date.dateTimeFormat')));
+               return str_replace('%time%', DateUtil::format($dateTime, DateUtil::TIME_FORMAT), str_replace('%date%', DateUtil::format($dateTime, DateUtil::DATE_FORMAT), WCF::getLanguage()->get('wcf.date.dateTimeFormat')));
         }
  }
diff --git a/wcfsetup/install/files/lib/system/template/plugin/TimeModifierTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/TimeModifierTemplatePlugin.class.php

index 60ca51583e855ba530704734bf3361b620059b71..f059c6c34f70550b82ea93a95cec87294aa9a78a 100644 (file)
--- a/wcfsetup/install/files/lib/system/template/plugin/TimeModifierTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/TimeModifierTemplatePlugin.class.php
@@ -28,7 +28,7 @@ class TimeModifierTemplatePlugin implements IModifierTemplatePlugin {
                 $dateTimeObject = DateUtil::getDateTimeByTimestamp($timestamp);
                 $date = DateUtil::format($dateTimeObject, DateUtil::DATE_FORMAT);
                 $time = DateUtil::format($dateTimeObject, DateUtil::TIME_FORMAT);
-               $dateTime = str_replace('%time%', $time, str_replace('%date%', $date, WCF::getLanguage()->get('wcf.global.date.dateTimeFormat')));
+               $dateTime = str_replace('%time%', $time, str_replace('%date%', $date, WCF::getLanguage()->get('wcf.date.dateTimeFormat')));
                 
                 return '<time datetime="'.DateUtil::format($dateTimeObject, 'c').'" class="datetime" data-timestamp="'.$timestamp.'" data-date="'.$date.'" data-time="'.$time.'" data-offset="'.$dateTimeObject->getOffset().'">'.$dateTime.'</time>';
         }
diff --git a/wcfsetup/install/files/lib/util/DateUtil.class.php b/wcfsetup/install/files/lib/util/DateUtil.class.php

index 12eb29f6261fb847f28aac3c9758ce63477145cf..f96ecb96da7ecfa3efd3b427ce2690f4bc37abdb 100644 (file)
--- a/wcfsetup/install/files/lib/util/DateUtil.class.php
+++ b/wcfsetup/install/files/lib/util/DateUtil.class.php
@@ -19,13 +19,13 @@ class DateUtil {
          * name of the default date format language variable
          * @var string
          */
-       const DATE_FORMAT = 'wcf.global.date.dateFormat';
+       const DATE_FORMAT = 'wcf.date.dateFormat';
         
         /**
          * name of the default time format language variable
          * @var string
          */
-       const TIME_FORMAT = 'wcf.global.date.timeFormat';
+       const TIME_FORMAT = 'wcf.date.timeFormat';
         
         /**
          * list of available time zones
@@ -169,62 +169,62 @@ class DateUtil {
                         // full textual representation of the day of the week (l)
                         if (stripos($format, 'l') !== false) {
                                 $date = str_replace(array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'), array(
-                                       $language->get('wcf.global.date.day.sunday'),
-                                       $language->get('wcf.global.date.day.monday'),
-                                       $language->get('wcf.global.date.day.tuesday'),
-                                       $language->get('wcf.global.date.day.wednesday'),
-                                       $language->get('wcf.global.date.day.thursday'),
-                                       $language->get('wcf.global.date.day.friday'),
-                                       $language->get('wcf.global.date.day.saturday')
+                                       $language->get('wcf.date.day.sunday'),
+                                       $language->get('wcf.date.day.monday'),
+                                       $language->get('wcf.date.day.tuesday'),
+                                       $language->get('wcf.date.day.wednesday'),
+                                       $language->get('wcf.date.day.thursday'),
+                                       $language->get('wcf.date.day.friday'),
+                                       $language->get('wcf.date.day.saturday')
                                 ), $date);
                         }
                         
                         // textual representation of a day, three letters (D)
                         if (stripos($format, 'D') !== false) {
                                 $date = str_replace(array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'), array(
-                                       $language->get('wcf.global.date.day.sun'),
-                                       $language->get('wcf.global.date.day.mon'),
-                                       $language->get('wcf.global.date.day.tue'),
-                                       $language->get('wcf.global.date.day.wed'),
-                                       $language->get('wcf.global.date.day.thu'),
-                                       $language->get('wcf.global.date.day.fri'),
-                                       $language->get('wcf.global.date.day.sat')
+                                       $language->get('wcf.date.day.sun'),
+                                       $language->get('wcf.date.day.mon'),
+                                       $language->get('wcf.date.day.tue'),
+                                       $language->get('wcf.date.day.wed'),
+                                       $language->get('wcf.date.day.thu'),
+                                       $language->get('wcf.date.day.fri'),
+                                       $language->get('wcf.date.day.sat')
                                 ), $date);
                         }
                         
                         // full textual representation of a month (F)
                         if (stripos($format, 'F') !== false) {
                                 $date = str_replace(array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'), array(
-                                       $language->get('wcf.global.date.month.january'),
-                                       $language->get('wcf.global.date.month.february'),
-                                       $language->get('wcf.global.date.month.march'),
-                                       $language->get('wcf.global.date.month.april'),
-                                       $language->get('wcf.global.date.month.may'),
-                                       $language->get('wcf.global.date.month.june'),
-                                       $language->get('wcf.global.date.month.july'),
-                                       $language->get('wcf.global.date.month.august'),
-                                       $language->get('wcf.global.date.month.september'),
-                                       $language->get('wcf.global.date.month.october'),
-                                       $language->get('wcf.global.date.month.november'),
-                                       $language->get('wcf.global.date.month.december')
+                                       $language->get('wcf.date.month.january'),
+                                       $language->get('wcf.date.month.february'),
+                                       $language->get('wcf.date.month.march'),
+                                       $language->get('wcf.date.month.april'),
+                                       $language->get('wcf.date.month.may'),
+                                       $language->get('wcf.date.month.june'),
+                                       $language->get('wcf.date.month.july'),
+                                       $language->get('wcf.date.month.august'),
+                                       $language->get('wcf.date.month.september'),
+                                       $language->get('wcf.date.month.october'),
+                                       $language->get('wcf.date.month.november'),
+                                       $language->get('wcf.date.month.december')
                                 ), $date);
                         }
                         
                         // short textual representation of a month (M)
                         if (stripos($format, 'M') !== false) {
                                 $date = str_replace(array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'), array(
-                                       $language->get('wcf.global.date.month.jan'),
-                                       $language->get('wcf.global.date.month.feb'),
-                                       $language->get('wcf.global.date.month.mar'),
-                                       $language->get('wcf.global.date.month.apr'),
-                                       $language->get('wcf.global.date.month.may'),
-                                       $language->get('wcf.global.date.month.jun'),
-                                       $language->get('wcf.global.date.month.jul'),
-                                       $language->get('wcf.global.date.month.aug'),
-                                       $language->get('wcf.global.date.month.sep'),
-                                       $language->get('wcf.global.date.month.oct'),
-                                       $language->get('wcf.global.date.month.nov'),
-                                       $language->get('wcf.global.date.month.dec')
+                                       $language->get('wcf.date.month.jan'),
+                                       $language->get('wcf.date.month.feb'),
+                                       $language->get('wcf.date.month.mar'),
+                                       $language->get('wcf.date.month.apr'),
+                                       $language->get('wcf.date.month.may'),
+                                       $language->get('wcf.date.month.jun'),
+                                       $language->get('wcf.date.month.jul'),
+                                       $language->get('wcf.date.month.aug'),
+                                       $language->get('wcf.date.month.sep'),
+                                       $language->get('wcf.date.month.oct'),
+                                       $language->get('wcf.date.month.nov'),
+                                       $language->get('wcf.date.month.dec')
                                 ), $date);
                         }
                 }
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml

index e98e67b19b9ded2ccba4d6c4ae160b157802b240..26d2fd6e5862512ad468cbd37ad953d16ed5f012 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1,77 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
  <language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/language.xsd" languagecode="de">
-       <category name="wcf.acp">
-               <item name="wcf.acp"><![CDATA[Administrationsoberfläche]]></item>
-               <item name="wcf.acp.help"><![CDATA[Hilfe]]></item>
-               <item name="wcf.acp.packageQuickAccess"><![CDATA[Paket wechseln]]></item>
-               <item name="wcf.acp.search.extended"><![CDATA[Erweiterte Suche ...]]></item>
-               <item name="wcf.acp.sitemap"><![CDATA[Sitemap]]></item>
-       </category>
-       <category name="wcf.acp.cache">
-               <item name="wcf.acp.cache.button.clear"><![CDATA[Cache leeren]]></item>
-               <item name="wcf.acp.cache.clear.success"><![CDATA[Der Cache wurde erfolgreich gelöscht.]]></item>
-               <item name="wcf.acp.cache.clear.sure"><![CDATA[Wollen Sie den Cache wirklich komplett leeren?]]></item>
-               <item name="wcf.acp.cache.data"><![CDATA[Eigenschaften]]></item>
-               <item name="wcf.acp.cache.data.files"><![CDATA[Dateien]]></item>
-               <item name="wcf.acp.cache.data.files.count"><![CDATA[{#$files|count} Dateien]]></item>
-               <item name="wcf.acp.cache.data.size"><![CDATA[Größe]]></item>
-               <item name="wcf.acp.cache.data.source"><![CDATA[Quelle]]></item>
-               <item name="wcf.acp.cache.data.version"><![CDATA[Version]]></item>
-               <item name="wcf.acp.cache.list"><![CDATA[Cache]]></item>
-               <item name="wcf.acp.cache.list.mtime"><![CDATA[Letzte Aktualisierung]]></item>
-               <item name="wcf.acp.cache.list.name"><![CDATA[Name]]></item>
-               <item name="wcf.acp.cache.list.perm"><![CDATA[Zugriffsrechte]]></item>
-               <item name="wcf.acp.cache.list.size"><![CDATA[Größe]]></item>
-       </category>
         <category name="wcf.acp.cronjob">
-               <item name="wcf.acp.cronjob.active"><![CDATA[Aktiv]]></item>
-               <item name="wcf.acp.cronjob.add"><![CDATA[Zeitgesteuerte Aufgabe hinzufügen]]></item>
-               <item name="wcf.acp.cronjob.add.data"><![CDATA[Allgemeine Daten]]></item>
-               <item name="wcf.acp.cronjob.add.success"><![CDATA[Die zeitgesteuerte Aufgabe wurde hinzugefügt.]]></item>
-               <item name="wcf.acp.cronjob.add.timing"><![CDATA[Zeitsteuerung]]></item>
-               <item name="wcf.acp.cronjob.className"><![CDATA[Klassenname]]></item>
-               <item name="wcf.acp.cronjob.className.description"><![CDATA[Geben Sie den Klassennamen der zeitgesteuerten Aufgabe an.]]></item>
-               <item name="wcf.acp.cronjob.cronjobID"><![CDATA[ID]]></item>
-               <item name="wcf.acp.cronjob.delete"><![CDATA[Zeitgesteuerte Aufgabe löschen]]></item>
-               <item name="wcf.acp.cronjob.delete.disabled"><![CDATA[Die zeitgesteuerte Aufgabe kann nicht gelöscht werden.]]></item>
-               <item name="wcf.acp.cronjob.delete.success"><![CDATA[Die zeitgesteuerte Aufgabe wurde gelöscht.]]></item>
-               <item name="wcf.acp.cronjob.delete.sure"><![CDATA[Sind Sie sicher, dass Sie diese zeitgesteuerte Aufgabe löschen möchten?]]></item>
-               <item name="wcf.acp.cronjob.description"><![CDATA[Beschreibung]]></item>
-               <item name="wcf.acp.cronjob.description.description"><![CDATA[Hier können Sie eine kurze Beschreibung der Aufgabe eintragen.]]></item>
-               <item name="wcf.acp.cronjob.disable"><![CDATA[Deaktivieren]]></item>
-               <item name="wcf.acp.cronjob.disabled"><![CDATA[Deaktiviert]]></item>
-               <item name="wcf.acp.cronjob.edit"><![CDATA[Zeitgesteuerte Aufgabe bearbeiten]]></item>
-               <item name="wcf.acp.cronjob.edit.data"><![CDATA[Allgemeine Daten]]></item>
-               <item name="wcf.acp.cronjob.edit.disabled"><![CDATA[Die zeitgesteuerte Aufgabe kann nicht verändert werden.]]></item>
-               <item name="wcf.acp.cronjob.edit.success"><![CDATA[Die zeitgesteuerte Aufgabe wurde erfolgreich geändert.]]></item>
-               <item name="wcf.acp.cronjob.edit.timing"><![CDATA[Zeitsteuerung]]></item>
-               <item name="wcf.acp.cronjob.enable"><![CDATA[Aktivieren]]></item>
-               <item name="wcf.acp.cronjob.enabled"><![CDATA[Aktiviert]]></item>
-               <item name="wcf.acp.cronjob.error.doesNotExist"><![CDATA[Eine Klasse mit dem angegeben Namen existiert nicht.]]></item>
-               <item name="wcf.acp.cronjob.error.empty"><![CDATA[Bitte füllen Sie dieses Eingabefeld aus.]]></item>
-               <item name="wcf.acp.cronjob.error.notValid"><![CDATA[Das Zeitformat ist ungültig.]]></item>
-               <item name="wcf.acp.cronjob.execMultiple"><![CDATA[Zeitgesteuerte Aufgabe mehrfach ausführen]]></item>
-               <item name="wcf.acp.cronjob.execMultiple.description"><![CDATA[Durch Aktivieren dieser Option wird die Aufgabe mehrfach ausgeführt, wenn zwischen dem letzten Ausführungszeitpunkt und dem aktuellen Zeitpunkt weitere Ausführungszeitpunkte liegen.]]></item>
-               <item name="wcf.acp.cronjob.execute"><![CDATA[Aufgabe jetzt ausführen]]></item>
-               <item name="wcf.acp.cronjob.execute.success"><![CDATA[Die Aufgabe wurde erfolgreich ausgeführt.]]></item>
-               <item name="wcf.acp.cronjob.inactive"><![CDATA[Inaktiv]]></item>
-               <item name="wcf.acp.cronjob.info"><![CDATA[Allgemeine Informationen]]></item>
-               <item name="wcf.acp.cronjob.intro"><![CDATA[Das Anlegen von zeitgesteuerten Aufgaben erfordert eine genaue Kenntnis der Crontab-Syntax auf unixähnlichen Systemen. Weiterführende Informationen dazu erhalten Sie auf dieser Website: <a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={"http://www.unixgeeks.org/security/newbie/unix/cron-1.html"|rawurlencode}" class="externalURL">Newbie: Intro to cron</a>]]></item>
-               <item name="wcf.acp.cronjob.lastExec"><![CDATA[Letzte Ausführung]]></item>
                 <item name="wcf.acp.cronjob.list"><![CDATA[Zeitgesteuerte Aufgaben]]></item>
-               <item name="wcf.acp.cronjob.list.count"><![CDATA[{#$items} Zeitgesteuerte Aufgabe{if $items != 1}n{/if}]]></item>
-               <item name="wcf.acp.cronjob.log"><![CDATA[Protokoll der ausgeführten Zeitgesteuerten Aufgaben]]></item>
-               <item name="wcf.acp.cronjob.log.clear"><![CDATA[Alle löschen]]></item>
-               <item name="wcf.acp.cronjob.log.clear.confirm"><![CDATA[Sind Sie sicher, dass Sie alle Protokoll-Einträge löschen möchten?]]></item>
-               <item name="wcf.acp.cronjob.log.count"><![CDATA[{#$items} {if $items == 1}Eintrag{else}Einträge{/if}]]></item>
-               <item name="wcf.acp.cronjob.log.error"><![CDATA[Fehler:]]></item>
-               <item name="wcf.acp.cronjob.log.execTime"><![CDATA[Ausgeführt]]></item>
-               <item name="wcf.acp.cronjob.log.noEntries"><![CDATA[Derzeit sind keine Einträge vorhanden.]]></item>
-               <item name="wcf.acp.cronjob.log.success"><![CDATA[OK]]></item>
-               <item name="wcf.acp.cronjob.nextExec"><![CDATA[Nächste Ausführung]]></item>
-               <item name="wcf.acp.cronjob.noneAvailable"><![CDATA[Derzeit ist keine zeitgesteuerte Aufgabe vorhanden.]]></item>
-               <item name="wcf.acp.cronjob.packageName"><![CDATA[Installiert von]]></item>
-               <item name="wcf.acp.cronjob.runNow"><![CDATA[Jetzt ausführen]]></item>
+               <item name="wcf.acp.cronjob.add"><![CDATA[Zeitgesteuerte Aufgabe hinzufügen]]></item>
+               <item name="wcf.acp.cronjob.list.count"><![CDATA[Ingesamt {#$items} zeitgesteuerte Aufgabe{if $items != 1}n{/if}]]></item>
+               <item name="wcf.acp.cronjob.subtitle"><![CDATA[&raquo;Cronjobs&laquo;]]></item>
                 <item name="wcf.acp.cronjob.startDom"><![CDATA[Tag des Monats]]></item>
                 <item name="wcf.acp.cronjob.startDom.description"><![CDATA[An diesen Tagen des Monats (1 - 31) soll die Aufgabe ausgeführt werden.]]></item>
                 <item name="wcf.acp.cronjob.startDomShort"><![CDATA[D]]></item>
@@ -87,9 +20,26 @@
                 <item name="wcf.acp.cronjob.startMonth"><![CDATA[Monat]]></item>
                 <item name="wcf.acp.cronjob.startMonth.description"><![CDATA[In diesen Monaten (1 - 12 oder jan - dec) soll die Aufgabe ausgeführt werden.]]></item>
                 <item name="wcf.acp.cronjob.startMonthShort"><![CDATA[M]]></item>
-               <item name="wcf.acp.cronjob.status"><![CDATA[Status]]></item>
-               <item name="wcf.acp.cronjob.subtitle"><![CDATA[&raquo;Cronjobs&laquo;]]></item>
+               <item name="wcf.acp.cronjob.description"><![CDATA[Beschreibung]]></item>
+               <item name="wcf.acp.cronjob.description.description"><![CDATA[Hier können Sie eine kurze Beschreibung der Aufgabe eintragen.]]></item>
+               <item name="wcf.acp.cronjob.nextExec"><![CDATA[Nächste Ausführung]]></item>
+               <item name="wcf.acp.cronjob.edit"><![CDATA[Zeitgesteuerte Aufgabe bearbeiten]]></item>
+               <item name="wcf.acp.cronjob.className"><![CDATA[Klassenname]]></item>
+               <item name="wcf.acp.cronjob.className.description"><![CDATA[Geben Sie den Klassennamen der zeitgesteuerten Aufgabe an.]]></item>
+               <item name="wcf.acp.cronjob.data"><![CDATA[Allgemeine Daten]]></item>
+               <item name="wcf.acp.cronjob.timing"><![CDATA[Zeitsteuerung]]></item>
+               <item name="wcf.acp.cronjob.intro"><![CDATA[Das Anlegen von zeitgesteuerten Aufgaben erfordert eine genaue Kenntnis der Crontab-Syntax auf unixähnlichen Systemen. Weiterführende Informationen dazu erhalten Sie auf dieser Website: <a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={"http://www.unixgeeks.org/security/newbie/unix/cron-1.html"|rawurlencode}" class="externalURL">Newbie: Intro to cron</a>]]></item>
+               <item name="wcf.acp.cronjob.execute"><![CDATA[Aufgabe jetzt ausführen]]></item>
+               <item name="wcf.acp.cronjob.error.className.doesNotExist"><![CDATA[Eine Klasse mit dem angegeben Namen existiert nicht.]]></item>
+               <item name="wcf.acp.cronjob.error.timing.notValid"><![CDATA[Das Zeitformat ist ungültig.]]></item>
+               <item name="wcf.acp.cronjob.delete.sure"><![CDATA[Sind Sie sicher, dass Sie diese zeitgesteuerte Aufgabe &raquo;{$cronjob->description|truncate:50:' ...'}&laquo; löschen möchten?]]></item>
+               <item name="wcf.acp.cronjob.log"><![CDATA[Protokoll der ausgeführten Zeitgesteuerten Aufgaben]]></item>
+               <item name="wcf.acp.cronjob.log.clear"><![CDATA[Alle löschen]]></item>
+               <item name="wcf.acp.cronjob.log.clear.confirm"><![CDATA[Sind Sie sicher, dass Sie alle Protokoll-Einträge löschen möchten?]]></item>
+               <item name="wcf.acp.cronjob.log.count"><![CDATA[{#$items} {if $items == 1}Eintrag{else}Einträge{/if}]]></item>
+               <item name="wcf.acp.cronjob.log.execTime"><![CDATA[Ausgeführt]]></item>
         </category>
+       
         <category name="wcf.acp.group">
                 <item name="wcf.acp.group.administrators"><![CDATA[Administratoren]]></item>
                 <item name="wcf.acp.group.everyone"><![CDATA[Jeder]]></item>
@@ -98,25 +48,16 @@
                 <item name="wcf.acp.group.superModerators"><![CDATA[Super Moderatoren]]></item>
                 <item name="wcf.acp.group.users"><![CDATA[registrierte Benutzer]]></item>
                 <item name="wcf.acp.group.add"><![CDATA[Benutzergruppe hinzufügen]]></item>
-               <item name="wcf.acp.group.add.permissions"><![CDATA[Zugriffsrechte]]></item>
-               <item name="wcf.acp.group.add.success"><![CDATA[Die Benutzergruppe wurde erfolgreich angelegt.]]></item>
-               <item name="wcf.acp.group.administrators"><![CDATA[Administratoren]]></item>
                 <item name="wcf.acp.group.data"><![CDATA[Allgemeine Daten]]></item>
-               <item name="wcf.acp.group.delete"><![CDATA[Benutzergruppe löschen]]></item>
-               <item name="wcf.acp.group.delete.success"><![CDATA[{if $deletedGroups == 1}Die Benutzergruppe wurde{else}{#$deletedGroups} Benutzergruppen wurden{/if} erfolgreich gelöscht.]]></item>
-               <item name="wcf.acp.group.delete.sure"><![CDATA[Wollen Sie diese Benutzergruppe wirklich löschen?]]></item>
+               <item name="wcf.acp.group.delete.sure"><![CDATA[Wollen Sie diese Benutzergruppe &raquo;{$group->groupName}&laquo; wirklich löschen?]]></item>
                 <item name="wcf.acp.group.edit"><![CDATA[Benutzergruppe bearbeiten]]></item>
-               <item name="wcf.acp.group.edit.success"><![CDATA[Ihre Änderungen an der Benutzergruppe wurde erfolgreich gespeichert.]]></item>
                 <item name="wcf.acp.group.edit.warning.selfIsMember"><![CDATA[Sie sind selbst Mitglied dieser Benutzergruppe. Änderungen an den Zugriffsrechten dieser Benutzergruppe können womöglich dazu führen, dass Sie aus der Administrationsoberfläche ausgeschlossen werden. Bitte seien Sie entsprechend vorsichtig!]]></item>
-               <item name="wcf.acp.group.everyone"><![CDATA[Jeder]]></item>
-               <item name="wcf.acp.group.groupID"><![CDATA[Gruppen-ID]]></item>
                 <item name="wcf.acp.group.groupName"><![CDATA[Name der Benutzergruppe]]></item>
                 <item name="wcf.acp.group.groupName.description"><![CDATA[Geben Sie einen Namen für die Gruppe an.]]></item>
-               <item name="wcf.acp.group.guests"><![CDATA[Gäste]]></item>
                 <item name="wcf.acp.group.list"><![CDATA[Benutzergruppen]]></item>
                 <item name="wcf.acp.group.list.count"><![CDATA[{#$items} Benutzergruppe{if $items != 1}n{/if}]]></item>
-               <item name="wcf.acp.group.members"><![CDATA[Anzahl Mitglieder]]></item>
-               <item name="wcf.acp.group.moderators"><![CDATA[Moderatoren]]></item>
+               <item name="wcf.acp.group.members"><![CDATA[Mitglieder]]></item>
+               <item name="wcf.acp.group.showMembers"><![CDATA[Zeige die Mitglieder dieser Benutzergruppe]]></item>
                 <item name="wcf.acp.group.option.admin.general.canUseAcp"><![CDATA[Kann Administrationsoberfläche betreten]]></item>
                 <item name="wcf.acp.group.option.admin.general.canUseAcp.description"><![CDATA[Mitglieder dieser Benutzergruppe können die Administrationsoberfläche betreten und dort abhängig von den weiteren Zugriffsrechten verschiedene Aktionen durchführen. Diese Option muss aktiviert sein, wenn diesen Benutzern andere administrative Funktionen erlaubt werden sollen.]]></item>
                 <item name="wcf.acp.group.option.admin.general.canViewPrivateUserOptions"><![CDATA[Kann versteckte Profilinformationen sehen]]></item>
@@ -129,8 +70,8 @@
                 <item name="wcf.acp.group.option.admin.system.cronjob.canAddCronjob.description"><![CDATA[Mitglieder dieser Benutzergruppe können neue zeitgesteuerte Aufgaben anlegen.]]></item>
                 <item name="wcf.acp.group.option.admin.system.cronjob.canDeleteCronjob"><![CDATA[Kann zeitgesteuerte Aufgaben löschen]]></item>
                 <item name="wcf.acp.group.option.admin.system.cronjob.canDeleteCronjob.description"><![CDATA[Mitglieder dieser Benutzergruppe können vorhandene zeitgesteuerte Aufgaben löschen.]]></item>
-               <item name="wcf.acp.group.option.admin.system.cronjob.canDeleteCronjobsLog"><![CDATA[Kann Protokoll der zeitgesteuerten Aufgaben löschen]]></item>
-               <item name="wcf.acp.group.option.admin.system.cronjob.canDeleteCronjobsLog.description"><![CDATA[Mitglieder dieser Benutzergruppe können das Protokoll der zeitgesteuerten Aufgaben löschen. Bei der Ausführung einer zeitgesteuerten Aufgabe wird festgehalten, ob dieser erfolgreich ausgeführt wurde.]]></item>
+               <item name="wcf.acp.group.option.admin.system.cronjob.canDeleteCronjobLog"><![CDATA[Kann Protokoll der zeitgesteuerten Aufgaben löschen]]></item>
+               <item name="wcf.acp.group.option.admin.system.cronjob.canDeleteCronjobLog.description"><![CDATA[Mitglieder dieser Benutzergruppe können das Protokoll der zeitgesteuerten Aufgaben löschen. Bei der Ausführung einer zeitgesteuerten Aufgabe wird festgehalten, ob dieser erfolgreich ausgeführt wurde.]]></item>
                 <item name="wcf.acp.group.option.admin.system.cronjob.canEditCronjob"><![CDATA[Kann zeitgesteuerte Aufgaben ändern]]></item>
                 <item name="wcf.acp.group.option.admin.system.cronjob.canEditCronjob.description"><![CDATA[Mitglieder dieser Benutzergruppe können vorhandene zeitgesteuerte Aufgaben bearbeiten.]]></item>
                 <item name="wcf.acp.group.option.admin.system.cronjob.canEnableDisableCronjob"><![CDATA[Kann zeitgesteuerte Aufgaben deaktivieren]]></item>
@@ -166,15 +107,9 @@
                 <item name="wcf.acp.group.option.admin.user.canSearchUser"><![CDATA[Kann Benutzer suchen]]></item>
                 <item name="wcf.acp.group.option.admin.user.canSearchUser.description"><![CDATA[Mitglieder dieser Benutzergruppe können vorhandene Benutzer und deren Profile durchsuchen.]]></item>
                 <item name="wcf.acp.group.option.category.admin"><![CDATA[Administrative Rechte]]></item>
-               <item name="wcf.acp.group.option.category.admin.content"><![CDATA[Inhalte]]></item>
-               <item name="wcf.acp.group.option.category.admin.content.description"><![CDATA[]]></item>
                 <item name="wcf.acp.group.option.category.admin.description"><![CDATA[]]></item>
-               <item name="wcf.acp.group.option.category.admin.display"><![CDATA[Darstellung]]></item>
-               <item name="wcf.acp.group.option.category.admin.display.description"><![CDATA[]]></item>
                 <item name="wcf.acp.group.option.category.admin.general"><![CDATA[Allgemeine administrative Rechte]]></item>
                 <item name="wcf.acp.group.option.category.admin.general.description"><![CDATA[]]></item>
-               <item name="wcf.acp.group.option.category.admin.maintenance"><![CDATA[Wartung]]></item>
-               <item name="wcf.acp.group.option.category.admin.maintenance.description"><![CDATA[]]></item>
                 <item name="wcf.acp.group.option.category.admin.system"><![CDATA[System-Funktionen]]></item>
                 <item name="wcf.acp.group.option.category.admin.system.cronjob"><![CDATA[Zeitgesteuerte Aufgaben]]></item>
                 <item name="wcf.acp.group.option.category.admin.system.cronjob.description"><![CDATA[]]></item>
@@ -191,19 +126,31 @@
                 <item name="wcf.acp.group.option.category.mod.description"><![CDATA[]]></item>
                 <item name="wcf.acp.group.option.category.user"><![CDATA[Allgemeine Rechte]]></item>
                 <item name="wcf.acp.group.option.category.user.description"><![CDATA[]]></item>
-               <item name="wcf.acp.group.option.error.validationFailed"><![CDATA[Sie haben einen ungültigen Inhalt eingegeben.]]></item>
+               <item name="wcf.acp.group.option.category.admin.display"><![CDATA[Darstellung]]></item>
+               <item name="wcf.acp.group.option.category.admin.display.description"><![CDATA[]]></item>
                 <item name="wcf.acp.group.option.admin.style.canUseDisabledStyle"><![CDATA[Kann deaktivierte Stile benutzen]]></item>
                 <item name="wcf.acp.group.option.admin.style.canUseDisabledStyle.description"><![CDATA[Mitglieder dieser Benutzergruppe können deaktivierte Stile auswählen.]]></item>
                 <item name="wcf.acp.group.option.category.admin.style"><![CDATA[Stil-Verwaltung]]></item>
                 <item name="wcf.acp.group.option.category.admin.style.description"><![CDATA[]]></item>
-               <item name="wcf.acp.group.showMembers"><![CDATA[Zeige die Mitglieder dieser Benutzergruppe]]></item>
-               <item name="wcf.acp.group.superModerators"><![CDATA[Super Moderatoren]]></item>
-               <item name="wcf.acp.group.users"><![CDATA[Registrierte Benutzer]]></item>
         </category>
-       <category name="wcf.acp.login">
-               <item name="wcf.acp.login"><![CDATA[Anmeldung]]></item>
-               <item name="wcf.acp.login.data"><![CDATA[Zugangsdaten]]></item>
+       
+       <category name="wcf.acp.cache">
+               <item name="wcf.acp.cache.button.clear"><![CDATA[Cache leeren]]></item>
+               <item name="wcf.acp.cache.clear.success"><![CDATA[Der Cache wurde erfolgreich gelöscht.]]></item>
+               <item name="wcf.acp.cache.clear.sure"><![CDATA[Wollen Sie den Cache wirklich komplett leeren?]]></item>
+               <item name="wcf.acp.cache.data"><![CDATA[Eigenschaften]]></item>
+               <item name="wcf.acp.cache.data.files"><![CDATA[Dateien]]></item>
+               <item name="wcf.acp.cache.data.files.count"><![CDATA[{#$files|count} Dateien]]></item>
+               <item name="wcf.acp.cache.data.size"><![CDATA[Größe]]></item>
+               <item name="wcf.acp.cache.data.source"><![CDATA[Quelle]]></item>
+               <item name="wcf.acp.cache.data.version"><![CDATA[Version]]></item>
+               <item name="wcf.acp.cache.list"><![CDATA[Cache]]></item>
+               <item name="wcf.acp.cache.list.mtime"><![CDATA[Letzte Aktualisierung]]></item>
+               <item name="wcf.acp.cache.list.name"><![CDATA[Name]]></item>
+               <item name="wcf.acp.cache.list.perm"><![CDATA[Zugriffsrechte]]></item>
+               <item name="wcf.acp.cache.list.size"><![CDATA[Größe]]></item>
         </category>
+
         <category name="wcf.acp.masterPassword">
                 <item name="wcf.acp.masterPassword"><![CDATA[Hauptkennwort]]></item>
                 <item name="wcf.acp.masterPassword.confirm"><![CDATA[Hauptkennwort wiederholen]]></item>
@@ -217,30 +164,30 @@
                 <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. Sie sollten ein möglichst sicheres Kennwort verwenden, dass sich von Ihrem normalen Administrator-Kennwort unterscheidet, Dritten nicht bekannt ist und auch nicht auf anderen Internetseiten verwendet wird.]]></item>
         </category>
+       
         <category name="wcf.acp.menu">
-               <item name="wcf.acp.menu.link.autoupdate"><![CDATA[Automatisches Update]]></item>
-               <item name="wcf.acp.menu.link.content"><![CDATA[Inhalte]]></item>
-               <item name="wcf.acp.menu.link.cronjob.add"><![CDATA[Zeitgesteuerte Aufgabe hinzufügen]]></item>
-               <item name="wcf.acp.menu.link.cronjob.showLog"><![CDATA[Protokoll anzeigen]]></item>
-               <item name="wcf.acp.menu.link.cronjob.list"><![CDATA[Zeitgesteuerte Aufgaben auflisten]]></item><!-- ToDo: change action name from "view" to "list" -->
-               <item name="wcf.acp.menu.link.display"><![CDATA[Darstellung]]></item>
+               <item name="wcf.acp.menu.link.system"><![CDATA[System]]></item>
+               <item name="wcf.acp.menu.link.option"><![CDATA[Optionen]]></item>
+               <item name="wcf.acp.menu.link.package"><![CDATA[Paketverwaltung]]></item>
+               <item name="wcf.acp.menu.link.option.importAndExport"><![CDATA[Sichern &amp; Wiederherstellen]]></item>
+               <item name="wcf.acp.menu.link.cronjob"><![CDATA[Zeitgesteuerte Aufgaben]]></item>
+               <item name="wcf.acp.menu.link.cronjob.add"><![CDATA[Aufgabe hinzufügen]]></item>
+               <item name="wcf.acp.menu.link.cronjob.list"><![CDATA[Aufgaben auflisten]]></item>
+               <item name="wcf.acp.menu.link.log"><![CDATA[Protokoll]]></item>
+               <item name="wcf.acp.menu.link.log.cache"><![CDATA[Cache]]></item>
+               <item name="wcf.acp.menu.link.log.session"><![CDATA[Sitzungen]]></item>
+               <item name="wcf.acp.menu.link.log.cronjob"><![CDATA[Zeitgesteuerte Aufgaben]]></item>
                 <item name="wcf.acp.menu.link.group"><![CDATA[Benutzergruppen]]></item>
                 <item name="wcf.acp.menu.link.group.add"><![CDATA[Benutzergruppe hinzufügen]]></item>
                 <item name="wcf.acp.menu.link.group.mail"><![CDATA[E-Mail an Gruppenmitglieder]]></item>
                 <item name="wcf.acp.menu.link.group.list"><![CDATA[Benutzergruppen auflisten]]></item>
-               <item name="wcf.acp.menu.link.log"><![CDATA[Protokoll]]></item>
-               <item name="wcf.acp.menu.link.log.cache"><![CDATA[Cache]]></item>
-               <item name="wcf.acp.menu.link.log.session"><![CDATA[Sitzungen]]></item>
-               <item name="wcf.acp.menu.link.maintenance"><![CDATA[Wartung]]></item>
-               <item name="wcf.acp.menu.link.option"><![CDATA[Optionen]]></item>
-               <item name="wcf.acp.menu.link.option.importAndExport"><![CDATA[Sichern &amp; Wiederherstellen]]></item>
-               <item name="wcf.acp.menu.link.package"><![CDATA[Paketverwaltung]]></item>
+               <item name="wcf.acp.menu.link.display"><![CDATA[Darstellung]]></item>
                 <item name="wcf.acp.menu.link.package.database"><![CDATA[Pakete suchen]]></item>
                 <item name="wcf.acp.menu.link.package.install"><![CDATA[Paket installieren]]></item>
                 <item name="wcf.acp.menu.link.package.server.add"><![CDATA[Server hinzufügen]]></item>
                 <item name="wcf.acp.menu.link.package.server.list"><![CDATA[Server auflisten]]></item>
                 <item name="wcf.acp.menu.link.package.list"><![CDATA[Pakete auflisten]]></item>
-               <item name="wcf.acp.menu.link.system"><![CDATA[System]]></item>
+               <item name="wcf.acp.menu.link.package.autoupdate"><![CDATA[Automatisches Update]]></item>
                 <item name="wcf.acp.menu.link.user"><![CDATA[Benutzer]]></item>
                 <item name="wcf.acp.menu.link.user.add"><![CDATA[Benutzer hinzufügen]]></item>
                 <item name="wcf.acp.menu.link.user.list"><![CDATA[Benutzer auflisten]]></item>
@@ -249,32 +196,31 @@
                 <item name="wcf.acp.menu.link.user.massProcessing"><![CDATA[Massenverarbeitung von Benutzern]]></item>
                 <item name="wcf.acp.menu.link.user.search"><![CDATA[Benutzer suchen]]></item>
         </category>
+       
         <category name="wcf.acp.option">
-               <item name="wcf.acp.option.blacklist_hostnames"><![CDATA[Hostname ausschließen]]></item>
-               <item name="wcf.acp.option.blacklist_hostnames.description"><![CDATA[Geben Sie pro Zeile einen Hostname an, die Sie von der Seite ausschließen möchten.]]></item>
-               <item name="wcf.acp.option.blacklist_ip_addresses"><![CDATA[IP-Adresse ausschließen]]></item>
-               <item name="wcf.acp.option.blacklist_ip_addresses.description"><![CDATA[Geben Sie pro Zeile eine IP-Adresse an, die Sie von der Seite ausschließen möchten.]]></item>
-               <item name="wcf.acp.option.blacklist_user_agents"><![CDATA[Browser-Kennung ausschließen]]></item>
-               <item name="wcf.acp.option.blacklist_user_agents.description"><![CDATA[Geben Sie pro Zeile eine Browser-Kennung (User-Agent) an, die Sie von der Seite ausschließen möchten.]]></item>
-               <item name="wcf.acp.option.cache_source_memcache_host"><![CDATA[Memcache-Server]]></item>
-               <item name="wcf.acp.option.cache_source_memcache_host.description"><![CDATA[Geben Sie hier die Adresse des Memcache-Servers ein! Mehrere Server können zeilenweise angegeben werden.]]></item>
-               <item name="wcf.acp.option.cache_source_memcache_use_pconnect"><![CDATA[Persistente Verbindungen aktivieren]]></item>
-               <item name="wcf.acp.option.cache_source_memcache_use_pconnect.description"><![CDATA[Sollen beim Verbinden mit dem Memcache-Server persistente Verbindungen genutzt werden?]]></item>
-               <item name="wcf.acp.option.cache_source_type"><![CDATA[Cache-Methode]]></item>
-               <item name="wcf.acp.option.cache_source_type.apc"><![CDATA[Alternative PHP Cache]]></item>
-               <item name="wcf.acp.option.cache_source_type.description"><![CDATA[Bitte wählen Sie die gewünschte Cache-Methode aus! Beachten Sie, dass einige Methoden spezielle Anforderungen an das Server-System stellen und nicht auf jedem Server zur Verfügung stehen.]]></item>
-               <item name="wcf.acp.option.cache_source_type.disk"><![CDATA[Dateisystem (Standard)]]></item>
-               <item name="wcf.acp.option.cache_source_type.memcache"><![CDATA[Memcache (Experimentell)]]></item>
+               <item name="wcf.acp.option.category.module"><![CDATA[Modulsteuerung]]></item>
+               <item name="wcf.acp.option.category.module.description"><![CDATA[]]></item>
                 <item name="wcf.acp.option.category.general"><![CDATA[Allgemein]]></item>
-               <item name="wcf.acp.option.category.general.cache"><![CDATA[Cache]]></item>
-               <item name="wcf.acp.option.category.general.cache.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.general.cache.general"><![CDATA[Allgemein]]></item>
-               <item name="wcf.acp.option.category.general.cache.general.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.general.cache.memcache"><![CDATA[Memcache]]></item>
-               <item name="wcf.acp.option.category.general.cache.memcache.description"><![CDATA[Memcache speichert häufig benötige Daten im Arbeitsspeicher zwischen. Dies kann die Last auf die Datenbank und das Dateisystem drastisch reduzieren. Lesen Sie mehr über dieses Thema auf der folgenden Seite: <a href="http://memcached.org/" class="externalURL">memcached.org</a>.]]></item>
-               <item name="wcf.acp.option.category.general.date"><![CDATA[Datum &amp; Zeit]]></item>
-               <item name="wcf.acp.option.category.general.date.description"><![CDATA[]]></item>
                 <item name="wcf.acp.option.category.general.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.category.security"><![CDATA[Sicherheit]]></item>
+               <item name="wcf.acp.option.category.module.system"><![CDATA[System]]></item>
+               <item name="wcf.acp.option.category.module.system.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.module_master_password"><![CDATA[Hauptkennwort aktivieren]]></item>
+               <item name="wcf.acp.option.module_master_password.description"><![CDATA[Aktiviert die zusätzliche Eingabe eines Kennworts beim Aufruf von sicherheitskritischen Bereichen.]]></item>
+               <item name="wcf.acp.option.category.general.page"><![CDATA[Seite]]></item>
+               <item name="wcf.acp.option.category.general.page.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.meta_description"><![CDATA[Meta Description]]></item>
+               <item name="wcf.acp.option.meta_description.description"><![CDATA[Geben Sie eine Meta Description an.]]></item>
+               <item name="wcf.acp.option.meta_keywords"><![CDATA[Meta Keywords]]></item>
+               <item name="wcf.acp.option.meta_keywords.description"><![CDATA[Tragen Sie die Wörter ein, die im Meta-Tag Keywords stehen sollen.]]></item>
+               <item name="wcf.acp.option.page_description"><![CDATA[Seitenbeschreibung]]></item>
+               <item name="wcf.acp.option.page_description.description"><![CDATA[Fügen Sie hier eine kurze Beschreibung Ihrer Seite ein.]]></item>
+               <item name="wcf.acp.option.page_title"><![CDATA[Titel der Seite]]></item>
+               <item name="wcf.acp.option.page_title.description"><![CDATA[Geben Sie hier den Globalen Titel der Seite an. Dieser Titel wird im Seitenkopf dargestellt, wenn Sie die Anzeige dieses Textes im Stileditor aktiviert haben.]]></item>
+               <item name="wcf.acp.option.page_url"><![CDATA[Adresse (URL) der Seite]]></item>
+               <item name="wcf.acp.option.page_url.description"><![CDATA[Geben Sie an, unter welcher Adresse (URL) die Seite aufzurufen ist (ohne abschließenden Slash).]]></item>
+               <item name="wcf.acp.option.page_urls"><![CDATA[Weitere URLs]]></item>
+               <item name="wcf.acp.option.page_urls.description"><![CDATA[Geben Sie hier weitere URLs an, unter denen Ihre Seite erreichbar ist.]]></item>
                 <item name="wcf.acp.option.category.general.http"><![CDATA[HTTP]]></item>
                 <item name="wcf.acp.option.category.general.http.cookie"><![CDATA[Cookies]]></item>
                 <item name="wcf.acp.option.category.general.http.cookie.description"><![CDATA[]]></item>
@@ -283,66 +229,26 @@
                 <item name="wcf.acp.option.category.general.http.http.description"><![CDATA[]]></item>
                 <item name="wcf.acp.option.category.general.http.proxy"><![CDATA[Proxy-Server]]></item>
                 <item name="wcf.acp.option.category.general.http.proxy.description"><![CDATA[Hier können Sie optional Proxy-Server für Verbindungen zu externen Servern konfigurieren.]]></item>
-               <item name="wcf.acp.option.category.general.image"><![CDATA[Grafik]]></item>
-               <item name="wcf.acp.option.category.general.image.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.general.mail"><![CDATA[E-Mails]]></item>
-               <item name="wcf.acp.option.category.general.mail.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.general.mail.general"><![CDATA[Allgemein]]></item>
-               <item name="wcf.acp.option.category.general.mail.general.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.general.mail.send"><![CDATA[Versand]]></item>
-               <item name="wcf.acp.option.category.general.mail.send.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.general.offline"><![CDATA[Wartungsmodus]]></item>
-               <item name="wcf.acp.option.category.general.offline.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.module"><![CDATA[Module an / aus]]></item>
-               <item name="wcf.acp.option.category.module.content"><![CDATA[Inhalte]]></item>
-               <item name="wcf.acp.option.category.module.content.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.module.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.module.display"><![CDATA[Darstellung]]></item>
-               <item name="wcf.acp.option.category.module.display.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.module.system"><![CDATA[System]]></item>
-               <item name="wcf.acp.option.category.module.system.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.module.user"><![CDATA[Benutzer]]></item>
-               <item name="wcf.acp.option.category.module.user.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.security"><![CDATA[Sicherheit]]></item>
-               <item name="wcf.acp.option.category.security.antispam"><![CDATA[Captcha]]></item>
-               <item name="wcf.acp.option.category.security.antispam.description"><![CDATA[Internetseiten werden häufig durch andere Programme angegriffen. So gibt es beispielsweise die Möglichkeit, automatisiert hunderte von Benutzerkonten zu erstellen. Um sich davor zu schützen, können Sie an verschiedenen Stellen ein sogenanntes <a href="http://de.wikipedia.org/wiki/Captcha" class="externalURL">Captcha-Bild</a> anzeigen lassen. Unregistrierte Benutzer müssen erst den Code eingeben, der auf diesem Bild steht. Roboter können diesen Code nicht lesen. Beachten Sie, dass Captcha-Bilder von blinden und sehbehinderten Benutzern nicht identifiziert werden können.]]></item>
-               <item name="wcf.acp.option.category.security.blacklist"><![CDATA[Blacklist]]></item>
-               <item name="wcf.acp.option.category.security.blacklist.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.security.censorship"><![CDATA[Zensur]]></item>
-               <item name="wcf.acp.option.category.security.censorship.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.security.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.security.general"><![CDATA[Allgemein]]></item>
-               <item name="wcf.acp.option.category.security.general.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.security.general.session"><![CDATA[Sitzungen]]></item>
-               <item name="wcf.acp.option.category.security.general.session.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.category.user"><![CDATA[Mitglieder]]></item>
-               <item name="wcf.acp.option.category.user.description"><![CDATA[]]></item>
                 <item name="wcf.acp.option.cookie_domain"><![CDATA[Cookiedomain]]></item>
                 <item name="wcf.acp.option.cookie_domain.description"><![CDATA[Hier können Sie optional eine Domain angeben, unter der der Cookie laufen soll. Standardmäßig sollten Sie dieses Feld frei lassen, da ein Ausfüllen nur in wenigen Fällen notwendig ist.]]></item>
                 <item name="wcf.acp.option.cookie_path"><![CDATA[Cookiepfad]]></item>
                 <item name="wcf.acp.option.cookie_path.description"><![CDATA[Der Cookiepfad wird absolut zum Document Root angegeben - also z.B. "/forum" für http://www.woltlab.de/forum.]]></item>
                 <item name="wcf.acp.option.cookie_prefix"><![CDATA[Präfix für Cookienamen]]></item>
                 <item name="wcf.acp.option.cookie_prefix.description"><![CDATA[Geben Sie einen Präfix an, der bei Cookienamen verwendet wird.]]></item>
-               <item name="wcf.acp.option.enable_daylight_saving_time"><![CDATA[Uhr automatisch auf Sommer-/Winterzeit umstellen]]></item>
-               <item name="wcf.acp.option.enable_daylight_saving_time.description"><![CDATA[Soll die Uhr automatisch auf Sommer-/Winterzeit umgestellt werden?]]></item>
-               <item name="wcf.acp.option.enable_session_data_cache"><![CDATA[Cache-Methode für Sitzungsdaten verwenden]]></item>
-               <item name="wcf.acp.option.enable_session_data_cache.description"><![CDATA[Soll für die Speicherung der Sitzungsdaten die ausgewählte Cache-Methode verwendet werden?]]></item>
-               <item name="wcf.acp.option.error.validationFailed"><![CDATA[Sie haben einen ungültigen Inhalt eingegeben.]]></item>
-               <item name="wcf.acp.option.export"><![CDATA[Optionen sichern]]></item>
-               <item name="wcf.acp.option.export.download"><![CDATA[Sicherung der Optionen herunterladen]]></item>
-               <item name="wcf.acp.option.export.download.description"><![CDATA[Laden Sie eine Sicherung der Optionen auf Ihren lokalen Rechner herunter.]]></item>
                 <item name="wcf.acp.option.http_enable_gzip"><![CDATA[Gzip-Komprimierung aktivieren]]></item>
                 <item name="wcf.acp.option.http_enable_gzip.description"><![CDATA[Durch Aktivierung dieser Option werden die Inhalte komprimiert vom Server an den Client gesendet. Dies reduziert den Traffic.]]></item>
                 <item name="wcf.acp.option.http_enable_no_cache_headers"><![CDATA[Seitencaching im Client-Browser verhindern]]></item>
                 <item name="wcf.acp.option.http_enable_no_cache_headers.description"><![CDATA[Durch Aktivierung dieser Option können Sie das Caching der Seite im Browser verhindern.]]></item>
                 <item name="wcf.acp.option.http_gzip_level"><![CDATA[Gzip-Komprimierungslevel]]></item>
                 <item name="wcf.acp.option.http_gzip_level.description"><![CDATA[Werte von 1-9 sind zulässig. Als Optimum zwischen Komprimierung und Serverlast empfiehlt sich Level 1.]]></item>
-               <item name="wcf.acp.option.import"><![CDATA[Optionen wiederherstellen]]></item>
-               <item name="wcf.acp.option.import.error.importFailed"><![CDATA[Die Optionen konnten nicht erfolgreich importiert werden.]]></item>
-               <item name="wcf.acp.option.import.success"><![CDATA[Die Optionen wurden erfolgreich importiert.]]></item>
-               <item name="wcf.acp.option.import.upload"><![CDATA[Sicherung der Optionen vom lokalen Computer hochladen]]></item>
-               <item name="wcf.acp.option.import.upload.description"><![CDATA[Wählen Sie eine Sicherung der Optionen von Ihrem lokalen Rechner aus.]]></item>
-               <item name="wcf.acp.option.importAndExport"><![CDATA[Optionen sichern &amp; wiederherstellen]]></item>
+               <item name="wcf.acp.option.proxy_server_http"><![CDATA[Proxy-Server (HTTP)]]></item>
+               <item name="wcf.acp.option.proxy_server_http.description"><![CDATA[Proxy-Server für HTTP-Verbindungen]]></item>
+               <item name="wcf.acp.option.category.general.mail"><![CDATA[E-Mails]]></item>
+               <item name="wcf.acp.option.category.general.mail.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.category.general.mail.general"><![CDATA[Allgemein]]></item>
+               <item name="wcf.acp.option.category.general.mail.general.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.category.general.mail.send"><![CDATA[Versand]]></item>
+               <item name="wcf.acp.option.category.general.mail.send.description"><![CDATA[]]></item>
                 <item name="wcf.acp.option.mail_admin_address"><![CDATA[Administrator-Adresse]]></item>
                 <item name="wcf.acp.option.mail_admin_address.description"><![CDATA[Geben Sie die E-Mail-Adresse des Administrators an.]]></item>
                 <item name="wcf.acp.option.mail_debug_logfile_path"><![CDATA[Logfile-Pfad]]></item>
@@ -370,271 +276,72 @@
                 <item name="wcf.acp.option.mail_use_f_param.description"><![CDATA[Manche Server benötigen den &raquo;-f&laquo; Parameter beim Versenden von E-Mails. Falls Sie Probleme mit dem Versand von E-Mails haben, aktivieren Sie diese Einstellung.]]></item>
                 <item name="wcf.acp.option.mail_use_formatted_address"><![CDATA[Formatierte E-Mail-Adressen verwenden]]></item>
                 <item name="wcf.acp.option.mail_use_formatted_address.description"><![CDATA[Absender- und Empfänger-Adressen werden in folgendes Format gebracht: &quot;Name &lt;email@domain.tld&gt;&quot;. Diese Funktion wird nicht von allen Mailservern unterstützt und sollte daher bei Problemen abgeschaltet werden.]]></item>
-               <item name="wcf.acp.option.module_master_password"><![CDATA[Hauptkennwort aktivieren]]></item>
-               <item name="wcf.acp.option.module_master_password.description"><![CDATA[Aktiviert die zusätzliche Eingabe eines Kennworts beim Aufruf von sicherheitskritischen Bereichen.]]></item>
-               <item name="wcf.acp.option.proxy_server_http"><![CDATA[Proxy-Server (HTTP)]]></item>
-               <item name="wcf.acp.option.proxy_server_http.description"><![CDATA[Proxy-Server für HTTP-Verbindungen]]></item>
+               <item name="wcf.acp.option.category.general.cache"><![CDATA[Cache]]></item>
+               <item name="wcf.acp.option.category.general.cache.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.category.general.cache.general"><![CDATA[Allgemein]]></item>
+               <item name="wcf.acp.option.category.general.cache.general.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.category.general.cache.memcache"><![CDATA[Memcache]]></item>
+               <item name="wcf.acp.option.category.general.cache.memcache.description"><![CDATA[Memcache speichert häufig benötige Daten im Arbeitsspeicher zwischen. Dies kann die Last auf die Datenbank und das Dateisystem drastisch reduzieren. Lesen Sie mehr über dieses Thema auf der folgenden Seite: <a href="http://memcached.org/" class="externalURL">memcached.org</a>.]]></item>
+               <item name="wcf.acp.option.cache_source_memcache_host"><![CDATA[Memcache-Server]]></item>
+               <item name="wcf.acp.option.cache_source_memcache_host.description"><![CDATA[Geben Sie hier die Adresse des Memcache-Servers ein! Mehrere Server können zeilenweise angegeben werden.]]></item>
+               <item name="wcf.acp.option.cache_source_memcache_use_pconnect"><![CDATA[Persistente Verbindungen aktivieren]]></item>
+               <item name="wcf.acp.option.cache_source_memcache_use_pconnect.description"><![CDATA[Sollen beim Verbinden mit dem Memcache-Server persistente Verbindungen genutzt werden?]]></item>
+               <item name="wcf.acp.option.cache_source_type"><![CDATA[Cache-Methode]]></item>
+               <item name="wcf.acp.option.cache_source_type.apc"><![CDATA[Alternative PHP Cache]]></item>
+               <item name="wcf.acp.option.cache_source_type.description"><![CDATA[Bitte wählen Sie die gewünschte Cache-Methode aus! Beachten Sie, dass einige Methoden spezielle Anforderungen an das Server-System stellen und nicht auf jedem Server zur Verfügung stehen.]]></item>
+               <item name="wcf.acp.option.cache_source_type.disk"><![CDATA[Dateisystem (Standard)]]></item>
+               <item name="wcf.acp.option.cache_source_type.memcache"><![CDATA[Memcache]]></item>
+               <item name="wcf.acp.option.blacklist_hostnames"><![CDATA[Hostname ausschließen]]></item>
+               <item name="wcf.acp.option.blacklist_hostnames.description"><![CDATA[Geben Sie pro Zeile einen Hostname an, die Sie von der Seite ausschließen möchten.]]></item>
+               <item name="wcf.acp.option.blacklist_ip_addresses"><![CDATA[IP-Adresse ausschließen]]></item>
+               <item name="wcf.acp.option.blacklist_ip_addresses.description"><![CDATA[Geben Sie pro Zeile eine IP-Adresse an, die Sie von der Seite ausschließen möchten.]]></item>
+               <item name="wcf.acp.option.blacklist_user_agents"><![CDATA[Browser-Kennung ausschließen]]></item>
+               <item name="wcf.acp.option.blacklist_user_agents.description"><![CDATA[Geben Sie pro Zeile eine Browser-Kennung (User-Agent) an, die Sie von der Seite ausschließen möchten.]]></item>
+               <item name="wcf.acp.option.category.security.blacklist"><![CDATA[Blacklist]]></item>
+               <item name="wcf.acp.option.category.security.blacklist.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.category.security.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.category.security.general"><![CDATA[Allgemein]]></item>
+               <item name="wcf.acp.option.category.security.general.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.category.security.general.session"><![CDATA[Sitzungen]]></item>
+               <item name="wcf.acp.option.category.security.general.session.description"><![CDATA[]]></item>
                 <item name="wcf.acp.option.session_timeout"><![CDATA[Gültigkeitslänge einer Sitzung]]></item>
                 <item name="wcf.acp.option.session_timeout.description"><![CDATA[Geben Sie an, wie lange die Sitzung gültig ist [Sekunden]. ]]></item>
                 <item name="wcf.acp.option.session_validate_ip_address"><![CDATA[IP-Adresse der Sitzung überprüfen]]></item>
-               <item name="wcf.acp.option.session_validate_ip_address.description"><![CDATA[Anzahl der Blöcke der IP-Adresse die beim Auslesen der Sitzung überprüft werden sollen. Eine hohe Einstellung kann Benutzer ausschließen, die mit wechselnden IP-Adressen im Internet unterwegs sind.]]></item>
+               <item name="wcf.acp.option.session_validate_ip_address.description"><![CDATA[Soll die IP-Adresse beim Auslesen der Sitzung überprüft werden?. Eine Aktivierung dieser Einstellung kann Benutzer ausschließen, die mit wechselnden IP-Adressen im Internet unterwegs sind.]]></item>
                 <item name="wcf.acp.option.session_validate_user_agent"><![CDATA[Browser-Kennung der Sitzung überprüfen]]></item>
                 <item name="wcf.acp.option.session_validate_user_agent.description"><![CDATA[Soll die Browser-Kennung beim Auslesen der Sitzung überprüft werden?]]></item>
-               <item name="wcf.acp.option.success"><![CDATA[Ihre Einstellungsänderungen wurden erfolgreich gespeichert.]]></item>
-               <item name="wcf.acp.option.timezone"><![CDATA[Zeitzone]]></item>
-               <item name="wcf.acp.option.timezone.description"><![CDATA[Wählen Sie die Standard Zeitzone Ihrer Seite.]]></item>
                 <item name="wcf.acp.option.user_online_timeout"><![CDATA[Timeout für Benutzer-Online]]></item>
                 <item name="wcf.acp.option.user_online_timeout.description"><![CDATA[Geben Sie an, wie lange der Benutzer trotz Inaktivität als online markiert werden soll [Sekunden].]]></item>
-               <item name="wcf.acp.option.category.general.page"><![CDATA[Seite]]></item>
-               <item name="wcf.acp.option.category.general.page.description"><![CDATA[]]></item>
-               <item name="wcf.acp.option.meta_description"><![CDATA[Meta Description]]></item>
-               <item name="wcf.acp.option.meta_description.description"><![CDATA[Geben Sie eine Meta Description an.]]></item>
-               <item name="wcf.acp.option.meta_keywords"><![CDATA[Meta Keywords]]></item>
-               <item name="wcf.acp.option.meta_keywords.description"><![CDATA[Tragen Sie die Wörter ein, die im Meta-Tag Keywords stehen sollen.]]></item>
-               <item name="wcf.acp.option.page_description"><![CDATA[Seitenbeschreibung]]></item>
-               <item name="wcf.acp.option.page_description.description"><![CDATA[Fügen Sie hier eine kurze Beschreibung Ihrer Seite ein.]]></item>
-               <item name="wcf.acp.option.page_title"><![CDATA[Titel der Seite]]></item>
-               <item name="wcf.acp.option.page_title.description"><![CDATA[Geben Sie hier den Globalen Titel der Seite an. Dieser Titel wird im Seitenkopf dargestellt, wenn Sie die Anzeige dieses Textes im Stileditor aktiviert haben.]]></item>
-               <item name="wcf.acp.option.page_url"><![CDATA[Adresse (URL) der Seite]]></item>
-               <item name="wcf.acp.option.page_url.description"><![CDATA[Geben Sie an, unter welcher Adresse (URL) die Seite aufzurufen ist (ohne abschließenden Slash).]]></item>
-               <item name="wcf.acp.option.page_urls"><![CDATA[Weitere URLs]]></item>
-               <item name="wcf.acp.option.page_urls.description"><![CDATA[Geben Sie hier weitere URLs an, unter denen Ihre Seite erreichbar ist.]]></item>
-       </category>
-       <category name="wcf.acp.package">
-               <item name="wcf.acp.package.cancel"><![CDATA[Abbruch der Paketinstallation]]></item>
-               <item name="wcf.acp.package.description"><![CDATA[Beschreibung]]></item>
-               <item name="wcf.acp.package.install"><![CDATA[Paketinstallation]]></item>
-               <item name="wcf.acp.package.install.cancel"><![CDATA[Installation abbrechen]]></item>
-               <item name="wcf.acp.package.install.cancel.sure"><![CDATA[Wollen Sie die Installation wirklich abbrechen?]]></item>
-               <item name="wcf.acp.package.install.error"><![CDATA[Die Abhängigkeiten dieses Paketes konnten nicht aufgelöst werden.]]></item>
-               <item name="wcf.acp.package.install.error.excludedPackages"><![CDATA[Die {if $action == 'install'}Paketinstallation{else}Paketaktualisierung{/if} von Paket &raquo;{$packageName}&laquo; in Version {$packageVersion} kann aufgrund von Inkompatibilitäten zu {if $excludedPackages|count == 1}folgendem Paket{else}folgenden Paketen{/if} nicht durchgeführt werden:]]></item>
-               <item name="wcf.acp.package.install.error.excludedPackages.excludedPackage"><![CDATA[{$excludedPackage.packageName}{if $excludedPackage.instanceNo > 1} (#{@$excludedPackage.instanceNo}){/if} in Version {$excludedPackage.packageVersion}]]></item>
-               <item name="wcf.acp.package.install.error.excludingPackages"><![CDATA[{if $excludingPackages|count == 1}Folgendes Paket lässt{else}Folgende Pakete lassen{/if} die {if $action == 'install'}Paketinstallation{else}Paketaktualisierung{/if} von Paket &raquo;{$packageName}&laquo; in Version {$packageVersion} aufgrund von Inkompatibilitäten nicht zu:]]></item>
-               <item name="wcf.acp.package.install.error.excludingPackages.excludingPackage"><![CDATA[{$excludingPackage.packageName}{if $excludingPackage.instanceNo > 1} (#{@$excludingPackage.instanceNo}){/if} in Version {$excludingPackage.packageVersion}]]></item>
-               <item name="wcf.acp.package.install.error.excludingPackages.warning"><![CDATA[{if $excludingPackages|count == 1}Folgendes Paket ist{else}Folgende Pakete sind{/if} mit dem Paket &raquo;{$packageName}&laquo; in Version {$packageVersion} nicht kompatibel. Wenn Sie die Installation fortführen, {if $excludingPackages|count == 1}wird das Paket{else}werden die Pakete{/if} vermutlich nicht mehr korrekt funktionieren.]]></item>
-               <item name="wcf.acp.package.install.packageName"><![CDATA[<span{if $package.open == 0} style="color: green"{else}{if !$package.file|isset} style="color: red"{/if}{/if}>{$package.name} ({if $package.open == 0}ist bereits installiert{else}{if $package.file|isset}liegt dem Paket bei{else}fehlt{/if}{/if})</span>]]></item>
-               <item name="wcf.acp.package.install.rollback.sure"><![CDATA[Wollen Sie die Paketinstallation wirklich abbrechen?]]></item>
-               <item name="wcf.acp.package.install.updatableInstances"><![CDATA[Folgende Pakete können mit diesem Paket aktualisiert werden]]></item>
-               <item name="wcf.acp.package.install.updatableInstances.description"><![CDATA[Wählen Sie eines der folgenden Pakete aus, um seine Version zu aktualisieren. Falls Sie das Paket neu installieren möchten, klicken Sie unten auf &raquo;Weiter&laquo;.]]></item>
-               <item name="wcf.acp.package.install.updatableInstances.warning"><![CDATA[Es ist bereits eine Kopie dieses Paketes installiert. Wenn Sie fortfahren, wird eine weitere Kopie dieses Paketes installiert. Falls Sie eine vorhandene Kopie dieses Paketes aktualisieren möchten, wählen Sie die Kopie aus der folgenden Liste aus.]]></item>
-               <item name="wcf.acp.package.install.version"><![CDATA[Version des Paketes:]]></item>
-               <item name="wcf.acp.package.installDate"><![CDATA[Installationsdatum]]></item>
-               <item name="wcf.acp.package.installation.file.error.unknown"><![CDATA[Beim Versuch die Dateien des Paketes zu entpacken, ist folgender Fehler aufgetreten:]]></item>
-               <item name="wcf.acp.package.installation.file.error.untarFailed"><![CDATA[Folgende Dateien konnten nicht erfolgreich entpackt werden. Bitte überprüfen Sie, ob der entsprechende Zielort beschreibbar ist.]]></item>
-               <item name="wcf.acp.package.installation.tables.conflict"><![CDATA[Tabellen Konflikt]]></item>
-               <item name="wcf.acp.package.installation.tables.dontAskAgainKeep"><![CDATA[Keine Tabellen überschreiben und während der gesamten Installation nicht mehr nachfragen.]]></item>
-               <item name="wcf.acp.package.installation.tables.dontAskAgainOverride"><![CDATA[Alle Tabellen überschreiben und während der gesamten Installation nicht mehr nachfragen.]]></item>
-               <item name="wcf.acp.package.installation.tables.solution"><![CDATA[Notwendige Änderungen]]></item>
-               <item name="wcf.acp.package.installation.tables.tableName"><![CDATA[Betroffene Tabelle]]></item>
-               <item name="wcf.acp.package.installation.tables.warning"><![CDATA[Vorhandene Tabellen Ihrer Datenbank stehen im Konflikt mit Tabellen, die für dieses Paket installiert werden müssen. Bitte wählen Sie aus, ob diese Tabellen überschrieben werden sollen.]]></item>
-               <item name="wcf.acp.package.list"><![CDATA[Installierte Pakete]]></item>
-               <item name="wcf.acp.package.list.author"><![CDATA[Hersteller]]></item>
-               <item name="wcf.acp.package.list.count"><![CDATA[{#$items} Paket{if $items != 1}e{/if} installiert]]></item>
-               <item name="wcf.acp.package.list.date"><![CDATA[Herstellungsdatum]]></item>
-               <item name="wcf.acp.package.list.id"><![CDATA[ID]]></item>
-               <item name="wcf.acp.package.list.name"><![CDATA[Name]]></item>
-               <item name="wcf.acp.package.list.other"><![CDATA[Sonstiges Paket]]></item>
-               <item name="wcf.acp.package.list.plugin"><![CDATA[Zusatzmodul]]></item>
-               <item name="wcf.acp.package.list.standalone"><![CDATA[Endanwendung]]></item>
-               <item name="wcf.acp.package.list.version"><![CDATA[Version]]></item>
-               <item name="wcf.acp.package.optionals"><![CDATA[Optionale Zusatzpakete installieren]]></item>
-               <item name="wcf.acp.package.optionals.description"><![CDATA[Das aktuelle Paket bringt folgende optionale Zusatzpakete mit. Bitte wählen Sie aus, welche Zusatzpakete Sie installieren möchten.]]></item>
-               <item name="wcf.acp.package.optionals.installed"><![CDATA[ (Dieses Paket ist bereits installiert.)]]></item>
-               <item name="wcf.acp.package.optionals.openRequirements"><![CDATA[ (Die Voraussetzungen für dieses Paket werden nicht erfüllt.)]]></item>
-               <item name="wcf.acp.package.packageDir"><![CDATA[Installationsverzeichnis]]></item>
-               <item name="wcf.acp.package.packageDir.description"><![CDATA[]]></item>
-               <item name="wcf.acp.package.packageDir.error.alreadyInstalled"><![CDATA[Es ist bereits eine andere Anwendung in dem angegebenen Verzeichnis installiert.]]></item>
-               <item name="wcf.acp.package.packageDir.error.invalid"><![CDATA[Das eingegebene Verzeichnis ist ungültig.]]></item>
-               <item name="wcf.acp.package.packageDir.error.notWritable"><![CDATA[Das angegebene Verzeichnis ist nicht beschreibbar.]]></item>
-               <item name="wcf.acp.package.packageDir.error.wcfDirLocked"><![CDATA[Das angegebene Verzeichnis wird bereits von WoltLab Community Framework beansprucht. Bitte wählen Sie ein anderes Verzeichnis.]]></item>
-               <item name="wcf.acp.package.packageDir.input"><![CDATA[Installationsverzeichnis]]></item>
-               <item name="wcf.acp.package.packageDir.url"><![CDATA[Installationsverzeichnis-Adresse (URL)]]></item>
-               <item name="wcf.acp.package.packageDir.url.description"><![CDATA[Nach der Installation in das angegebene Installationsverzeichnis ist die Anwendung über diese Adresse (URL) erreichbar:]]></item>
-               <item name="wcf.acp.package.requirements"><![CDATA[Abhängigkeiten auswählen]]></item>
-               <item name="wcf.acp.package.requirements.description"><![CDATA[Das aktuelle Paket benötigt Pakete, von denen mehrere Instanzen installiert sind. Bitte wählen Sie aus, zu welcher Instanz jeweils eine Abhängigkeit hergestellt werden soll.]]></item>
-               <item name="wcf.acp.package.rollback"><![CDATA[Paketinstallation zurücksetzen]]></item>
-               <item name="wcf.acp.package.shortPackageInfo"><![CDATA[Version {$packageVersion} - {@$packageDate|date} - Copyright &copy; {$packageAuthor}]]></item>
-               <item name="wcf.acp.package.startInstall"><![CDATA[Neues Paket installieren]]></item>
-               <item name="wcf.acp.package.startInstall.error.noValidInstall"><![CDATA[Das angegebene Paket lässt keine Neuinstallation zu.]]></item>
-               <item name="wcf.acp.package.startInstall.error.noValidPackage"><![CDATA[Das angegebene Archiv ist kein gültiges Paket.]]></item>
-               <item name="wcf.acp.package.startInstall.error.noValidUpdate"><![CDATA[Paket &raquo;{$package->getName()}&laquo; kann mit dem angegebenen Archiv nicht aktualisiert werden.]]></item>
-               <item name="wcf.acp.package.startInstall.error.notFound"><![CDATA[Es konnte keine Datei unter dem angegebenen Pfad gefunden wurden.]]></item>
-               <item name="wcf.acp.package.startInstall.error.uniqueAlreadyInstalled"><![CDATA[Dieses Paket ist bereits installiert. Das Paket kann nicht mehrfach installiert werden.]]></item>
-               <item name="wcf.acp.package.startInstall.error.uploadFailed"><![CDATA[Das Hochladen der ausgewählten Datei ist fehlgeschlagen.]]></item>
-               <item name="wcf.acp.package.startInstall.source"><![CDATA[Quelle auswählen]]></item>
-               <item name="wcf.acp.package.startInstall.source.download"><![CDATA[Direkten Pfad zum Paket angeben]]></item>
-               <item name="wcf.acp.package.startInstall.source.download.description"><![CDATA[Geben Sie den direkten Pfad zur Paketdatei an. Dabei kann es sich um die Internet Adresse der Paketdatei oder alternativ den Pfad zur Paketdatei im Dateisystem handeln.]]></item>
-               <item name="wcf.acp.package.startInstall.source.upload"><![CDATA[Paket vom lokalen Computer hochladen]]></item>
-               <item name="wcf.acp.package.startInstall.source.upload.description"><![CDATA[Geben Sie eine Paketdatei von Ihrem lokalen Rechner an.]]></item>
-               <item name="wcf.acp.package.startUpdate"><![CDATA[Paket &raquo;{$package->getName()}&laquo; aktualisieren]]></item>
-               <item name="wcf.acp.package.step.install.ACPMenuPackageInstallationPlugin"><![CDATA[Menüpunkte der Administrationsoberfläche werden installiert ...]]></item>
-               <item name="wcf.acp.package.step.install.ACPTemplatePackageInstallationPlugin"><![CDATA[Templates der Administrationsoberfläche werden installiert ...]]></item>
-               <item name="wcf.acp.package.step.install.CronjobPackageInstallationPlugin"><![CDATA[Zeitgesteuerte Aufgaben werden installiert ...]]></item>
-               <item name="wcf.acp.package.step.install.EventListenerPackageInstallationPlugin"><![CDATA[Event-Listener werden installiert ...]]></item>
-               <item name="wcf.acp.package.step.install.FilePackageInstallationPlugin"><![CDATA[Dateien werden entpackt ...]]></item>
-               <item name="wcf.acp.package.step.install.GroupOptionPackageInstallationPlugin"><![CDATA[Benutzergruppeneinstellungen werden installiert ...]]></item>
-               <item name="wcf.acp.package.step.install.LanguagePackageInstallationPlugin"><![CDATA[Sprache wird installiert ...]]></item>
-               <item name="wcf.acp.package.step.install.OptionPackageInstallationPlugin"><![CDATA[Optionen werden installiert ...]]></item>
-               <item name="wcf.acp.package.step.install.ScriptPackageInstallationPlugin"><![CDATA[Spezielles Skript wird ausgeführt ...]]></item>
-               <item name="wcf.acp.package.step.install.SQLPackageInstallationPlugin"><![CDATA[Datenbank wird installiert ...]]></item>
-               <item name="wcf.acp.package.step.install.TemplatePackageInstallationPlugin"><![CDATA[Templates werden installiert ...]]></item>
-               <item name="wcf.acp.package.step.install.UserOptionPackageInstallationPlugin"><![CDATA[Benutzerprofilfelder werden installiert ...]]></item>
-               <item name="wcf.acp.package.step.install.exclusions"><![CDATA[Mögliche Konflikte werden überprüft ...]]></item>
-               <item name="wcf.acp.package.step.install.execPackageInstallationPlugins"><![CDATA[Paket-Installations-Zusatzmodule werden ausgeführt ...]]></item>
-               <item name="wcf.acp.package.step.install.finish"><![CDATA[Installation abgeschlossen]]></item>
-               <item name="wcf.acp.package.step.install.optionals"><![CDATA[Optionale Pakete werden installiert ...]]></item>
-               <item name="wcf.acp.package.step.install.package"><![CDATA[Paket wird registriert ...]]></item>
-               <item name="wcf.acp.package.step.install.packageInstallationPlugins"><![CDATA[Paket-Installations-Zusatzmodule werden installiert ...]]></item>
-               <item name="wcf.acp.package.step.install.parent"><![CDATA[Zuordnung zum übergeordneten Paket wird vorgenommen ...]]></item>
-               <item name="wcf.acp.package.step.install.requirements"><![CDATA[Abhängigkeiten werden aufgelöst ...]]></item>
-               <item name="wcf.acp.package.step.title"><![CDATA[Paket <strong>{$packageName|encodeJS}</strong>: ]]></item>
-               <item name="wcf.acp.package.step.uninstall.ACPMenuPackageInstallationPlugin"><![CDATA[Menüpunkte der Administrationsoberfläche werden deinstalliert ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.ACPTemplatePackageInstallationPlugin"><![CDATA[Templates der Administrationsoberfläche werden deinstalliert ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.CronjobPackageInstallationPlugin"><![CDATA[Zeitgesteuerte Aufgaben werden deinstalliert ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.EventListenerPackageInstallationPlugin"><![CDATA[Event-Listener werden deinstalliert ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.FilePackageInstallationPlugin"><![CDATA[Dateien werden gelöscht ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.GroupOptionPackageInstallationPlugin"><![CDATA[Benutzergruppeneinstellungen werden deinstalliert ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.LanguagePackageInstallationPlugin"><![CDATA[Sprache wird deinstalliert ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.OptionPackageInstallationPlugin"><![CDATA[Optionen werden deinstalliert ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.SQLPackageInstallationPlugin"><![CDATA[Datenbank wird deinstalliert ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.TemplatePackageInstallationPlugin"><![CDATA[Templates werden deinstalliert ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.UserOptionPackageInstallationPlugin"><![CDATA[Benutzerprofilfelder werden deinstalliert ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.execPackageInstallationPlugins"><![CDATA[Paket-Installations-Zusatzmodule werden ausgeführt ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.finish"><![CDATA[Deinstallation abgeschlossen]]></item>
-               <item name="wcf.acp.package.step.uninstall.optionals"><![CDATA[Optionale Pakete werden deinstalliert ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.packageInstallationPlugins"><![CDATA[Paket-Installations-Zusatzmodule werden deinstalliert ...]]></item>
-               <item name="wcf.acp.package.step.uninstall.requirements"><![CDATA[Abhängigkeiten werden aufgelöst ...]]></item>
-               <item name="wcf.acp.package.step.update.ACPMenuPackageInstallationPlugin"><![CDATA[Menüpunkte der Administrationsoberfläche werden aktualisiert ...]]></item>
-               <item name="wcf.acp.package.step.update.ACPTemplatePackageInstallationPlugin"><![CDATA[Templates der Administrationsoberfläche werden aktualisiert ...]]></item>
-               <item name="wcf.acp.package.step.update.CronjobPackageInstallationPlugin"><![CDATA[Zeitgesteuerte Aufgaben werden aktualisiert ...]]></item>
-               <item name="wcf.acp.package.step.update.EventListenerPackageInstallationPlugin"><![CDATA[Event-Listener werden aktualisiert ...]]></item>
-               <item name="wcf.acp.package.step.update.FilePackageInstallationPlugin"><![CDATA[Dateien werden entpackt ...]]></item>
-               <item name="wcf.acp.package.step.update.GroupOptionPackageInstallationPlugin"><![CDATA[Benutzergruppeneinstellungen werden aktualisiert ...]]></item>
-               <item name="wcf.acp.package.step.update.LanguagePackageInstallationPlugin"><![CDATA[Sprache wird aktualisiert ...]]></item>
-               <item name="wcf.acp.package.step.update.OptionPackageInstallationPlugin"><![CDATA[Optionen werden aktualisiert ...]]></item>
-               <item name="wcf.acp.package.step.update.ScriptPackageInstallationPlugin"><![CDATA[Spezielles Skript wird ausgeführt ...]]></item>
-               <item name="wcf.acp.package.step.update.SQLPackageInstallationPlugin"><![CDATA[Datenbank wird aktualisiert ...]]></item>
-               <item name="wcf.acp.package.step.update.TemplatePackageInstallationPlugin"><![CDATA[Templates werden aktualisiert ...]]></item>
-               <item name="wcf.acp.package.step.update.UserOptionPackageInstallationPlugin"><![CDATA[Benutzerprofilfelder werden aktualisiert ...]]></item>
-               <item name="wcf.acp.package.step.update.execPackageInstallationPlugins"><![CDATA[Paket-Installations-Zusatzmodule werden ausgeführt ...]]></item>
-               <item name="wcf.acp.package.step.update.exclusions"><![CDATA[Mögliche Konflikte werden überprüft ...]]></item>
-               <item name="wcf.acp.package.step.update.finish"><![CDATA[Paketaktualisierung abgeschlossen]]></item>
-               <item name="wcf.acp.package.step.update.optionals"><![CDATA[Optionale Pakete werden aktualisiert ...]]></item>
-               <item name="wcf.acp.package.step.update.package"><![CDATA[Paket wird aktualisiert ...]]></item>
-               <item name="wcf.acp.package.step.update.packageInstallationPlugins"><![CDATA[Paket-Installations-Zusatzmodule werden aktualisiert ...]]></item>
-               <item name="wcf.acp.package.step.update.parent"><![CDATA[Zuordnung zum übergeordneten Paket wird vorgenommen ...]]></item>
-               <item name="wcf.acp.package.step.update.requirements"><![CDATA[Abhängigkeiten werden aufgelöst ...]]></item>
-               <item name="wcf.acp.package.uninstall"><![CDATA[Paketdeinstallation]]></item>
-               <item name="wcf.acp.package.uninstall.cancel"><![CDATA[Abbruch der Paketdeinstallation]]></item>
-               <item name="wcf.acp.package.uninstall.dependentPackages.error"><![CDATA[Die Deinstallation des Paketes ist nicht möglich, da mindestens ein abhängiges Paket nicht deinstalliert werden kann.]]></item>
-               <item name="wcf.acp.package.uninstall.dependentPackages.warning"><![CDATA[Diese{if $dependentPackages|count == 1}s Paket wird{else} Pakete werden{/if}, nach Ihrer Bestätigung, ohne weitere Sicherheitsabfrage deinstalliert.]]></item>
-               <item name="wcf.acp.package.update"><![CDATA[Paketaktualisierung]]></item>
-               <item name="wcf.acp.package.updateDate"><![CDATA[Aktualisierungsdatum]]></item>
-               <item name="wcf.acp.package.view.author"><![CDATA[Hersteller]]></item>
-               <item name="wcf.acp.package.view.button.makeActive"><![CDATA[Zur Administrationsoberfläche wechseln]]></item>
-               <item name="wcf.acp.package.view.button.uninstall"><![CDATA[Paket deinstallieren]]></item>
-               <item name="wcf.acp.package.view.button.uninstall.all"><![CDATA[Alle Pakete deinstallieren]]></item>
-               <item name="wcf.acp.package.view.button.uninstall.sure"><![CDATA[Wollen Sie dieses Paket wirklich deinstallieren?]]></item>
-               <item name="wcf.acp.package.view.button.update"><![CDATA[Paket aktualisieren]]></item>
-               <item name="wcf.acp.package.view.date"><![CDATA[Herstellungsdatum]]></item>
-               <item name="wcf.acp.package.view.dependentPackages"><![CDATA[Abhängige Pakete]]></item>
-               <item name="wcf.acp.package.view.dependentPackages.description"><![CDATA[Dieses Paket wird von {#$dependentPackages|count} {if $dependentPackages|count == 1}anderen Paket{else}anderen Paketen{/if} benötigt.]]></item>
-               <item name="wcf.acp.package.view.dependentPackages.uninstall.description"><![CDATA[{if $dependentPackages|count == 1}Dieses Paket wird von 1 anderen Paket benötigt{else}{#$dependentPackages|count} Pakete sind direkt oder indirekt von diesem Paket abhängig{/if}.]]></item>
-               <item name="wcf.acp.package.view.dir"><![CDATA[Installationsverzeichnis]]></item>
-               <item name="wcf.acp.package.view.identifier"><![CDATA[Bezeichner]]></item>
-               <item name="wcf.acp.package.view.instanceNo"><![CDATA[Installierte Instanz]]></item>
-               <item name="wcf.acp.package.view.parent"><![CDATA[Übergeordnetes Paket]]></item>
-               <item name="wcf.acp.package.view.properties"><![CDATA[Eigenschaften]]></item>
-               <item name="wcf.acp.package.view.requiredPackages"><![CDATA[Benötigte Pakete]]></item>
-               <item name="wcf.acp.package.view.requiredPackages.description"><![CDATA[Dieses Paket benötigt {#$requiredPackages|count} {if $requiredPackages|count == 1}anderes Paket{else}andere Pakete{/if}.]]></item>
-               <item name="wcf.acp.package.view.url"><![CDATA[Adresse (URL)]]></item>
-               <item name="wcf.acp.package.view.version"><![CDATA[Installierte Version]]></item>
-       </category>
-       <category name="wcf.acp.packageUpdate">
-               <item name="wcf.acp.packageUpdate"><![CDATA[Pakete aktualisieren]]></item>
-               <item name="wcf.acp.packageUpdate.auth"><![CDATA[Authentifizierung mit Update-Server]]></item>
-               <item name="wcf.acp.packageUpdate.auth.data"><![CDATA[Verbindungs-Daten]]></item>
-               <item name="wcf.acp.packageUpdate.auth.error"><![CDATA[Benutzername und Kennwort wurden nicht akzeptiert.]]></item>
-               <item name="wcf.acp.packageUpdate.auth.htPassword"><![CDATA[Kennwort]]></item>
-               <item name="wcf.acp.packageUpdate.auth.htPassword.description"><![CDATA[Geben Sie ein Kennwort an, das zur Authentifizierung benötigt wird.]]></item>
-               <item name="wcf.acp.packageUpdate.auth.htUsername"><![CDATA[Benutzername]]></item>
-               <item name="wcf.acp.packageUpdate.auth.htUsername.description"><![CDATA[Geben Sie einen Benutzernamen an, der zur Authentifizierung benötigt wird.]]></item>
-               <item name="wcf.acp.packageUpdate.auth.input"><![CDATA[Benutzeranmeldung]]></item>
-               <item name="wcf.acp.packageUpdate.auth.message"><![CDATA[Server-Meldung]]></item>
-               <item name="wcf.acp.packageUpdate.auth.realm"><![CDATA[Server-Name]]></item>
-               <item name="wcf.acp.packageUpdate.auth.save"><![CDATA[Benutzerdaten dauerhaft speichern]]></item>
-               <item name="wcf.acp.packageUpdate.auth.save.description"><![CDATA[Speichert die eingegebenen Benutzerdaten dauerhaft, sodass Sie die Daten zu einem späteren Zeitpunkt nicht erneut eingeben müssen.]]></item>
-               <item name="wcf.acp.packageUpdate.auth.url"><![CDATA[Adresse]]></item>
-               <item name="wcf.acp.packageUpdate.currentVersion"><![CDATA[Installierte Version]]></item>
-               <item name="wcf.acp.packageUpdate.error"><![CDATA[Es ist folgender Fehler aufgetreten: ]]></item>
-               <item name="wcf.acp.packageUpdate.error.downloadFailed"><![CDATA[Das Herunterladen des Paketes {$package} ist fehlgeschlagen.]]></item>
-               <item name="wcf.acp.packageUpdate.error.listNotFound"><![CDATA[Beim Versuch die Paketliste herunterzuladen, ist ein Fehler aufgetreten.]]></item>
-               <item name="wcf.acp.packageUpdate.excludedPackages"><![CDATA[Es {if $excludedPackages|count == 1}ist folgender Konflikt{else}sind folgende Konflikte{/if} aufgetreten:]]></item>
-               <item name="wcf.acp.packageUpdate.excludedPackages.existingPackageExcludesNewPackage"><![CDATA[Das installierte Paket &raquo;{$excludedPackage.existingPackageName}&laquo; ist mit dem Paket &raquo;{$excludedPackage.packageName}&laquo; in Version {$excludedPackage.packageVersion} nicht kompatibel.]]></item>
-               <item name="wcf.acp.packageUpdate.excludedPackages.newPackageExcludesExistingPackage"><![CDATA[Das Paket &raquo;{$excludedPackage.packageName}&laquo; in Version {$excludedPackage.packageVersion} ist mit dem installierten Paket &raquo;{$excludedPackage.existingPackageName}&laquo; nicht kompatibel.]]></item>
-               <item name="wcf.acp.packageUpdate.install"><![CDATA[{$package.packageName} {$package.packageVersion} wird installiert]]></item>
-               <item name="wcf.acp.packageUpdate.noneAvailable"><![CDATA[Derzeit sind keine Updates verfügbar.]]></item>
-               <item name="wcf.acp.packageUpdate.noneSelected"><![CDATA[Sie haben kein Update ausgewählt.]]></item>
-               <item name="wcf.acp.packageUpdate.options"><![CDATA[Optionen]]></item>
-               <item name="wcf.acp.packageUpdate.options.alreadyInstalledUnique"><![CDATA[Das Paket ist bereits installiert und kann kein weiteres Mal installiert werden.]]></item>
-               <item name="wcf.acp.packageUpdate.options.install"><![CDATA[Paket installieren]]></item>
-               <item name="wcf.acp.packageUpdate.options.installAlreadyInstalled"><![CDATA[Weitere Paket-Instanz installieren (Paket ist bereits {#$package.instances} mal installiert)]]></item>
-               <item name="wcf.acp.packageUpdate.options.update"><![CDATA[Installiertes Paket {$updatableInstance.packageName}{if $updatableInstance.instanceNo > 1} (#{$updatableInstance.instanceNo}){/if} Version {$updatableInstance.packageVersion} aktualisieren]]></item>
-               <item name="wcf.acp.packageUpdate.search"><![CDATA[Pakete suchen]]></item>
-               <item name="wcf.acp.packageUpdate.search.author"><![CDATA[Autor]]></item>
-               <item name="wcf.acp.packageUpdate.search.conditions"><![CDATA[Suche nach ...]]></item>
-               <item name="wcf.acp.packageUpdate.search.ignoreUniques"><![CDATA[Bereits installierte einzigartige Pakete ausblenden]]></item>
-               <item name="wcf.acp.packageUpdate.search.packageName"><![CDATA[Paketname]]></item>
-               <item name="wcf.acp.packageUpdate.search.searchDescription"><![CDATA[Paketname und -beschreibung durchsuchen]]></item>
-               <item name="wcf.acp.packageUpdate.search.server"><![CDATA[Update-Server]]></item>
-               <item name="wcf.acp.packageUpdate.search.server.all"><![CDATA[Alle Update-Server durchsuchen]]></item>
-               <item name="wcf.acp.packageUpdate.search.type"><![CDATA[Art des Paketes]]></item>
-               <item name="wcf.acp.packageUpdate.search.type.other"><![CDATA[Sonstige Pakete]]></item>
-               <item name="wcf.acp.packageUpdate.search.type.plugin"><![CDATA[Zusatzmodul für bereits installierte Pakete]]></item>
-               <item name="wcf.acp.packageUpdate.search.type.standalone"><![CDATA[Endanwendung]]></item>
-               <item name="wcf.acp.packageUpdate.selectAll"><![CDATA[Alle Pakete auswählen]]></item>
-               <item name="wcf.acp.packageUpdate.update"><![CDATA[{$package.packageName}{if $package.instanceNo > 1} (#{#$package.instanceNo}){/if} {$package.fromversion} wird aktualisiert auf {$package.toVersion}]]></item>
-               <item name="wcf.acp.packageUpdate.updates"><![CDATA[Folgende Paket-Aktualisierungen/-Installationen werden durchgeführt:]]></item>
-               <item name="wcf.acp.packageUpdate.updateVersion"><![CDATA[Neue Version]]></item>
-       </category>
-       <category name="wcf.acp.sessionLog">
-               <item name="wcf.acp.sessionLog.access.list"><![CDATA[Aktionen der protokollierten Sitzung von &raquo;{$sessionLog->username}&laquo;]]></item>
-               <item name="wcf.acp.sessionLog.access.list.count"><![CDATA[{#$items} protokollierte Aktion{if $items != 1}en{/if}]]></item>
-               <item name="wcf.acp.sessionLog.accesses"><![CDATA[Aktionen]]></item>
-               <item name="wcf.acp.sessionLog.className"><![CDATA[Klasse]]></item>
-               <item name="wcf.acp.sessionLog.ipAddress"><![CDATA[IP-Adresse]]></item>
-               <item name="wcf.acp.sessionLog.lastActivityTime"><![CDATA[Letzte Aktion]]></item>
-               <item name="wcf.acp.sessionLog.list"><![CDATA[Protokollierte Sitzungen]]></item>
-               <item name="wcf.acp.sessionLog.list.count"><![CDATA[{#$items} protokollierte Sitzung{if $items != 1}en{/if}]]></item>
-               <item name="wcf.acp.sessionLog.packageName"><![CDATA[Paket]]></item>
-               <item name="wcf.acp.sessionLog.requestMethod"><![CDATA[Methode]]></item>
-               <item name="wcf.acp.sessionLog.requestURI"><![CDATA[URI]]></item>
-               <item name="wcf.acp.sessionLog.sessionAccessLogID"><![CDATA[ID]]></item>
-               <item name="wcf.acp.sessionLog.sessionLogID"><![CDATA[ID]]></item>
-               <item name="wcf.acp.sessionLog.time"><![CDATA[Datum]]></item>
-               <item name="wcf.acp.sessionLog.userAgent"><![CDATA[Browser-Kennung]]></item>
+               <item name="wcf.acp.option.export"><![CDATA[Optionen sichern]]></item>
+               <item name="wcf.acp.option.export.download"><![CDATA[Sicherung der Optionen herunterladen]]></item>
+               <item name="wcf.acp.option.export.download.description"><![CDATA[Laden Sie eine Sicherung der Optionen auf Ihren lokalen Rechner herunter.]]></item>
+               <item name="wcf.acp.option.import"><![CDATA[Optionen wiederherstellen]]></item>
+               <item name="wcf.acp.option.import.upload"><![CDATA[Sicherung der Optionen vom lokalen Computer hochladen]]></item>
+               <item name="wcf.acp.option.import.upload.description"><![CDATA[Wählen Sie eine Sicherung der Optionen von Ihrem lokalen Rechner aus.]]></item>
+               <item name="wcf.acp.option.importAndExport"><![CDATA[Optionen sichern &amp; wiederherstellen]]></item>
+               <item name="wcf.acp.option.category.general.date"><![CDATA[Datum &amp; Zeit]]></item>
+               <item name="wcf.acp.option.category.general.date.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.category.general.image"><![CDATA[Grafik]]></item>
+               <item name="wcf.acp.option.category.general.image.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.import.error.importFailed"><![CDATA[Die Optionen konnten nicht erfolgreich importiert werden.]]></item>
+               <item name="wcf.acp.option.timezone"><![CDATA[Zeitzone]]></item>
+               <item name="wcf.acp.option.timezone.description"><![CDATA[Wählen Sie die Standard-Zeitzone Ihrer Seite.]]></item>
+               <item name="wcf.acp.option.import.success"><![CDATA[Die Optionen wurden erfolgreich importiert.]]></item>
         </category>
+       
         <category name="wcf.acp.updateServer">
                 <item name="wcf.acp.updateServer.add"><![CDATA[Server hinzufügen]]></item>
-               <item name="wcf.acp.updateServer.add.success"><![CDATA[Der Server wurde erfolgreich angelegt.]]></item>
                 <item name="wcf.acp.updateServer.data"><![CDATA[Server-Daten]]></item>
-               <item name="wcf.acp.updateServer.delete"><![CDATA[Server löschen]]></item>
-               <item name="wcf.acp.updateServer.delete.success"><![CDATA[Der Server wurde erfolgreich gelöscht.]]></item>
-               <item name="wcf.acp.updateServer.delete.sure"><![CDATA[Wollen Sie den Server wirklich löschen?]]></item>
-               <item name="wcf.acp.updateServer.disable"><![CDATA[Deaktivieren]]></item>
+               <item name="wcf.acp.updateServer.delete.sure"><![CDATA[Wollen Sie den Server &raquo;{$updateServer->serverURL}&laquo; wirklich löschen?]]></item>
                 <item name="wcf.acp.updateServer.edit"><![CDATA[Server bearbeiten]]></item>
-               <item name="wcf.acp.updateServer.edit.success"><![CDATA[Ihre Änderungen wurden erfolgreich gespeichert.]]></item>
-               <item name="wcf.acp.updateServer.enable"><![CDATA[Aktivieren]]></item>
                 <item name="wcf.acp.updateServer.errorMessage"><![CDATA[Fehlermeldungen]]></item>
-               <item name="wcf.acp.updateServer.lastErrorText"><![CDATA[Beim letzten Verbindungsversuch trat folgender Fehler auf:]]></item>
                 <item name="wcf.acp.updateServer.list"><![CDATA[Verfügbare Update-Server]]></item>
                 <item name="wcf.acp.updateServer.list.count"><![CDATA[{#$items} Updateserver eingetragen]]></item>
-               <item name="wcf.acp.updateServer.list.noneAvailable"><![CDATA[Es sind keine Update-Server eingetragen.]]></item>
+               <item name="wcf.acp.updateServer.lastErrorText"><![CDATA[Beim letzten Verbindungsversuch trat folgender Fehler auf:]]></item>
                 <item name="wcf.acp.updateServer.loginPassword"><![CDATA[Kennwort]]></item>
                 <item name="wcf.acp.updateServer.loginPassword.description"><![CDATA[Geben Sie ein Kennwort an, das zur Authentifizierung benötigt wird (optional).]]></item>
                 <item name="wcf.acp.updateServer.loginUsername"><![CDATA[Benutzername]]></item>
                 <item name="wcf.acp.updateServer.loginUsername.description"><![CDATA[Geben Sie einen Benutzernamen an, der zur Authentifizierung benötigt wird (optional).]]></item>
-               <item name="wcf.acp.updateServer.packageUpdateServerID"><![CDATA[Server-ID]]></item>
                 <item name="wcf.acp.updateServer.packages"><![CDATA[Pakete]]></item>
                 <item name="wcf.acp.updateServer.serverURL"><![CDATA[Adresse]]></item>
                 <item name="wcf.acp.updateServer.serverURL.description"><![CDATA[Geben Sie die Adresse (URL) zu einem Paketserver an.]]></item>
@@ -642,23 +349,27 @@
                 <item name="wcf.acp.updateServer.status"><![CDATA[Status]]></item>
                 <item name="wcf.acp.updateServer.lastUpdateTime"><![CDATA[Letzter Zugriff]]></item>
         </category>
+       
+       <category name="wcf.acp.sessionLog">
+               <item name="wcf.acp.sessionLog.access.list"><![CDATA[Aktionen der protokollierten Sitzung von &raquo;{$sessionLog->username}&laquo;]]></item>
+               <item name="wcf.acp.sessionLog.access.list.count"><![CDATA[{#$items} protokollierte Aktion{if $items != 1}en{/if}]]></item>
+               <item name="wcf.acp.sessionLog.accesses"><![CDATA[Aktionen]]></item>
+               <item name="wcf.acp.sessionLog.className"><![CDATA[Klasse]]></item>
+               <item name="wcf.acp.sessionLog.lastActivityTime"><![CDATA[Letzte Aktion]]></item>
+               <item name="wcf.acp.sessionLog.list"><![CDATA[Protokollierte Sitzungen]]></item>
+               <item name="wcf.acp.sessionLog.list.count"><![CDATA[{#$items} protokollierte Sitzung{if $items != 1}en{/if}]]></item>
+               <item name="wcf.acp.sessionLog.packageName"><![CDATA[Paket]]></item>
+               <item name="wcf.acp.sessionLog.requestMethod"><![CDATA[Methode]]></item>
+               <item name="wcf.acp.sessionLog.requestURI"><![CDATA[URI]]></item>
+               <item name="wcf.acp.sessionLog.time"><![CDATA[Datum]]></item>
+       </category>
+       
         <category name="wcf.acp.user">
                 <item name="wcf.acp.user.add"><![CDATA[Benutzer hinzufügen]]></item>
-               <item name="wcf.acp.user.add.data"><![CDATA[Benutzerdaten]]></item>
-               <item name="wcf.acp.user.add.success"><![CDATA[Der neue Benutzer wurde erfolgreich gespeichert.]]></item>
                 <item name="wcf.acp.user.assignToGroup"><![CDATA[Benutzergruppe zuweisen]]></item>
                 <item name="wcf.acp.user.assignToGroup.markedUsers"><![CDATA[Folgende Benutzer den unten ausgewählten Benutzergruppen zuweisen]]></item>
-               <item name="wcf.acp.user.assignToGroup.success"><![CDATA[Die Zuweisung wurde erfolgreich gespeichert.]]></item>
-               <item name="wcf.acp.user.button.assignGroup"><![CDATA[Benutzergruppe zuweisen]]></item>
-               <item name="wcf.acp.user.button.exportMail"><![CDATA[E-Mail-Adressen exportieren]]></item>
-               <item name="wcf.acp.user.button.sendMail"><![CDATA[E-Mail senden]]></item>
-               <item name="wcf.acp.user.delete"><![CDATA[Benutzer löschen]]></item>
-               <item name="wcf.acp.user.delete.error"><![CDATA[Es konnte kein Benutzer gelöscht werden.]]></item>
-               <item name="wcf.acp.user.delete.success"><![CDATA[{if $deletedUsers == 1}Der Benutzer wurde{else}{#$deletedUsers} Benutzer wurden{/if} erfolgreich gelöscht.]]></item>
-               <item name="wcf.acp.user.delete.sure"><![CDATA[Wollen Sie diesen Benutzer wirklich löschen?]]></item>
-               <item name="wcf.acp.user.deleteMarked.sure"><![CDATA[Wollen Sie die markierten Benutzer wirklich löschen?]]></item>
+               <item name="wcf.acp.user.delete.sure"><![CDATA[Wollen Sie Benutzer &raquo;{$user->username}&laquo; wirklich löschen?]]></item>
                 <item name="wcf.acp.user.edit"><![CDATA[Benutzer bearbeiten]]></item>
-               <item name="wcf.acp.user.edit.success"><![CDATA[Die Änderungen an diesem Benutzer wurden erfolgreich gespeichert.]]></item>
                 <item name="wcf.acp.user.edit.warning.selfEdit"><![CDATA[Sie bearbeiten Ihr eigenes Benutzerkonto. Änderungen an den Mitgliedschaften in Benutzergruppen können womöglich dazu führen, dass Sie aus der Administrationsoberfläche ausgeschlossen werden. Bitte seien Sie entsprechend vorsichtig!]]></item>
                 <item name="wcf.acp.user.exportEmailAddress"><![CDATA[E-Mail-Adressen exportieren]]></item>
                 <item name="wcf.acp.user.exportEmailAddress.fileType"><![CDATA[Exportformat]]></item>
@@ -673,14 +384,12 @@
                 <item name="wcf.acp.user.list"><![CDATA[Benutzer]]></item>
                 <item name="wcf.acp.user.list.all"><![CDATA[Alle Benutzer]]></item>
                 <item name="wcf.acp.user.list.count"><![CDATA[{#$items} Benutzer]]></item>
-               <item name="wcf.acp.user.markedUsers"><![CDATA[this.count == 1 ? "Einen Benutzer markiert" : this.count+" Benutzer markiert"]]></item>
                 <item name="wcf.acp.user.massProcessing"><![CDATA[Massenverarbeitung von Benutzern]]></item>
                 <item name="wcf.acp.user.massProcessing.action"><![CDATA[Aktion]]></item>
                 <item name="wcf.acp.user.massProcessing.conditions"><![CDATA[Bedingungen]]></item>
                 <item name="wcf.acp.user.massProcessing.success"><![CDATA[Die gewählte Aktion wurde erfolgreich auf {#$affectedUsers} Benutzer ausgeführt.]]></item>
                 <item name="wcf.acp.user.massProcessing.warning"><![CDATA[Die Massenverarbeitung von Benutzern führt die unten ausgewählte Aktion <b>ohne zusätzliche Sicherheitsabfrage</b> auf alle Benutzer aus, die unter die eingestellten Bedingungen fallen. Die Bearbeitungen können unter Umständen sehr rechenintensiv werden und sollten deshalb möglichst nur dann ausgeführt werden, wenn sich die Seite im Wartungsmodus befindet! Die Veränderungen können nicht rückgängig gemacht werden. Bitte benutzen Sie diese Funktion mit der nötigen Vorsicht!]]></item>
                 <item name="wcf.acp.user.search"><![CDATA[Benutzer suchen]]></item>
-               <item name="wcf.acp.user.search.conditions"><![CDATA[Kriterien der Suche]]></item>
                 <item name="wcf.acp.user.search.conditions.general"><![CDATA[Allgemein]]></item>
                 <item name="wcf.acp.user.search.conditions.profile"><![CDATA[Profil]]></item>
                 <item name="wcf.acp.user.search.display"><![CDATA[Darstellung]]></item>
@@ -692,7 +401,6 @@
                 <item name="wcf.acp.user.search.display.sort"><![CDATA[Sortierung]]></item>
                 <item name="wcf.acp.user.search.error.noMatches"><![CDATA[Zu den angegebenen Kriterien wurde kein Benutzer gefunden.]]></item>
                 <item name="wcf.acp.user.search.matches"><![CDATA[{if $items == 1}Ein Ergebnis{else}{#$items} Ergebnisse{/if}]]></item>
-               <item name="wcf.acp.user.search.withinResults"><![CDATA[In den Ergebnissen suchen]]></item>
                 <item name="wcf.acp.user.sendMail"><![CDATA[E-Mail an Benutzer senden]]></item>
                 <item name="wcf.acp.user.sendMail.all"><![CDATA[E-Mail an alle Benutzer]]></item>
                 <item name="wcf.acp.user.sendMail.enableHTML"><![CDATA[E-Mail als HTML versenden]]></item>
@@ -708,309 +416,185 @@
                 <item name="wcf.acp.user.sendMail.subject.description"><![CDATA[Geben Sie hier die Betreffzeile der E-Mail an.]]></item>
                 <item name="wcf.acp.user.sendMail.text"><![CDATA[Nachricht]]></item>
                 <item name="wcf.acp.user.sendMail.text.description"><![CDATA[Tragen Sie hier die Nachricht ein, die Sie den Benutzern senden möchten.]]></item>
-               <item name="wcf.acp.user.userNote"><![CDATA[Angemeldet als {$this->user->username}.]]></item>
+               <item name="wcf.acp.user.userNote"><![CDATA[Hallo {$__wcf->user->username}!]]></item>
         </category>
-       <category name="wcf.acp.worker">
-               <item name="wcf.acp.worker.currentStep"><![CDATA[Aktueller Schritt]]></item>
-               <item name="wcf.acp.worker.description"><![CDATA[Bitte lassen Sie dieses Browser-Fenster offen, bis der Prozess abgeschlossen ist und melden Sie sich auf keinen Fall in einem anderen Browser-Fenster separat in der Administrationsoberfläche an, da dies den Prozess behindern könnte.]]></item>
-               <item name="wcf.acp.worker.progress.finish"><![CDATA[Vorgang erfolgreich abgeschlossen]]></item>
-               <item name="wcf.acp.worker.progress.working"><![CDATA[Vorgang läuft ...]]></item>
-               <item name="wcf.acp.worker.progressBar"><![CDATA[{@$progress}% fertiggestellt]]></item>
-               <item name="wcf.acp.worker.title"><![CDATA[Prozess läuft ...]]></item>
+       
+       <category name="wcf.date">
+               <item name="wcf.date.dateFormat"><![CDATA[j. F Y]]></item>
+               <item name="wcf.date.timeFormat"><![CDATA[H:i]]></item>
+               <item name="wcf.date.dateTimeFormat"><![CDATA[%date%, %time%]]></item>
+               
+               <!--  variables for dynamic javascript datetime -->
+               <item name="wcf.date.relative.minutes"><![CDATA['Vor ' + (($minutes > 1) ? $minutes + ' Minuten' : 'einer Minute' )]]></item>
+               <item name="wcf.date.relative.hours"><![CDATA['Vor ' + (($hours > 1) ? $hours + ' Stunden' : 'einer Stunde' )]]></item>
+               <item name="wcf.date.relative.pastDays"><![CDATA[(($days > 1) ? '%day%' : 'Gestern' ) + ', %time%']]></item>
+               
+               <!-- variables for localized date formats; not necessary in english -->
+               <item name="wcf.date.month.january"><![CDATA[Januar]]></item>
+               <item name="wcf.date.month.february"><![CDATA[Februar]]></item>
+               <item name="wcf.date.month.march"><![CDATA[März]]></item>
+               <item name="wcf.date.month.april"><![CDATA[April]]></item>
+               <item name="wcf.date.month.may"><![CDATA[Mai]]></item>
+               <item name="wcf.date.month.june"><![CDATA[Juni]]></item>
+               <item name="wcf.date.month.july"><![CDATA[Juli]]></item>
+               <item name="wcf.date.month.august"><![CDATA[August]]></item>
+               <item name="wcf.date.month.september"><![CDATA[September]]></item>
+               <item name="wcf.date.month.october"><![CDATA[Oktober]]></item>
+               <item name="wcf.date.month.november"><![CDATA[November]]></item>
+               <item name="wcf.date.month.december"><![CDATA[Dezember]]></item>
+               <item name="wcf.date.month.jan"><![CDATA[Jan]]></item>
+               <item name="wcf.date.month.feb"><![CDATA[Feb]]></item>
+               <item name="wcf.date.month.mar"><![CDATA[Mär]]></item>
+               <item name="wcf.date.month.apr"><![CDATA[Apr]]></item>
+               <item name="wcf.date.month.may"><![CDATA[Mai]]></item>
+               <item name="wcf.date.month.jun"><![CDATA[Jun]]></item>
+               <item name="wcf.date.month.jul"><![CDATA[Jul]]></item>
+               <item name="wcf.date.month.aug"><![CDATA[Aug]]></item>
+               <item name="wcf.date.month.sep"><![CDATA[Sep]]></item>
+               <item name="wcf.date.month.oct"><![CDATA[Okt]]></item>
+               <item name="wcf.date.month.nov"><![CDATA[Nov]]></item>
+               <item name="wcf.date.month.dec"><![CDATA[Dez]]></item>
+               <item name="wcf.date.day.sunday"><![CDATA[Sonntag]]></item>
+               <item name="wcf.date.day.monday"><![CDATA[Montag]]></item>
+               <item name="wcf.date.day.tuesday"><![CDATA[Dienstag]]></item>
+               <item name="wcf.date.day.wednesday"><![CDATA[Mittwoch]]></item>
+               <item name="wcf.date.day.thursday"><![CDATA[Donnerstag]]></item>
+               <item name="wcf.date.day.friday"><![CDATA[Freitag]]></item>
+               <item name="wcf.date.day.saturday"><![CDATA[Samstag]]></item>
+               <item name="wcf.date.day.sun"><![CDATA[Son]]></item>
+               <item name="wcf.date.day.mon"><![CDATA[Mon]]></item>
+               <item name="wcf.date.day.tue"><![CDATA[Die]]></item>
+               <item name="wcf.date.day.wed"><![CDATA[Mit]]></item>
+               <item name="wcf.date.day.thu"><![CDATA[Don]]></item>
+               <item name="wcf.date.day.fri"><![CDATA[Fre]]></item>
+               <item name="wcf.date.day.sat"><![CDATA[Sam]]></item>
+
+               <!-- time zones -->
+               <item name="wcf.date.timezone.pacific.kwajalein"><![CDATA[(UTC-12:00) Kwajalein]]></item>
+               <item name="wcf.date.timezone.pacific.midway"><![CDATA[(UTC-11:00) Midway]]></item>
+               <item name="wcf.date.timezone.pacific.samoa"><![CDATA[(UTC-11:00) Samoa]]></item>
+               <item name="wcf.date.timezone.pacific.honolulu"><![CDATA[(UTC-10:00) Hawaii]]></item>
+               <item name="wcf.date.timezone.america.anchorage"><![CDATA[(UTC-09:00) Alaska]]></item>
+               <item name="wcf.date.timezone.america.tijuana"><![CDATA[(UTC-08:00) Tijuana, Niederkalifornien]]></item>
+               <item name="wcf.date.timezone.america.los_angeles"><![CDATA[(UTC-08:00) Pacific Zeit]]></item>
+               <item name="wcf.date.timezone.america.phoenix"><![CDATA[(UTC-07:00) Arizona]]></item>
+               <item name="wcf.date.timezone.america.chihuahua"><![CDATA[(UTC-07:00) Chihuahua, La Paz, Mazatlan]]></item>
+               <item name="wcf.date.timezone.america.denver"><![CDATA[(UTC-07:00) Mountain Zeit]]></item>
+               <item name="wcf.date.timezone.america.chicago"><![CDATA[(UTC-06:00) Central Zeit]]></item>
+               <item name="wcf.date.timezone.america.mexico_city"><![CDATA[(UTC-06:00) Guadalajara, Mexiko-Stadt, Monterrey]]></item>
+               <item name="wcf.date.timezone.america.tegucigalpa"><![CDATA[(UTC-06:00) Mittelamerika]]></item>
+               <item name="wcf.date.timezone.america.regina"><![CDATA[(UTC-06:00) Saskatchewan]]></item>
+               <item name="wcf.date.timezone.america.bogota"><![CDATA[(UTC-05:00) Bogotá, Lima, Quito]]></item>
+               <item name="wcf.date.timezone.america.new_york"><![CDATA[(UTC-05:00) Eastern Zeit]]></item>
+               <item name="wcf.date.timezone.america.indiana.indianapolis"><![CDATA[(UTC-05:00) Indiana (Ost)]]></item>
+               <item name="wcf.date.timezone.america.rio_branco"><![CDATA[(UTC-05:00) Rio Branco]]></item>
+               <item name="wcf.date.timezone.america.caracas"><![CDATA[(UTC-04:30) Caracas]]></item>
+               <item name="wcf.date.timezone.america.asuncion"><![CDATA[(UTC-04:00) Asuncion]]></item>
+               <item name="wcf.date.timezone.america.halifax"><![CDATA[(UTC-04:00) Atlantic (Kanada)]]></item>
+               <item name="wcf.date.timezone.america.cuiaba"><![CDATA[(UTC-04:00) Cuiaba]]></item>
+               <item name="wcf.date.timezone.america.la_paz"><![CDATA[(UTC-04:00) Georgetown, La Paz, Manaus, San Juan]]></item>
+               <item name="wcf.date.timezone.america.santiago"><![CDATA[(UTC-04:00) Santiago]]></item>
+               <item name="wcf.date.timezone.america.st_johns"><![CDATA[(UTC-03:30) Neufundland]]></item>
+               <item name="wcf.date.timezone.america.sao_paulo"><![CDATA[(UTC-03:00) Brasilia]]></item>
+               <item name="wcf.date.timezone.america.argentina.buenos_aires"><![CDATA[(UTC-03:00) Buenos Aires]]></item>
+               <item name="wcf.date.timezone.america.cayenne"><![CDATA[(UTC-03:00) Cayenne, Fortaleza]]></item>
+               <item name="wcf.date.timezone.america.godthab"><![CDATA[(UTC-03:00) Grönland]]></item>
+               <item name="wcf.date.timezone.america.montevideo"><![CDATA[(UTC-03:00) Montevideo]]></item>
+               <item name="wcf.date.timezone.atlantic.south_georgia"><![CDATA[(UTC-02:00) Mittelatlantik]]></item>
+               <item name="wcf.date.timezone.atlantic.azores"><![CDATA[(UTC-01:00) Azoren]]></item>
+               <item name="wcf.date.timezone.atlantic.cape_verde"><![CDATA[(UTC-01:00) Kap Verde]]></item>
+               <item name="wcf.date.timezone.africa.casablanca"><![CDATA[(UTC) Casablanca]]></item>
+               <item name="wcf.date.timezone.europe.london"><![CDATA[(UTC) Dublin, Edinburgh, Lissabon, London]]></item>
+               <item name="wcf.date.timezone.africa.monrovia"><![CDATA[(UTC) Monrovia, Reykjavik]]></item>
+               <item name="wcf.date.timezone.europe.berlin"><![CDATA[(UTC+01:00) Amsterdam, Berlin, Bern, Rom, Stockholm, Wien]]></item>
+               <item name="wcf.date.timezone.europe.belgrade"><![CDATA[(UTC+01:00) Belgrad, Bratislava, Bupdapest, Ljubljana, Prag]]></item>
+               <item name="wcf.date.timezone.europe.paris"><![CDATA[(UTC+01:00) Brüssel, Kopenhagen, Madrid, Paris]]></item>
+               <item name="wcf.date.timezone.europe.sarajevo"><![CDATA[(UTC+01:00) Sarajevo, Skopje, Warschau, Zagreb]]></item>
+               <item name="wcf.date.timezone.africa.algiers"><![CDATA[(UTC+01:00) West-Zentralafrika]]></item>
+               <item name="wcf.date.timezone.africa.windhoek"><![CDATA[(UTC+01:00) Windhuk]]></item>
+               <item name="wcf.date.timezone.asia.amman"><![CDATA[(UTC+02:00) Amman]]></item>
+               <item name="wcf.date.timezone.europe.athens"><![CDATA[(UTC+02:00) Athen, Bukarest, Istanbul]]></item>
+               <item name="wcf.date.timezone.asia.beirut"><![CDATA[(UTC+02:00) Beirut]]></item>
+               <item name="wcf.date.timezone.asia.damascus"><![CDATA[(UTC+02:00) Damaskus]]></item>
+               <item name="wcf.date.timezone.africa.harare"><![CDATA[(UTC+02:00) Harare, Pretoria]]></item>
+               <item name="wcf.date.timezone.europe.helsinki"><![CDATA[(UTC+02:00) Helsinki, Kiew, Riga, Sofia, Tallinn, Wilna]]></item>
+               <item name="wcf.date.timezone.asia.jerusalem"><![CDATA[(UTC+02:00) Jerusalem]]></item>
+               <item name="wcf.date.timezone.africa.cairo"><![CDATA[(UTC+02:00) Kairo]]></item>
+               <item name="wcf.date.timezone.europe.minsk"><![CDATA[(UTC+02:00) Minsk]]></item>
+               <item name="wcf.date.timezone.asia.baghdad"><![CDATA[(UTC+03:00) Bagdad]]></item>
+               <item name="wcf.date.timezone.asia.kuwait"><![CDATA[(UTC+03:00) Kuwait, Riad]]></item>
+               <item name="wcf.date.timezone.europe.moscow"><![CDATA[(UTC+03:00) Moskau, St. Petersburg, Wolgograd]]></item>
+               <item name="wcf.date.timezone.africa.nairobi"><![CDATA[(UTC+03:00) Nairobi]]></item>
+               <item name="wcf.date.timezone.asia.tehran"><![CDATA[(UTC+03:30) Teheran]]></item>
+               <item name="wcf.date.timezone.asia.muscat"><![CDATA[(UTC+04:00) Abu Dhabi, Muskat]]></item>
+               <item name="wcf.date.timezone.asia.baku"><![CDATA[(UTC+04:00) Baku]]></item>
+               <item name="wcf.date.timezone.asia.yerevan"><![CDATA[(UTC+04:00) Eriwan]]></item>
+               <item name="wcf.date.timezone.indian.mauritius"><![CDATA[(UTC+04:00) Port Louis]]></item>
+               <item name="wcf.date.timezone.asia.tbilisi"><![CDATA[(UTC+04:00) Tiflis]]></item>
+               <item name="wcf.date.timezone.asia.kabul"><![CDATA[(UTC+04:30) Kabul]]></item>
+               <item name="wcf.date.timezone.asia.karachi"><![CDATA[(UTC+05:00) Islamabad, Karatschi]]></item>
+               <item name="wcf.date.timezone.asia.yekaterinburg"><![CDATA[(UTC+05:00) Jekaterinburg]]></item>
+               <item name="wcf.date.timezone.asia.tashkent"><![CDATA[(UTC+05:00) Taschkent]]></item>
+               <item name="wcf.date.timezone.asia.kolkata"><![CDATA[(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi]]></item>
+               <item name="wcf.date.timezone.asia.colombo"><![CDATA[(UTC+05:30) Sri Jayawardenepura]]></item>
+               <item name="wcf.date.timezone.asia.katmandu"><![CDATA[(UTC+05:45) Katmandu]]></item>
+               <item name="wcf.date.timezone.asia.almaty"><![CDATA[(UTC+06:00) Astana]]></item>
+               <item name="wcf.date.timezone.asia.dhaka"><![CDATA[(UTC+06:00) Dakka]]></item>
+               <item name="wcf.date.timezone.asia.novosibirsk"><![CDATA[(UTC+06:00) Nowosibirsk]]></item>
+               <item name="wcf.date.timezone.asia.rangoon"><![CDATA[(UTC+06:30) Yangon (Rangun)]]></item>
+               <item name="wcf.date.timezone.asia.bangkok"><![CDATA[(UTC+07:00) Bangkok, Hanoi, Jakarta]]></item>
+               <item name="wcf.date.timezone.asia.krasnoyarsk"><![CDATA[(UTC+07:00) Krasnojarsk]]></item>
+               <item name="wcf.date.timezone.asia.irkutsk"><![CDATA[(UTC+08:00) Irkutsk]]></item>
+               <item name="wcf.date.timezone.asia.kuala_lumpur"><![CDATA[(UTC+08:00) Kuala Lumpur, Singapur]]></item>
+               <item name="wcf.date.timezone.asia.chongqing"><![CDATA[(UTC+08:00) Peking, Chongqing, Hongkong, Urumchi]]></item>
+               <item name="wcf.date.timezone.australia.perth"><![CDATA[(UTC+08:00) Perth]]></item>
+               <item name="wcf.date.timezone.asia.taipei"><![CDATA[(UTC+08:00) Taipeh]]></item>
+               <item name="wcf.date.timezone.asia.ulaanbaatar"><![CDATA[(UTC+08:00) Ulan-Bator]]></item>
+               <item name="wcf.date.timezone.asia.yakutsk"><![CDATA[(UTC+09:00) Jakutsk]]></item>
+               <item name="wcf.date.timezone.asia.tokyo"><![CDATA[(UTC+09:00) Osaka, Sapporo, Tokio]]></item>
+               <item name="wcf.date.timezone.asia.seoul"><![CDATA[(UTC+09:00) Seoul]]></item>
+               <item name="wcf.date.timezone.australia.adelaide"><![CDATA[(UTC+09:30) Adelaide]]></item>
+               <item name="wcf.date.timezone.australia.darwin"><![CDATA[(UTC+09:30) Darwin]]></item>
+               <item name="wcf.date.timezone.australia.brisbane"><![CDATA[(UTC+10:00) Brisbane]]></item>
+               <item name="wcf.date.timezone.australia.sydney"><![CDATA[(UTC+10:00) Canberra, Melbourne, Sydney]]></item>
+               <item name="wcf.date.timezone.pacific.guam"><![CDATA[(UTC+10:00) Guam, Port Moresby]]></item>
+               <item name="wcf.date.timezone.australia.hobart"><![CDATA[(UTC+10:00) Hobart]]></item>
+               <item name="wcf.date.timezone.asia.vladivostok"><![CDATA[(UTC+10:00) Wladiwostok]]></item>
+               <item name="wcf.date.timezone.asia.magadan"><![CDATA[(UTC+11:00) Magadan]]></item>
+               <item name="wcf.date.timezone.pacific.noumea"><![CDATA[(UTC+11:00) Salomonen, Neu-Kaledonien]]></item>
+               <item name="wcf.date.timezone.pacific.auckland"><![CDATA[(UTC+12:00) Auckland, Wellington]]></item>
+               <item name="wcf.date.timezone.pacific.fiji"><![CDATA[(UTC+12:00) Fidschi]]></item>
+               <item name="wcf.date.timezone.asia.kamchatka"><![CDATA[(UTC+12:00) Kamtschatka]]></item>
+               <item name="wcf.date.timezone.pacific.tongatapu"><![CDATA[(UTC+13:00) Nuku'alofa]]></item>
         </category>
+       
         <category name="wcf.global">
-               <item name="wcf.global.button.back"><![CDATA[&laquo; Zurück]]></item>
-               <item name="wcf.global.button.close"><![CDATA[Schließen]]></item>
-               <item name="wcf.global.button.collapse"><![CDATA[Zuklappen]]></item>
-               <item name="wcf.global.button.collapsible"><![CDATA[Auf- und Zuklappen]]></item>
-               <item name="wcf.global.button.delete"><![CDATA[Löschen]]></item>
-               <item name="wcf.global.button.delete.confirm"><![CDATA[Möchten Sie das Element wirklich löschen?]]></item>
-               <item name="wcf.global.button.deleteCompletely"><![CDATA[Endgültig löschen]]></item>
-               <item name="wcf.global.button.edit"><![CDATA[Bearbeiten]]></item>
-               <item name="wcf.global.button.editor.jump"><![CDATA[Zum Editor wechseln]]></item>
-               <item name="wcf.global.button.expand"><![CDATA[Aufklappen]]></item>
-               <item name="wcf.global.button.mark"><![CDATA[Markieren]]></item>
-               <item name="wcf.global.button.next"><![CDATA[Weiter &raquo;]]></item>
-               <item name="wcf.global.button.preview"><![CDATA[Vorschau]]></item>
                 <item name="wcf.global.button.reset"><![CDATA[Zurücksetzen]]></item>
                 <item name="wcf.global.button.submit"><![CDATA[Absenden]]></item>
-               <item name="wcf.global.button.unmark"><![CDATA[Demarkieren]]></item>
-               <item name="wcf.global.date.day"><![CDATA[Tag]]></item>
-               <item name="wcf.global.date.days"><![CDATA[Tage]]></item>
-               <item name="wcf.global.date.hour"><![CDATA[Stunde]]></item>
-               <item name="wcf.global.date.hours"><![CDATA[Stunden]]></item>
-               <item name="wcf.global.date.minute"><![CDATA[Minute]]></item>
-               <item name="wcf.global.date.minutes"><![CDATA[Minuten]]></item>
-               <item name="wcf.global.date.month"><![CDATA[Monat]]></item>
-               <item name="wcf.global.date.months"><![CDATA[Monate]]></item>
-               <item name="wcf.global.date.second"><![CDATA[Sekunde]]></item>
-               <item name="wcf.global.date.seconds"><![CDATA[Sekunden]]></item>
-               <item name="wcf.global.date.week"><![CDATA[Woche]]></item>
-               <item name="wcf.global.date.weeks"><![CDATA[Wochen]]></item>
-               <item name="wcf.global.date.year"><![CDATA[Jahr]]></item>
-               <item name="wcf.global.date.year.notRequired"><![CDATA[Die Angabe des Jahres ist optional.]]></item>
-               <item name="wcf.global.date.years"><![CDATA[Jahre]]></item>
-               <item name="wcf.global.dateInputOrder"><![CDATA[day-month-year]]></item>
+               <item name="wcf.global.button.delete"><![CDATA[Löschen]]></item>
+               <item name="wcf.global.button.edit"><![CDATA[Bearbeiten]]></item>
+               <item name="wcf.global.button.enable"><![CDATA[Aktivieren]]></item>
+               <item name="wcf.global.button.disable"><![CDATA[Deaktivieren]]></item>
+               <item name="wcf.global.scrollDown"><![CDATA[Zum Seitenende]]></item>
+               <item name="wcf.global.scrollUp"><![CDATA[Zum Seitenanfang]]></item>
+               <item name="wcf.global.objectID"><![CDATA[ID]]></item>
                 <item name="wcf.global.decimalPoint"><![CDATA[,]]></item>
-               <item name="wcf.global.defaultValue"><![CDATA[Standard]]></item>
-               <item name="wcf.global.error.backward"><![CDATA[Zurück zur vorherigen Seite]]></item>
-               <item name="wcf.global.error.empty"><![CDATA[Bitte füllen Sie dieses Eingabefeld aus.]]></item>
-               <item name="wcf.global.error.file.notFound"><![CDATA[Die Datei konnte nicht gefunden werden.]]></item>
-               <item name="wcf.global.error.illegalLink"><![CDATA[Sie haben einen ungültigen oder nicht mehr gültigen Link aufgerufen.]]></item>
-               <item name="wcf.global.error.permissionDenied"><![CDATA[Der Zutritt zu dieser Seite ist Ihnen leider verwehrt. Sie besitzen nicht die notwendigen Zugriffsrechte, um diese Seite aufrufen zu können.]]></item>
-               <item name="wcf.global.error.permissionDenied.title"><![CDATA[Zutritt verwehrt]]></item>
-               <item name="wcf.global.error.title"><![CDATA[Fehlermeldung]]></item>
+               <item name="wcf.global.thousandsSeparator"><![CDATA[.]]></item>
+               <item name="wcf.global.pageDirection"><![CDATA[ltr]]></item>
+               <item name="wcf.global.form.error.empty"><![CDATA[Bitte füllen Sie dieses Eingabefeld aus.]]></item>
                 <item name="wcf.global.form.error"><![CDATA[Ihre Angaben sind ungültig. Bitte überprüfen Sie die markierten Eingabefelder.]]></item>
-               <item name="wcf.global.language.ar"><![CDATA[Arabisch]]></item>
-               <item name="wcf.global.language.bs"><![CDATA[Bosnisch]]></item>
-               <item name="wcf.global.language.cs"><![CDATA[Tschechisch]]></item>
-               <item name="wcf.global.language.da"><![CDATA[Dänisch]]></item>
-               <item name="wcf.global.language.de"><![CDATA[Deutsch]]></item>
-               <item name="wcf.global.language.de-informal"><![CDATA[Deutsch (Anrede &raquo;Du&laquo;)]]></item>
-               <item name="wcf.global.language.el"><![CDATA[Griechisch]]></item>
-               <item name="wcf.global.language.en"><![CDATA[Englisch]]></item>
-               <item name="wcf.global.language.es"><![CDATA[Spanisch]]></item>
-               <item name="wcf.global.language.fa"><![CDATA[Persisch]]></item>
-               <item name="wcf.global.language.fi"><![CDATA[Finnisch]]></item>
-               <item name="wcf.global.language.fr"><![CDATA[Französisch]]></item>
-               <item name="wcf.global.language.he"><![CDATA[Hebräisch]]></item>
-               <item name="wcf.global.language.hr"><![CDATA[Kroatisch]]></item>
-               <item name="wcf.global.language.hu"><![CDATA[Ungarisch]]></item>
-               <item name="wcf.global.language.it"><![CDATA[Italienisch]]></item>
-               <item name="wcf.global.language.ja"><![CDATA[Japanisch]]></item>
-               <item name="wcf.global.language.ko"><![CDATA[Koreanisch]]></item>
-               <item name="wcf.global.language.nl"><![CDATA[Niederländisch]]></item>
-               <item name="wcf.global.language.no"><![CDATA[Norwegisch]]></item>
-               <item name="wcf.global.language.pl"><![CDATA[Polnisch]]></item>
-               <item name="wcf.global.language.pt"><![CDATA[Portugiesisch]]></item>
-               <item name="wcf.global.language.pt-BR"><![CDATA[Portugiesisch (Brasilien)]]></item>
-               <item name="wcf.global.language.ro"><![CDATA[Rumänisch]]></item>
-               <item name="wcf.global.language.ru"><![CDATA[Russisch]]></item>
-               <item name="wcf.global.language.sk"><![CDATA[Slowakisch]]></item>
-               <item name="wcf.global.language.sr"><![CDATA[Serbisch]]></item>
-               <item name="wcf.global.language.sv"><![CDATA[Schwedisch]]></item>
-               <item name="wcf.global.language.th"><![CDATA[Thailändisch]]></item>
-               <item name="wcf.global.language.tr"><![CDATA[Türkisch]]></item>
-               <item name="wcf.global.language.zh-CN"><![CDATA[Chinesisch (vereinfacht)]]></item>
-               <item name="wcf.global.language.zh-TW"><![CDATA[Chinesisch (traditionell)]]></item>
+               <item name="wcf.global.form.edit.success"><![CDATA[Ihre Änderungen wurden erfolgreich gespeichert.]]></item>
+               <item name="wcf.global.form.add.success"><![CDATA[Der Eintrag wurde erfolgreich gespeichert.]]></item>
                 <item name="wcf.global.loading"><![CDATA[Lädt …]]></item>
-               <item name="wcf.global.locale.unix"><![CDATA[de_DE]]></item>
-               <item name="wcf.global.locale.win"><![CDATA[deu_deu]]></item>
-               <item name="wcf.global.multiSelect"><![CDATA[Mehrfache Markierungen sind durch zusätzliches Drücken der Taste &raquo;Strg/Ctrl&laquo; (Windows) oder &raquo;Befehl/Command&laquo; (Mac OS) möglich.]]></item>
-               <item name="wcf.global.page.input"><![CDATA[Zu folgender Seite springen]]></item>
-               <item name="wcf.global.page.next"><![CDATA[nächste Seite]]></item>
-               <item name="wcf.global.page.previous"><![CDATA[vorherige Seite]]></item>
-               <item name="wcf.global.pageDirection"><![CDATA[ltr]]></item>
-               <item name="wcf.global.pageTitle"><![CDATA[WoltLab&reg; Community Framework&trade;]]></item>
-               <item name="wcf.global.redirect.title"><![CDATA[Weiterleitung]]></item>
-               <item name="wcf.global.redirect.url"><![CDATA[Falls die automatische Weiterleitung nicht funktioniert, klicken Sie bitte hier!]]></item>
-               <item name="wcf.global.scrollDown"><![CDATA[Zum Seitenende]]></item>
-               <item name="wcf.global.scrollUp"><![CDATA[Zum Seitenanfang]]></item>
-               <item name="wcf.global.search.matchesExactly"><![CDATA[Exakter Treffer]]></item>
-               <item name="wcf.global.skipToContent"><![CDATA[Zum Seiteninhalt springen]]></item>
-               <item name="wcf.global.sortOrder.ascending"><![CDATA[in aufsteigender Reihenfolge]]></item>
-               <item name="wcf.global.sortOrder.descending"><![CDATA[in absteigender Reihenfolge]]></item>
-               <item name="wcf.global.thousandsSeparator"><![CDATA[&nbsp;]]></item>
-               <item name="wcf.global.date.dateFormat"><![CDATA[j. F Y]]></item>
-               <item name="wcf.global.date.timeFormat"><![CDATA[H:i]]></item>
-               <item name="wcf.global.date.dateTimeFormat"><![CDATA[%date%, %time%]]></item>
-               
-               <!--  variables for dynamic javascript datetime -->
-               <item name="wcf.global.date.relative.minutes"><![CDATA['Vor ' + (($minutes > 1) ? $minutes + ' Minuten' : 'einer Minute' )]]></item>
-               <item name="wcf.global.date.relative.hours"><![CDATA['Vor ' + (($hours > 1) ? $hours + ' Stunden' : 'einer Stunde' )]]></item>
-               <item name="wcf.global.date.relative.pastDays"><![CDATA[(($days > 1) ? '%day%' : 'Gestern' ) + ', %time%']]></item>
-               
-               <!-- variables for localized date formats; not necessary in english -->
-               <item name="wcf.global.date.month.january"><![CDATA[Januar]]></item>
-               <item name="wcf.global.date.month.february"><![CDATA[Februar]]></item>
-               <item name="wcf.global.date.month.march"><![CDATA[März]]></item>
-               <item name="wcf.global.date.month.april"><![CDATA[April]]></item>
-               <item name="wcf.global.date.month.may"><![CDATA[Mai]]></item>
-               <item name="wcf.global.date.month.june"><![CDATA[Juni]]></item>
-               <item name="wcf.global.date.month.july"><![CDATA[Juli]]></item>
-               <item name="wcf.global.date.month.august"><![CDATA[August]]></item>
-               <item name="wcf.global.date.month.september"><![CDATA[September]]></item>
-               <item name="wcf.global.date.month.october"><![CDATA[Oktober]]></item>
-               <item name="wcf.global.date.month.november"><![CDATA[November]]></item>
-               <item name="wcf.global.date.month.december"><![CDATA[Dezember]]></item>
-               <item name="wcf.global.date.month.jan"><![CDATA[Jan]]></item>
-               <item name="wcf.global.date.month.feb"><![CDATA[Feb]]></item>
-               <item name="wcf.global.date.month.mar"><![CDATA[Mär]]></item>
-               <item name="wcf.global.date.month.apr"><![CDATA[Apr]]></item>
-               <item name="wcf.global.date.month.may"><![CDATA[Mai]]></item>
-               <item name="wcf.global.date.month.jun"><![CDATA[Jun]]></item>
-               <item name="wcf.global.date.month.jul"><![CDATA[Jul]]></item>
-               <item name="wcf.global.date.month.aug"><![CDATA[Aug]]></item>
-               <item name="wcf.global.date.month.sep"><![CDATA[Sep]]></item>
-               <item name="wcf.global.date.month.oct"><![CDATA[Okt]]></item>
-               <item name="wcf.global.date.month.nov"><![CDATA[Nov]]></item>
-               <item name="wcf.global.date.month.dec"><![CDATA[Dez]]></item>
-               <item name="wcf.global.date.day.sunday"><![CDATA[Sonntag]]></item>
-               <item name="wcf.global.date.day.monday"><![CDATA[Montag]]></item>
-               <item name="wcf.global.date.day.tuesday"><![CDATA[Dienstag]]></item>
-               <item name="wcf.global.date.day.wednesday"><![CDATA[Mittwoch]]></item>
-               <item name="wcf.global.date.day.thursday"><![CDATA[Donnerstag]]></item>
-               <item name="wcf.global.date.day.friday"><![CDATA[Freitag]]></item>
-               <item name="wcf.global.date.day.saturday"><![CDATA[Samstag]]></item>
-               <item name="wcf.global.date.day.sun"><![CDATA[Son]]></item>
-               <item name="wcf.global.date.day.mon"><![CDATA[Mon]]></item>
-               <item name="wcf.global.date.day.tue"><![CDATA[Die]]></item>
-               <item name="wcf.global.date.day.wed"><![CDATA[Mit]]></item>
-               <item name="wcf.global.date.day.thu"><![CDATA[Don]]></item>
-               <item name="wcf.global.date.day.fri"><![CDATA[Fre]]></item>
-               <item name="wcf.global.date.day.sat"><![CDATA[Sam]]></item>
-               <item name="wcf.global.date.timezone.pacific.kwajalein"><![CDATA[(UTC-12:00) Kwajalein]]></item>
-               <item name="wcf.global.date.timezone.pacific.midway"><![CDATA[(UTC-11:00) Midway]]></item>
-               <item name="wcf.global.date.timezone.pacific.samoa"><![CDATA[(UTC-11:00) Samoa]]></item>
-               <item name="wcf.global.date.timezone.pacific.honolulu"><![CDATA[(UTC-10:00) Hawaii]]></item>
-               <item name="wcf.global.date.timezone.america.anchorage"><![CDATA[(UTC-09:00) Alaska]]></item>
-               <item name="wcf.global.date.timezone.america.tijuana"><![CDATA[(UTC-08:00) Tijuana, Niederkalifornien]]></item>
-               <item name="wcf.global.date.timezone.america.los_angeles"><![CDATA[(UTC-08:00) Pacific Zeit]]></item>
-               <item name="wcf.global.date.timezone.america.phoenix"><![CDATA[(UTC-07:00) Arizona]]></item>
-               <item name="wcf.global.date.timezone.america.chihuahua"><![CDATA[(UTC-07:00) Chihuahua, La Paz, Mazatlan]]></item>
-               <item name="wcf.global.date.timezone.america.denver"><![CDATA[(UTC-07:00) Mountain Zeit]]></item>
-               <item name="wcf.global.date.timezone.america.chicago"><![CDATA[(UTC-06:00) Central Zeit]]></item>
-               <item name="wcf.global.date.timezone.america.mexico_city"><![CDATA[(UTC-06:00) Guadalajara, Mexiko-Stadt, Monterrey]]></item>
-               <item name="wcf.global.date.timezone.america.tegucigalpa"><![CDATA[(UTC-06:00) Mittelamerika]]></item>
-               <item name="wcf.global.date.timezone.america.regina"><![CDATA[(UTC-06:00) Saskatchewan]]></item>
-               <item name="wcf.global.date.timezone.america.bogota"><![CDATA[(UTC-05:00) Bogotá, Lima, Quito]]></item>
-               <item name="wcf.global.date.timezone.america.new_york"><![CDATA[(UTC-05:00) Eastern Zeit]]></item>
-               <item name="wcf.global.date.timezone.america.indiana.indianapolis"><![CDATA[(UTC-05:00) Indiana (Ost)]]></item>
-               <item name="wcf.global.date.timezone.america.rio_branco"><![CDATA[(UTC-05:00) Rio Branco]]></item>
-               <item name="wcf.global.date.timezone.america.caracas"><![CDATA[(UTC-04:30) Caracas]]></item>
-               <item name="wcf.global.date.timezone.america.asuncion"><![CDATA[(UTC-04:00) Asuncion]]></item>
-               <item name="wcf.global.date.timezone.america.halifax"><![CDATA[(UTC-04:00) Atlantic (Kanada)]]></item>
-               <item name="wcf.global.date.timezone.america.cuiaba"><![CDATA[(UTC-04:00) Cuiaba]]></item>
-               <item name="wcf.global.date.timezone.america.la_paz"><![CDATA[(UTC-04:00) Georgetown, La Paz, Manaus, San Juan]]></item>
-               <item name="wcf.global.date.timezone.america.santiago"><![CDATA[(UTC-04:00) Santiago]]></item>
-               <item name="wcf.global.date.timezone.america.st_johns"><![CDATA[(UTC-03:30) Neufundland]]></item>
-               <item name="wcf.global.date.timezone.america.sao_paulo"><![CDATA[(UTC-03:00) Brasilia]]></item>
-               <item name="wcf.global.date.timezone.america.argentina.buenos_aires"><![CDATA[(UTC-03:00) Buenos Aires]]></item>
-               <item name="wcf.global.date.timezone.america.cayenne"><![CDATA[(UTC-03:00) Cayenne, Fortaleza]]></item>
-               <item name="wcf.global.date.timezone.america.godthab"><![CDATA[(UTC-03:00) Grönland]]></item>
-               <item name="wcf.global.date.timezone.america.montevideo"><![CDATA[(UTC-03:00) Montevideo]]></item>
-               <item name="wcf.global.date.timezone.atlantic.south_georgia"><![CDATA[(UTC-02:00) Mittelatlantik]]></item>
-               <item name="wcf.global.date.timezone.atlantic.azores"><![CDATA[(UTC-01:00) Azoren]]></item>
-               <item name="wcf.global.date.timezone.atlantic.cape_verde"><![CDATA[(UTC-01:00) Kap Verde]]></item>
-               <item name="wcf.global.date.timezone.africa.casablanca"><![CDATA[(UTC) Casablanca]]></item>
-               <item name="wcf.global.date.timezone.europe.london"><![CDATA[(UTC) Dublin, Edinburgh, Lissabon, London]]></item>
-               <item name="wcf.global.date.timezone.africa.monrovia"><![CDATA[(UTC) Monrovia, Reykjavik]]></item>
-               <item name="wcf.global.date.timezone.europe.berlin"><![CDATA[(UTC+01:00) Amsterdam, Berlin, Bern, Rom, Stockholm, Wien]]></item>
-               <item name="wcf.global.date.timezone.europe.belgrade"><![CDATA[(UTC+01:00) Belgrad, Bratislava, Bupdapest, Ljubljana, Prag]]></item>
-               <item name="wcf.global.date.timezone.europe.paris"><![CDATA[(UTC+01:00) Brüssel, Kopenhagen, Madrid, Paris]]></item>
-               <item name="wcf.global.date.timezone.europe.sarajevo"><![CDATA[(UTC+01:00) Sarajevo, Skopje, Warschau, Zagreb]]></item>
-               <item name="wcf.global.date.timezone.africa.algiers"><![CDATA[(UTC+01:00) West-Zentralafrika]]></item>
-               <item name="wcf.global.date.timezone.africa.windhoek"><![CDATA[(UTC+01:00) Windhuk]]></item>
-               <item name="wcf.global.date.timezone.asia.amman"><![CDATA[(UTC+02:00) Amman]]></item>
-               <item name="wcf.global.date.timezone.europe.athens"><![CDATA[(UTC+02:00) Athen, Bukarest, Istanbul]]></item>
-               <item name="wcf.global.date.timezone.asia.beirut"><![CDATA[(UTC+02:00) Beirut]]></item>
-               <item name="wcf.global.date.timezone.asia.damascus"><![CDATA[(UTC+02:00) Damaskus]]></item>
-               <item name="wcf.global.date.timezone.africa.harare"><![CDATA[(UTC+02:00) Harare, Pretoria]]></item>
-               <item name="wcf.global.date.timezone.europe.helsinki"><![CDATA[(UTC+02:00) Helsinki, Kiew, Riga, Sofia, Tallinn, Wilna]]></item>
-               <item name="wcf.global.date.timezone.asia.jerusalem"><![CDATA[(UTC+02:00) Jerusalem]]></item>
-               <item name="wcf.global.date.timezone.africa.cairo"><![CDATA[(UTC+02:00) Kairo]]></item>
-               <item name="wcf.global.date.timezone.europe.minsk"><![CDATA[(UTC+02:00) Minsk]]></item>
-               <item name="wcf.global.date.timezone.asia.baghdad"><![CDATA[(UTC+03:00) Bagdad]]></item>
-               <item name="wcf.global.date.timezone.asia.kuwait"><![CDATA[(UTC+03:00) Kuwait, Riad]]></item>
-               <item name="wcf.global.date.timezone.europe.moscow"><![CDATA[(UTC+03:00) Moskau, St. Petersburg, Wolgograd]]></item>
-               <item name="wcf.global.date.timezone.africa.nairobi"><![CDATA[(UTC+03:00) Nairobi]]></item>
-               <item name="wcf.global.date.timezone.asia.tehran"><![CDATA[(UTC+03:30) Teheran]]></item>
-               <item name="wcf.global.date.timezone.asia.muscat"><![CDATA[(UTC+04:00) Abu Dhabi, Muskat]]></item>
-               <item name="wcf.global.date.timezone.asia.baku"><![CDATA[(UTC+04:00) Baku]]></item>
-               <item name="wcf.global.date.timezone.asia.yerevan"><![CDATA[(UTC+04:00) Eriwan]]></item>
-               <item name="wcf.global.date.timezone.indian.mauritius"><![CDATA[(UTC+04:00) Port Louis]]></item>
-               <item name="wcf.global.date.timezone.asia.tbilisi"><![CDATA[(UTC+04:00) Tiflis]]></item>
-               <item name="wcf.global.date.timezone.asia.kabul"><![CDATA[(UTC+04:30) Kabul]]></item>
-               <item name="wcf.global.date.timezone.asia.karachi"><![CDATA[(UTC+05:00) Islamabad, Karatschi]]></item>
-               <item name="wcf.global.date.timezone.asia.yekaterinburg"><![CDATA[(UTC+05:00) Jekaterinburg]]></item>
-               <item name="wcf.global.date.timezone.asia.tashkent"><![CDATA[(UTC+05:00) Taschkent]]></item>
-               <item name="wcf.global.date.timezone.asia.kolkata"><![CDATA[(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi]]></item>
-               <item name="wcf.global.date.timezone.asia.colombo"><![CDATA[(UTC+05:30) Sri Jayawardenepura]]></item>
-               <item name="wcf.global.date.timezone.asia.katmandu"><![CDATA[(UTC+05:45) Katmandu]]></item>
-               <item name="wcf.global.date.timezone.asia.almaty"><![CDATA[(UTC+06:00) Astana]]></item>
-               <item name="wcf.global.date.timezone.asia.dhaka"><![CDATA[(UTC+06:00) Dakka]]></item>
-               <item name="wcf.global.date.timezone.asia.novosibirsk"><![CDATA[(UTC+06:00) Nowosibirsk]]></item>
-               <item name="wcf.global.date.timezone.asia.rangoon"><![CDATA[(UTC+06:30) Yangon (Rangun)]]></item>
-               <item name="wcf.global.date.timezone.asia.bangkok"><![CDATA[(UTC+07:00) Bangkok, Hanoi, Jakarta]]></item>
-               <item name="wcf.global.date.timezone.asia.krasnoyarsk"><![CDATA[(UTC+07:00) Krasnojarsk]]></item>
-               <item name="wcf.global.date.timezone.asia.irkutsk"><![CDATA[(UTC+08:00) Irkutsk]]></item>
-               <item name="wcf.global.date.timezone.asia.kuala_lumpur"><![CDATA[(UTC+08:00) Kuala Lumpur, Singapur]]></item>
-               <item name="wcf.global.date.timezone.asia.chongqing"><![CDATA[(UTC+08:00) Peking, Chongqing, Hongkong, Urumchi]]></item>
-               <item name="wcf.global.date.timezone.australia.perth"><![CDATA[(UTC+08:00) Perth]]></item>
-               <item name="wcf.global.date.timezone.asia.taipei"><![CDATA[(UTC+08:00) Taipeh]]></item>
-               <item name="wcf.global.date.timezone.asia.ulaanbaatar"><![CDATA[(UTC+08:00) Ulan-Bator]]></item>
-               <item name="wcf.global.date.timezone.asia.yakutsk"><![CDATA[(UTC+09:00) Jakutsk]]></item>
-               <item name="wcf.global.date.timezone.asia.tokyo"><![CDATA[(UTC+09:00) Osaka, Sapporo, Tokio]]></item>
-               <item name="wcf.global.date.timezone.asia.seoul"><![CDATA[(UTC+09:00) Seoul]]></item>
-               <item name="wcf.global.date.timezone.australia.adelaide"><![CDATA[(UTC+09:30) Adelaide]]></item>
-               <item name="wcf.global.date.timezone.australia.darwin"><![CDATA[(UTC+09:30) Darwin]]></item>
-               <item name="wcf.global.date.timezone.australia.brisbane"><![CDATA[(UTC+10:00) Brisbane]]></item>
-               <item name="wcf.global.date.timezone.australia.sydney"><![CDATA[(UTC+10:00) Canberra, Melbourne, Sydney]]></item>
-               <item name="wcf.global.date.timezone.pacific.guam"><![CDATA[(UTC+10:00) Guam, Port Moresby]]></item>
-               <item name="wcf.global.date.timezone.australia.hobart"><![CDATA[(UTC+10:00) Hobart]]></item>
-               <item name="wcf.global.date.timezone.asia.vladivostok"><![CDATA[(UTC+10:00) Wladiwostok]]></item>
-               <item name="wcf.global.date.timezone.asia.magadan"><![CDATA[(UTC+11:00) Magadan]]></item>
-               <item name="wcf.global.date.timezone.pacific.noumea"><![CDATA[(UTC+11:00) Salomonen, Neu-Kaledonien]]></item>
-               <item name="wcf.global.date.timezone.pacific.auckland"><![CDATA[(UTC+12:00) Auckland, Wellington]]></item>
-               <item name="wcf.global.date.timezone.pacific.fiji"><![CDATA[(UTC+12:00) Fidschi]]></item>
-               <item name="wcf.global.date.timezone.asia.kamchatka"><![CDATA[(UTC+12:00) Kamtschatka]]></item>
-               <item name="wcf.global.date.timezone.pacific.tongatapu"><![CDATA[(UTC+13:00) Nuku'alofa]]></item>
-       </category>
-       <category name="wcf.imageViewer">
-               <item name="wcf.imageViewer.caption"><![CDATA[this.links.length > 1 ? "Bild " + (this.currentIndex + 1) + " von " + this.links.length + (this.currentLink.title ? (" - " + this.currentLink.title) : "") : (this.currentLink.title ? this.currentLink.title : "")]]></item>
-               <item name="wcf.imageViewer.close"><![CDATA[Schließen]]></item>
-               <item name="wcf.imageViewer.enlarge"><![CDATA[Nur dieses Bild anzeigen (beendet die Bildbetrachtung)]]></item>
-               <item name="wcf.imageViewer.next"><![CDATA[Nächstes Bild]]></item>
-               <item name="wcf.imageViewer.pause"><![CDATA[Diashow stoppen]]></item>
-               <item name="wcf.imageViewer.play"><![CDATA[Diashow starten (Bildwechsel alle 5 Sekunden)]]></item>
-               <item name="wcf.imageViewer.previous"><![CDATA[Vorheriges Bild]]></item>
-       </category>
-       <category name="wcf.option">
-               <item name="wcf.option.timezone.utc"><![CDATA[(UTC) Belfast, Casablanca, Dublin, Edinburgh, Kanarische Inseln, Lissabon, London, Monrovia, Ouagadougou, Reykjav&iacute;k]]></item>
-               <item name="wcf.option.timezone.utc+01:00"><![CDATA[(UTC+01:00) Amsterdam, Berlin, Bern, Brüssel, Kopenhagen, Madrid, Paris, Prag, Rom, Sarajevo, Stockholm, Tunis, Warschau, Wien]]></item>
-               <item name="wcf.option.timezone.utc+02:00"><![CDATA[(UTC+02:00) Athen, Beirut, Bukarest, Helsinki, Istanbul, Jerusalem, Kairo, Kapstadt, Khartum, Kiew, Minsk, Sofia]]></item>
-               <item name="wcf.option.timezone.utc+03:00"><![CDATA[(UTC+03:00) Addis Abeba, Antananarivo, Bagdad, Daressalam, Kampala, Kuwait, Mogadischu, Moskau, Nairobi, Riad]]></item>
-               <item name="wcf.option.timezone.utc+03:30"><![CDATA[(UTC+03:30) Teheran]]></item>
-               <item name="wcf.option.timezone.utc+04:00"><![CDATA[(UTC+04:00) Abu Dhabi, Baku, Dubai, Eriwan, Maskat, R&eacute;union, Tiflis]]></item>
-               <item name="wcf.option.timezone.utc+04:30"><![CDATA[(UTC+04:30) Kabul]]></item>
-               <item name="wcf.option.timezone.utc+05:00"><![CDATA[(UTC+05:00) Asgabat, Bischkek, Duschanbe, Islamabad, Jekaterinburg, Karatschi, Malediven, Taschkent]]></item>
-               <item name="wcf.option.timezone.utc+05:30"><![CDATA[(UTC+05:30) Chennai, Colombo, Kolkata, Mumbai, Neu-Delhi]]></item>
-               <item name="wcf.option.timezone.utc+05:45"><![CDATA[(UTC+05:45) Kathmandu]]></item>
-               <item name="wcf.option.timezone.utc+06:00"><![CDATA[(UTC+06:00) Almaty, Astana, Dhaka, Nowosibirsk]]></item>
-               <item name="wcf.option.timezone.utc+06:30"><![CDATA[(UTC+06:30) Kokosinseln, Rangun]]></item>
-               <item name="wcf.option.timezone.utc+07:00"><![CDATA[(UTC+07:00) Bangkok, Hanoi, Jakarta, Phnom Penh, Krasnojarsk, Vientiane]]></item>
-               <item name="wcf.option.timezone.utc+08:00"><![CDATA[(UTC+08:00) Hongkong, Irkutsk, Kuala Lumpur, Manila, Peking, Perth, Singapur, Taipeh, Ulan Bator]]></item>
-               <item name="wcf.option.timezone.utc+08:45"><![CDATA[(UTC+08:45) Eucla (Australien)]]></item>
-               <item name="wcf.option.timezone.utc+09:00"><![CDATA[(UTC+09:00) Dili, Jakutsk, Osaka, Pjöngjang, Sapporo, Seoul, Tokyo]]></item>
-               <item name="wcf.option.timezone.utc+09:30"><![CDATA[(UTC+09:30) Adelaide, Darwin]]></item>
-               <item name="wcf.option.timezone.utc+10:00"><![CDATA[(UTC+10:00) Brisbane, Canberra, Guam, Hobart, Melbourne, Port Moresby, Sydney, Wladiwostok]]></item>
-               <item name="wcf.option.timezone.utc+10:30"><![CDATA[(UTC+10:30) Lord-Howe-Insel (Australien)]]></item>
-               <item name="wcf.option.timezone.utc+11:00"><![CDATA[(UTC+11:00) Magadan, Neukaledonien, Salomonen]]></item>
-               <item name="wcf.option.timezone.utc+11:30"><![CDATA[(UTC+11:30) Norfolkinsel]]></item>
-               <item name="wcf.option.timezone.utc+12:00"><![CDATA[(UTC+12:00) Auckland, Bairiki, Fidschi, Kamtschatka, Marshall-Inseln, Wellington]]></item>
-               <item name="wcf.option.timezone.utc+12:45"><![CDATA[(UTC+12:45) Chatham-Inseln (Neuseeland)]]></item>
-               <item name="wcf.option.timezone.utc+13:00"><![CDATA[(UTC+13:00) Nuku'alofa, Phoenixinseln]]></item>
-               <item name="wcf.option.timezone.utc+14:00"><![CDATA[(UTC+14:00) Linieninseln, Weihnachtsinsel]]></item>
-               <item name="wcf.option.timezone.utc-01:00"><![CDATA[(UTC-01:00) Azoren, Kapverdische Inseln]]></item>
-               <item name="wcf.option.timezone.utc-02:00"><![CDATA[(UTC-02:00) Mittelatlantik]]></item>
-               <item name="wcf.option.timezone.utc-03:00"><![CDATA[(UTC-03:00) Bras&iacute;lia, Buenos Aires, Cayenne, Georgetown, Grönland, Montevideo]]></item>
-               <item name="wcf.option.timezone.utc-03:30"><![CDATA[(UTC-03:30) Neufundland]]></item>
-               <item name="wcf.option.timezone.utc-04:00"><![CDATA[(UTC-04:00) Asunci&oacute;n, Atlantik (Kanada), La Paz, Port-of-Spain, Santiago]]></item>
-               <item name="wcf.option.timezone.utc-04:30"><![CDATA[(UTC-04:30) Caracas]]></item>
-               <item name="wcf.option.timezone.utc-05:00"><![CDATA[(UTC-05:00) Atlanta, Bogot&aacute;, Detroit, Lima, Miami, New York, San Francisco de Quito, Toronto]]></item>
-               <item name="wcf.option.timezone.utc-06:00"><![CDATA[(UTC-06:00) Chicago, Dallas, Kansas City, Mexiko-Stadt, Winnipeg, Zentralamerika]]></item>
-               <item name="wcf.option.timezone.utc-07:00"><![CDATA[(UTC-07:00) Arizona, Calgary, Chihuahua, Denver, Mazatlan, Salt Lake City]]></item>
-               <item name="wcf.option.timezone.utc-08:00"><![CDATA[(UTC-08:00) Los Angeles, Seattle, Tijuana, Vancouver]]></item>
-               <item name="wcf.option.timezone.utc-09:00"><![CDATA[(UTC-09:00) Anchorage (Alaska)]]></item>
-               <item name="wcf.option.timezone.utc-09:30"><![CDATA[(UTC-09:30) Französisch-Polynesien]]></item>
-               <item name="wcf.option.timezone.utc-10:00"><![CDATA[(UTC-10:00) Cookinseln, Hawaii]]></item>
-               <item name="wcf.option.timezone.utc-11:00"><![CDATA[(UTC-11:00) Midwayinseln, Samoa]]></item>
-               <item name="wcf.option.timezone.utc-12:00"><![CDATA[(UTC-12:00) Eniwetok, Kwajalein]]></item>
-       </category>
-       <category name="wcf.page">
-               <item name="wcf.page.pageNo"><![CDATA[Seite {#$pageNo}]]></item>
         </category>
+       
         <category name="wcf.user">
+               <item name="wcf.user.username"><![CDATA[Benutzername]]></item>
+               <item name="wcf.user.password"><![CDATA[Kennwort]]></item>
+               <item name="wcf.user.ipAddress"><![CDATA[IP-Adresse]]></item>
+               <item name="wcf.user.userAgent"><![CDATA[Browser-Kennung]]></item>
+               <item name="wcf.user.login"><![CDATA[Anmeldung]]></item>
+               <item name="wcf.user.login.data"><![CDATA[Zugangsdaten]]></item>
                 <item name="wcf.user.confirmEmail"><![CDATA[E-Mail-Adresse wiederholen]]></item>
                 <item name="wcf.user.confirmPassword"><![CDATA[Kennwort wiederholen]]></item>
                 <item name="wcf.user.email"><![CDATA[E-Mail-Adresse]]></item>
@@ -1025,14 +609,9 @@
                 <item name="wcf.user.language"><![CDATA[Sprache]]></item>
                 <item name="wcf.user.language.description"><![CDATA[Bitte wählen Sie aus, in welcher Sprache die Benutzeroberfläche erscheinen soll!]]></item>
                 <item name="wcf.user.logout"><![CDATA[Abmelden]]></item>
-               <item name="wcf.user.password"><![CDATA[Kennwort]]></item>
+               <item name="wcf.user.logout.sure"><![CDATA[Wollen Sie sich wirklich abmelden?]]></item>
                 <item name="wcf.user.registrationDate"><![CDATA[Registrierungsdatum]]></item>
-               <item name="wcf.user.userID"><![CDATA[Benutzer-ID]]></item>
-               <item name="wcf.user.username"><![CDATA[Benutzername]]></item>
                 <item name="wcf.user.visibleLanguages"><![CDATA[Zeige Inhalte in folgenden Sprachen an]]></item>
                 <item name="wcf.user.visibleLanguages.description"><![CDATA[Geben Sie an, in welchen Sprachen erstellte Inhalte angezeigt werden sollen.]]></item>
         </category>
-       <category name="wcf.user.option">
-               <item name="wcf.user.option.error.validationFailed"><![CDATA[Sie haben einen ungültigen Inhalt eingegeben.]]></item>
-       </category>
  </language>
 \ No newline at end of file
author	Marcel Werk <burntime@woltlab.com>
	Tue, 20 Sep 2011 12:39:20 +0000 (14:39 +0200)
committer	Marcel Werk <burntime@woltlab.com>
	Tue, 20 Sep 2011 12:39:20 +0000 (14:39 +0200)
com.woltlab.wcf/acpmenu.xml		patch \| blob \| blame \| history
com.woltlab.wcf/option.xml		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/acpSessionLog.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/acpSessionLogList.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/cronjobAdd.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/cronjobList.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/cronjobLogList.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/header.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/login.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/masterPassword.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/masterPasswordInit.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/option.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/optionFieldList.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/optionImport.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/packageStartInstall.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/updateServerAdd.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/updateServerList.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/userAdd.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/userAssignToGroup.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/userGroupAdd.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/userGroupList.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/userList.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/userMail.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/acp/templates/usersMassProcessing.tpl		patch \| blob \| blame \| history
wcfsetup/install/files/js/WCF.js		patch \| blob \| blame \| history
wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php		patch \| blob \| blame \| history
wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php		patch \| blob \| blame \| history
wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php		patch \| blob \| blame \| history
wcfsetup/install/files/lib/system/session/SessionHandler.class.php		patch \| blob \| blame \| history
wcfsetup/install/files/lib/system/template/plugin/PlainTimeModifierTemplatePlugin.class.php		patch \| blob \| blame \| history
wcfsetup/install/files/lib/system/template/plugin/TimeModifierTemplatePlugin.class.php		patch \| blob \| blame \| history
wcfsetup/install/files/lib/util/DateUtil.class.php		patch \| blob \| blame \| history
wcfsetup/install/lang/de.xml		patch \| blob \| blame \| history