From a987a4ac8f800cbbf8389a154d59ad2c413a5318 Mon Sep 17 00:00:00 2001
From: Luzifr <szekely@woltlab.com>
Date: Fri, 9 Sep 2011 15:05:19 +0200
Subject: [PATCH] "cronjobs" -> "cronjob" !!!

Please check this commit carefully!!! Check back if i have renamed too
many items. Maybe some function names where intentionally named
"cronjobs" and should remain that way! And maybe i've not found all
places where the wrong name was used! Also added 2 language variables.
Renamed and reformatted "cronjob.xsd" with tab-stops.
---
 XSD/cronjob.xsd                               | 48 +++++++++++++++++++
 XSD/cronjobs.xsd                              | 48 -------------------
 com.woltlab.wcf/acpmenu.xml                   | 20 ++++----
 com.woltlab.wcf/cronjob.xml                   |  2 +-
 com.woltlab.wcf/usergroupoption.xml           | 22 ++++-----
 .../files/acp/templates/cronjobAdd.tpl        |  2 +-
 .../files/acp/templates/cronjobList.tpl       | 18 +++----
 .../files/acp/templates/cronjobLogList.tpl    |  2 +-
 .../lib/acp/form/CronjobAddForm.class.php     |  6 +--
 .../lib/acp/form/CronjobEditForm.class.php    |  6 +--
 .../lib/acp/page/CronjobListPage.class.php    |  6 +--
 .../lib/acp/page/CronjobLogListPage.class.php |  6 +--
 .../files/lib/data/cronjob/Cronjob.class.php  |  6 +--
 .../lib/data/cronjob/CronjobAction.class.php  |  8 ++--
 .../lib/data/cronjob/CronjobEditor.class.php  |  2 +-
 .../cronjob/log/CronjobLogEditor.class.php    |  6 +--
 .../system/cronjob/CronjobScheduler.class.php |  4 +-
 .../lib/system/cronjob/ICronjob.class.php     |  2 +-
 wcfsetup/install/lang/de-informal.xml         | 32 +++++++------
 wcfsetup/install/lang/de.xml                  |  2 +
 wcfsetup/install/lang/en.xml                  | 32 +++++++------
 21 files changed, 143 insertions(+), 137 deletions(-)
 create mode 100644 XSD/cronjob.xsd
 delete mode 100644 XSD/cronjobs.xsd

diff --git a/XSD/cronjob.xsd b/XSD/cronjob.xsd
new file mode 100644
index 0000000000..5927e7539b
--- /dev/null
+++ b/XSD/cronjob.xsd
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!-- The file "cronjobs.xsd" is used for xml-files which installs, updates or deletes searchable cronjobs.  -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
+	
+	<!-- include types -->
+	<xs:include schemaLocation="types.xsd" />
+	
+	<!-- Represents the data-node. -->
+	<xs:element name="data">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="import" type="import" minOccurs="0" />
+					<xs:element name="delete" type="delete" minOccurs="0" />
+				</xs:all>
+		</xs:complexType>
+	</xs:element>
+	
+	<!-- Represents the import-node. -->
+	<xs:complexType name="import">
+		<xs:sequence>
+				<xs:element name="cronjob" type="cronjob" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- Represents the delete-node. -->
+	<xs:complexType name="delete">
+		<xs:sequence>
+			<xs:element name="cronjob" type="cronjob" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- Represents a cronjob which will be installed,updated or deleted. Extends the type "cronjob_delete". -->
+	<xs:complexType name="cronjob">
+		<xs:all>                                        
+			<xs:element name="classname" type="woltlab_varchar_nullable" minOccurs="0" />
+			<xs:element name="description" type="woltlab_varchar_nullable" minOccurs="0" />
+			<xs:element name="startminute" type="woltlab_varchar" minOccurs="1" />
+			<xs:element name="starthour" type="woltlab_varchar" minOccurs="1" />
+			<xs:element name="startdom" type="woltlab_varchar" minOccurs="1" />
+			<xs:element name="startmonth" type="woltlab_varchar" minOccurs="1" />
+			<xs:element name="startdow" type="woltlab_varchar" minOccurs="1" />
+			<xs:element name="execmultiple" type="woltlab_boolean" minOccurs="0" default="0" />
+			<xs:element name="canbeedited" type="woltlab_boolean" minOccurs="0" default="1" />
+			<xs:element name="canbedisabled" type="woltlab_boolean" minOccurs="0" default="1" />
+			<xs:element name="active" type="woltlab_boolean" minOccurs="0" default="1" />
+		</xs:all>
+	</xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/XSD/cronjobs.xsd b/XSD/cronjobs.xsd
deleted file mode 100644
index da1c83945a..0000000000
--- a/XSD/cronjobs.xsd
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!-- The file "cronjobs.xsd" is used for xml-files which installs, updates or deletes searchable cronjobs.  -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-        
-        <!-- include types -->
-        <xs:include schemaLocation="types.xsd" />
-        
-        <!-- Represents the data-node. -->
-        <xs:element name="data">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="import" type="import" minOccurs="0" />
-                                <xs:element name="delete" type="delete" minOccurs="0" />
-                        </xs:all>
-                </xs:complexType>
-        </xs:element>
-        
-         <!-- Represents the import-node. -->
-        <xs:complexType name="import">
-                <xs:sequence>
-                        <xs:element name="cronjob" type="cronjob" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-         <!-- Represents the delete-node. -->
-        <xs:complexType name="delete">
-                <xs:sequence>
-                        <xs:element name="cronjob" type="cronjob" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-                
-         <!-- Represents a cronjob which will be installed,updated or deleted. Extends the type "cronjob_delete". -->
-	<xs:complexType name="cronjob">
-                                <xs:all>                                        
-                                        <xs:element name="classname" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="description" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="startminute" type="woltlab_varchar" minOccurs="1" />
-                                        <xs:element name="starthour" type="woltlab_varchar" minOccurs="1" />
-                                        <xs:element name="startdom" type="woltlab_varchar" minOccurs="1" />
-                                        <xs:element name="startmonth" type="woltlab_varchar" minOccurs="1" />
-                                        <xs:element name="startdow" type="woltlab_varchar" minOccurs="1" />
-                                        <xs:element name="execmultiple" type="woltlab_boolean" minOccurs="0" default="0" />
-                                        <xs:element name="canbeedited" type="woltlab_boolean" minOccurs="0" default="1" />
-                                        <xs:element name="canbedisabled" type="woltlab_boolean" minOccurs="0" default="1" />
-                                        <xs:element name="active" type="woltlab_boolean" minOccurs="0" default="1" />
-                                </xs:all>
-	</xs:complexType>
-</xs:schema>
\ No newline at end of file
diff --git a/com.woltlab.wcf/acpmenu.xml b/com.woltlab.wcf/acpmenu.xml
index 4c875fa897..2d50de860a 100644
--- a/com.woltlab.wcf/acpmenu.xml
+++ b/com.woltlab.wcf/acpmenu.xml
@@ -134,29 +134,29 @@
 		<!-- /log -->
 		
 		<!-- cronjobs -->
-		<acpmenuitem name="wcf.acp.menu.link.cronjobs">
+		<acpmenuitem name="wcf.acp.menu.link.cronjob">
 			<parent>wcf.acp.menu.link.maintenance</parent>
 		</acpmenuitem>
 		
-		<acpmenuitem name="wcf.acp.menu.link.cronjobs.list">
-			<icon>icon/cronjobsM.png</icon>
+		<acpmenuitem name="wcf.acp.menu.link.cronjob.list">
+			<icon>icon/cronjobM.png</icon>
 			<link>index.php?page=CronjobList</link>
-			<parent>wcf.acp.menu.link.cronjobs</parent>
-			<permissions>admin.system.cronjobs.canEditCronjob,admin.system.cronjobs.canDeleteCronjob,admin.system.cronjobs.canEnableDisableCronjob</permissions>
+			<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.cronjobs.add">
+		<acpmenuitem name="wcf.acp.menu.link.cronjob.add">
 			<link>index.php?form=CronjobAdd</link>
-			<parent>wcf.acp.menu.link.cronjobs</parent>
-			<permissions>admin.system.cronjobs.canAddCronjob</permissions>
+			<parent>wcf.acp.menu.link.cronjob</parent>
+			<permissions>admin.system.cronjob.canAddCronjob</permissions>
 			<showorder>2</showorder>
 		</acpmenuitem>
 		
-		<acpmenuitem name="wcf.acp.menu.link.cronjobs.showLog">
+		<acpmenuitem name="wcf.acp.menu.link.cronjob.showLog">
 			<link>index.php?page=CronjobLogList</link>
 			<parent>wcf.acp.menu.link.log.system</parent>
-			<permissions>admin.system.cronjobs.canEditCronjob,admin.system.cronjobs.canDeleteCronjob</permissions>
+			<permissions>admin.system.cronjob.canEditCronjob,admin.system.cronjob.canDeleteCronjob</permissions>
 		</acpmenuitem>
 		<!-- /cronjobs -->
 		
diff --git a/com.woltlab.wcf/cronjob.xml b/com.woltlab.wcf/cronjob.xml
index 5aa1896402..456414aea7 100644
--- a/com.woltlab.wcf/cronjob.xml
+++ b/com.woltlab.wcf/cronjob.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data 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/cronjobs.xsd">
+<data 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/cronjob.xsd">
 	<import>
 		<cronjob>
 			<classname>wcf\system\cronjob\GetUpdateInfoCronjob</classname>
diff --git a/com.woltlab.wcf/usergroupoption.xml b/com.woltlab.wcf/usergroupoption.xml
index 5315c3d1ed..a3385b99dc 100644
--- a/com.woltlab.wcf/usergroupoption.xml
+++ b/com.woltlab.wcf/usergroupoption.xml
@@ -11,7 +11,7 @@
 			<category name="admin.system">
 				<parent>admin</parent>
 			</category>
-			<category name="admin.system.cronjobs">
+			<category name="admin.system.cronjob">
 				<parent>admin.system</parent>
 			</category>
 			<category name="admin.system.package">
@@ -63,32 +63,32 @@
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.system.cronjobs.canAddCronjob">
-				<categoryname>admin.system.cronjobs</categoryname>
+			<option name="admin.system.cronjob.canAddCronjob">
+				<categoryname>admin.system.cronjob</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.system.cronjobs.canEditCronjob">
-				<categoryname>admin.system.cronjobs</categoryname>
+			<option name="admin.system.cronjob.canEditCronjob">
+				<categoryname>admin.system.cronjob</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.system.cronjobs.canDeleteCronjob">
-				<categoryname>admin.system.cronjobs</categoryname>
+			<option name="admin.system.cronjob.canDeleteCronjob">
+				<categoryname>admin.system.cronjob</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.system.cronjobs.canEnableDisableCronjob">
-				<categoryname>admin.system.cronjobs</categoryname>
+			<option name="admin.system.cronjob.canEnableDisableCronjob">
+				<categoryname>admin.system.cronjob</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.system.cronjobs.canDeleteCronjobsLog">
-				<categoryname>admin.system.cronjobs</categoryname>
+			<option name="admin.system.cronjob.canDeleteCronjobLog">
+				<categoryname>admin.system.cronjob</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index d3bafaa8fe..9287c9b922 100644
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -21,7 +21,7 @@
 <div class="contentHeader">
 	<nav class="largeButtons">
 		<ul>
-			<li><a href="index.php?page=CronjobList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.cronjobs.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobsM.png" alt="" /> <span>{lang}wcf.acp.menu.link.cronjobs.list{/lang}</span></a></li>
+			<li><a href="index.php?page=CronjobList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.cronjob.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobM.png" alt="" /> <span>{lang}wcf.acp.menu.link.cronjob.list{/lang}</span></a></li>
 			{if $action == 'edit'}<li><a href="index.php?action=CronjobExecute&amp;cronjobID={@$cronjobID}{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.execute{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobExecuteM.png" alt="" /> <span>{lang}wcf.acp.cronjob.execute{/lang}</span></a></li>{/if}
 		</ul>
 	</nav>
diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index 003d33dea1..c54df8fd54 100644
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -39,9 +39,9 @@
 <div class="contentHeader">
 	{pages print=true assign=pagesLinks link="index.php?page=CronjobList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"|concat:SID_ARG_2ND_NOT_ENCODED}
 	
-	{if $__wcf->session->getPermission('admin.system.cronjobs.canAddCronjob')}
+	{if $__wcf->session->getPermission('admin.system.cronjob.canAddCronjob')}
 		<nav class="largeButtons">
-			<ul><li><a href="index.php?form=CronjobAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobsAddM.png" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
+			<ul><li><a href="index.php?form=CronjobAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobAddM.png" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
 		</nav>
 	{/if}
 </div>
@@ -75,22 +75,22 @@
 			</thead>
 			
 			<tbody>
-			{foreach from=$cronjobs item=cronjob}
+			{foreach from=$cronjob item=cronjob}
 				<tr class="cronjobRow">
 					<td class="columnIcon">
-						{if $__wcf->session->getPermission('admin.system.cronjobs.canEditCronjob')}
+						{if $__wcf->session->getPermission('admin.system.cronjob.canEditCronjob')}
 							<img src="{@RELATIVE_WCF_DIR}icon/play1.svg" alt="" title="{lang}wcf.acp.cronjob.execute{/lang}" data-objectID="{@$cronjob->cronjobID}" class="executeButton balloonTooltip" />
 						{else}
 							<img src="{@RELATIVE_WCF_DIR}icon/play1D.svg" alt="" title="{lang}wcf.acp.cronjob.execute{/lang}" />
 						{/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.cronjobs.{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.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" />
 						{else}
 							{if $cronjob->active}
-								<img src="{@RELATIVE_WCF_DIR}icon/enabled1D.svg" alt="" title="{lang}wcf.acp.cronjob.disable{/lang}" />
+								<img src="{@RELATIVE_WCF_DIR}icon/enabled1D.svg" alt="" title="{lang}wcf.acp.cronjob.disabled{/lang}" />
 							{else}
-								<img src="{@RELATIVE_WCF_DIR}icon/disabled1D.svg" alt="" title="{lang}wcf.acp.cronjob.enable{/lang}" />
+								<img src="{@RELATIVE_WCF_DIR}icon/disabled1D.svg" alt="" title="{lang}wcf.acp.cronjob.enabled{/lang}" />
 							{/if}
 						{/if}
 						
@@ -136,9 +136,9 @@
 	<div class="contentFooter">
 		{@$pagesLinks}
 		
-		{if $__wcf->session->getPermission('admin.system.cronjobs.canAddCronjob')}
+		{if $__wcf->session->getPermission('admin.system.cronjob.canAddCronjob')}
 			<nav class="largeButtons">
-				<ul><li><a href="index.php?form=CronjobAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobsAddM.png" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
+				<ul><li><a href="index.php?form=CronjobAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobAddM.png" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
 			</nav>
 		{/if}
 	</div>
diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
index 45b234d5fe..5e1887df4c 100644
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -15,7 +15,7 @@
 </div>
 
 {hascontent}
-	<form method="post" action="index.php?action=CronjobsLogDelete">
+	<form method="post" action="index.php?action=CronjobLogDelete">
 		<div class="border boxTitle">
 			<hgroup>
 				<h1>{lang}wcf.acp.cronjob.log{/lang} <span class="badge" title="{lang}wcf.acp.cronjob.log.count{/lang}">{#$items}</span></h1>
diff --git a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php
index 7dc5ac838f..4365a21493 100755
--- a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php
@@ -9,7 +9,7 @@ use wcf\util\CronjobUtil;
 use wcf\util\StringUtil;
 
 /**
- * Shows the cronjobs add form.
+ * Shows the cronjob add form.
  *
  * @author	Alexander Ebert
  * @copyright	2001-2011 WoltLab GmbH
@@ -27,12 +27,12 @@ class CronjobAddForm extends ACPForm {
 	/**
 	 * @see wcf\acp\form\ACPForm::$activeMenuItem
 	 */
-	public $activeMenuItem = 'wcf.acp.menu.link.cronjobs.add';
+	public $activeMenuItem = 'wcf.acp.menu.link.cronjob.add';
 	
 	/**
 	 * @see wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.cronjobs.canAddCronjob');
+	public $neededPermissions = array('admin.system.cronjob.canAddCronjob');
 	
 	/**
 	 * cronjob class name
diff --git a/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php b/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php
index ade15c28b1..989d61f12a 100755
--- a/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php
@@ -6,7 +6,7 @@ use wcf\system\exception\IllegalLinkException;
 use wcf\system\WCF;
 
 /**
- * Shows the cronjobs edit form.
+ * Shows the cronjob edit form.
  * 
  * @author	Alexander Ebert
  * @copyright	2001-2011 WoltLab GmbH
@@ -19,12 +19,12 @@ class CronjobEditForm extends CronjobAddForm {
 	/**
 	 * @see wcf\acp\form\ACPForm::$activeMenuItem
 	 */
-	public $activeMenuItem = 'wcf.acp.menu.link.cronjobs';
+	public $activeMenuItem = 'wcf.acp.menu.link.cronjob';
 	
 	/**
 	 * @see wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.cronjobs.canEditCronjob');
+	public $neededPermissions = array('admin.system.cronjob.canEditCronjob');
 	
 	/**
 	 * cronjob id
diff --git a/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php
index 307129ffc0..69fe0ac187 100755
--- a/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php
@@ -24,7 +24,7 @@ class CronjobListPage extends SortablePage {
 	/**
 	 * @see wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.cronjobs.canEditCronjob', 'admin.system.cronjobs.canDeleteCronjob', 'admin.system.cronjobs.canEnableDisableCronjob');
+	public $neededPermissions = array('admin.system.cronjob.canEditCronjob', 'admin.system.cronjob.canDeleteCronjob', 'admin.system.cronjob.canEnableDisableCronjob');
 	
 	/**
 	 * @see wcf\page\SortablePage::$defaultSortField
@@ -58,7 +58,7 @@ class CronjobListPage extends SortablePage {
 		parent::assignVariables();
 		
 		WCF::getTPL()->assign(array(
-			'cronjobs' => $this->objectList->getObjects()
+			'cronjob' => $this->objectList->getObjects()
 		));
 	}
 	
@@ -67,7 +67,7 @@ class CronjobListPage extends SortablePage {
 	 */
 	public function show() {
 		// set active menu item.
-		ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.cronjobs.list');
+		ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.cronjob.list');
 		
 		parent::show();
 	}
diff --git a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
index b42aa0d95b..52d4bffd7c 100755
--- a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
@@ -6,7 +6,7 @@ use wcf\system\package\PackageDependencyHandler;
 use wcf\system\WCF;
 
 /**
- * Shows cron jobs log information.
+ * Shows cronjob log information.
  * 
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -24,7 +24,7 @@ class CronjobLogListPage extends SortablePage {
 	/**
 	 * @see wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.cronjobs.canEditCronjob');
+	public $neededPermissions = array('admin.system.cronjob.canEditCronjob');
 	
 	/**
 	 * @see wcf\page\MultipleLinkPage::$itemsPerPage
@@ -87,7 +87,7 @@ class CronjobLogListPage extends SortablePage {
 	 */
 	public function show() {
 		// set active menu item.
-		ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.cronjobs.showLog');
+		ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.cronjob.showLog');
 		
 		parent::show();
 	}
diff --git a/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php b/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php
index 2f8d5a66f6..0ac33e1e1e 100644
--- a/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php
+++ b/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php
@@ -75,7 +75,7 @@ class Cronjob extends DatabaseObject {
 	 * @return	boolean
 	 */
 	public function isEditable() {
-		return (WCF::getSession()->getPermission('admin.system.cronjobs.canEditCronjob') && $this->canBeEdited);
+		return (WCF::getSession()->getPermission('admin.system.cronjob.canEditCronjob') && $this->canBeEdited);
 	}
 	
 	/**
@@ -84,7 +84,7 @@ class Cronjob extends DatabaseObject {
 	 * @return	boolean
 	 */
 	public function isDeletable() {
-		return (WCF::getSession()->getPermission('admin.system.cronjobs.canDeleteCronjob') && $this->canBeEdited);
+		return (WCF::getSession()->getPermission('admin.system.cronjob.canDeleteCronjob') && $this->canBeEdited);
 	}
 	
 	/**
@@ -93,6 +93,6 @@ class Cronjob extends DatabaseObject {
 	 * @return	true
 	 */
 	public function canBeDisabled() {
-		return (WCF::getSession()->getPermission('admin.system.cronjobs.canEnableDisableCronjob') && $this->canBeDisabled);
+		return (WCF::getSession()->getPermission('admin.system.cronjob.canEnableDisableCronjob') && $this->canBeDisabled);
 	}
 }
diff --git a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
index f3656d7dce..2b1d8ccfd8 100644
--- a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
+++ b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
@@ -24,17 +24,17 @@ class CronjobAction extends AbstractDatabaseObjectAction {
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
 	 */
-	protected $permissionsCreate = array('admin.system.cronjobs.canAddCronjob');
+	protected $permissionsCreate = array('admin.system.cronjob.canAddCronjob');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.system.cronjobs.canDeleteCronjob');
+	protected $permissionsDelete = array('admin.system.cronjob.canDeleteCronjob');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.system.cronjobs.canEditCronjob');
+	protected $permissionsUpdate = array('admin.system.cronjob.canEditCronjob');
 	
 	/**
 	 * Validates permissions and parameters
@@ -96,7 +96,7 @@ class CronjobAction extends AbstractDatabaseObjectAction {
 	 * Executes cronjobs.
 	 */
 	public function execute() {
-		$cronjobs = $return = array();
+		$cronjob = $return = array();
 		
 		foreach ($this->objects as $key => $cronjob) {
 			// skip jobs that are already being processed
diff --git a/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php b/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php
index b976c213c4..75ed3e25da 100644
--- a/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php
+++ b/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php
@@ -25,6 +25,6 @@ class CronjobEditor extends DatabaseObjectEditor implements IEditableCachedObjec
 	 * @see wcf\data\IEditableCachedObject::resetCache()
 	 */
 	public static function resetCache() {
-		CacheHandler::getInstance()->clear(WCF_DIR.'cache', 'cache.cronjobs-*');
+		CacheHandler::getInstance()->clear(WCF_DIR.'cache', 'cache.cronjob-*');
 	}
 }
diff --git a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogEditor.class.php b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogEditor.class.php
index 1d7a6f7cfb..b3388e98a7 100644
--- a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogEditor.class.php
+++ b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogEditor.class.php
@@ -23,12 +23,12 @@ class CronjobLogEditor extends DatabaseObjectEditor {
 	 */
 	public static function clearLogs($packageID = PACKAGE_ID) {
 		// delete logs
-		$sql = "DELETE FROM	wcf".WCF_N."_cronjobs_log
+		$sql = "DELETE FROM	wcf".WCF_N."_cronjob_log
 			WHERE		cronjobID IN (
 						SELECT	cronjobID
-						FROM	wcf".WCF_N."_cronjobs cronjobs,
+						FROM	wcf".WCF_N."_cronjob cronjob,
 							wcf".WCF_N."_package_dependency package_dependency
-						WHERE 	cronjobs.packageID = package_dependency.dependency
+						WHERE 	cronjob.packageID = package_dependency.dependency
 							AND package_dependency.packageID = ?
 					)";
 		$statement = WCF::getDB()->prepareStatement($sql);
diff --git a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
index 02bd6ebd98..de622330cc 100644
--- a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
@@ -197,7 +197,7 @@ class CronjobScheduler extends SingletonFactory {
 	 * Loads the cached data for cronjob execution.
 	 */
 	protected function loadCache() {
-		$cacheName = 'cronjobs-'.PACKAGE_ID;
+		$cacheName = 'cronjob-'.PACKAGE_ID;
 		CacheHandler::getInstance()->addResource(
 			$cacheName,
 			WCF_DIR.'cache/cache.'.$cacheName.'.php',
@@ -210,6 +210,6 @@ class CronjobScheduler extends SingletonFactory {
 	 * Clears the cronjob data cache.
 	 */
 	public static function clearCache() {
-		CacheHandler::getInstance()->clear(WCF_DIR.'cache/', 'cache.cronjobs-'.PACKAGE_ID.'.php');
+		CacheHandler::getInstance()->clear(WCF_DIR.'cache/', 'cache.cronjob-'.PACKAGE_ID.'.php');
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php
index 9a8f7227be..d664a3dcd4 100644
--- a/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php
@@ -8,7 +8,7 @@ use wcf\data\cronjob\Cronjob;
  * @author	Siegfried Schweizer
  * @copyright	2001-2011 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf.data.cronjobs
+ * @package	com.woltlab.wcf.data.cronjob
  * @subpackage	system.cronjob
  * @category 	Community Framework
  */
diff --git a/wcfsetup/install/lang/de-informal.xml b/wcfsetup/install/lang/de-informal.xml
index 86c288acfd..aee29e80c9 100644
--- a/wcfsetup/install/lang/de-informal.xml
+++ b/wcfsetup/install/lang/de-informal.xml
@@ -39,12 +39,14 @@
 		<item name="wcf.acp.cronjob.description"><![CDATA[Beschreibung]]></item>
 		<item name="wcf.acp.cronjob.description.description"><![CDATA[Hier kannst du 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üll dieses Eingabefeld aus.]]></item>
 		<item name="wcf.acp.cronjob.error.notValid"><![CDATA[Das Zeitformat ist ungültig.]]></item>
@@ -123,16 +125,16 @@
 		<item name="wcf.acp.group.option.admin.system.canEditOption.description"><![CDATA[Mitglieder dieser Benutzergruppe können die allgemeinen System-Einstellungen sehen und bearbeiten. Z.B. Forum ein-/ausschalten.]]></item>
 		<item name="wcf.acp.group.option.admin.system.canViewLog"><![CDATA[Kann Protokolle abrufen]]></item>
 		<item name="wcf.acp.group.option.admin.system.canViewLog.description"><![CDATA[Mitglieder dieser Benutzergruppe können die System-Protokolle abrufen.]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canAddCronjob"><![CDATA[Kann neue zeitgesteuerte Aufgaben anlegen]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canAddCronjob.description"><![CDATA[Mitglieder dieser Benutzergruppe können neue zeitgesteuerte Aufgaben anlegen.]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canDeleteCronjob"><![CDATA[Kann zeitgesteuerte Aufgaben löschen]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canDeleteCronjob.description"><![CDATA[Mitglieder dieser Benutzergruppe können vorhandene zeitgesteuerte Aufgaben löschen.]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canDeleteCronjobsLog"><![CDATA[Kann Protokoll der zeitgesteuerten Aufgaben löschen]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.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.cronjobs.canEditCronjob"><![CDATA[Kann zeitgesteuerte Aufgaben ändern]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canEditCronjob.description"><![CDATA[Mitglieder dieser Benutzergruppe können vorhandene zeitgesteuerte Aufgaben bearbeiten.]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canEnableDisableCronjob"><![CDATA[Kann zeitgesteuerte Aufgaben deaktivieren]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canEnableDisableCronjob.description"><![CDATA[Mitglieder dieser Benutzergruppe können vorhandene zeitgesteuerte Aufgaben deaktivieren. Diese werden dann nicht mehr ausgeführt, können später jedoch auch wieder aktiviert werden.]]></item>
+		<item name="wcf.acp.group.option.admin.system.cronjob.canAddCronjob"><![CDATA[Kann neue zeitgesteuerte Aufgaben anlegen]]></item>
+		<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.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>
+		<item name="wcf.acp.group.option.admin.system.cronjob.canEnableDisableCronjob.description"><![CDATA[Mitglieder dieser Benutzergruppe können vorhandene zeitgesteuerte Aufgaben deaktivieren. Diese werden dann nicht mehr ausgeführt, können später jedoch auch wieder aktiviert werden.]]></item>
 		<item name="wcf.acp.group.option.admin.system.package.canEditServer"><![CDATA[Kann Update-Server bearbeiten]]></item>
 		<item name="wcf.acp.group.option.admin.system.package.canEditServer.description"><![CDATA[Mitglieder dieser Benutzergruppe können vorhandene Update-Server bearbeiten und neue hinzufügen.]]></item>
 		<item name="wcf.acp.group.option.admin.system.package.canInstallPackage"><![CDATA[Kann Pakete installieren]]></item>
@@ -174,8 +176,8 @@
 		<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.cronjobs"><![CDATA[Zeitgesteuerte Aufgaben]]></item>
-		<item name="wcf.acp.group.option.category.admin.system.cronjobs.description"><![CDATA[]]></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>
 		<item name="wcf.acp.group.option.category.admin.system.description"><![CDATA[]]></item>
 		<item name="wcf.acp.group.option.category.admin.system.package"><![CDATA[Paketverwaltung]]></item>
 		<item name="wcf.acp.group.option.category.admin.system.package.description"><![CDATA[]]></item>
@@ -218,9 +220,9 @@
 	<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.cronjobs.add"><![CDATA[Zeitgesteuerte Aufgabe hinzufügen]]></item>
-		<item name="wcf.acp.menu.link.cronjobs.showLog"><![CDATA[Protokoll anzeigen]]></item>
-		<item name="wcf.acp.menu.link.cronjobs.list"><![CDATA[Zeitgesteuerte Aufgaben auflisten]]></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>
 		<item name="wcf.acp.menu.link.display"><![CDATA[Darstellung]]></item>
 		<item name="wcf.acp.menu.link.group"><![CDATA[Benutzergruppen]]></item>
 		<item name="wcf.acp.menu.link.group.add"><![CDATA[Benutzergruppe hinzufügen]]></item>
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 7dcf021f2c..d3bf6c4327 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -39,12 +39,14 @@
 		<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>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 013cd73aa6..74c7627a7c 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -39,12 +39,14 @@
 		<item name="wcf.acp.cronjob.description"><![CDATA[Description]]></item>
 		<item name="wcf.acp.cronjob.description.description"><![CDATA[Here you may enter a short description for the cron job (preferably in English).]]></item>
 		<item name="wcf.acp.cronjob.disable"><![CDATA[Disable]]></item>
+		<item name="wcf.acp.cronjob.disabled"><![CDATA[Disabled]]></item>
 		<item name="wcf.acp.cronjob.edit"><![CDATA[Edit]]></item>
 		<item name="wcf.acp.cronjob.edit.data"><![CDATA[General Information]]></item>
 		<item name="wcf.acp.cronjob.edit.disabled"><![CDATA[This cron job cannot be edited.]]></item>
 		<item name="wcf.acp.cronjob.edit.success"><![CDATA[The cron job has been modified successfully.]]></item>
 		<item name="wcf.acp.cronjob.edit.timing"><![CDATA[Schedule]]></item>
 		<item name="wcf.acp.cronjob.enable"><![CDATA[Enable]]></item>
+		<item name="wcf.acp.cronjob.enabled"><![CDATA[Enabled]]></item>
 		<item name="wcf.acp.cronjob.error.doesNotExist"><![CDATA[There is no class with the given name.]]></item>
 		<item name="wcf.acp.cronjob.error.empty"><![CDATA[Please enter a valid entry here.]]></item>
 		<item name="wcf.acp.cronjob.error.notValid"><![CDATA[The timings you have set are invalid.]]></item>
@@ -123,16 +125,16 @@
 		<item name="wcf.acp.group.option.admin.system.canEditOption.description"><![CDATA[Activating this option will allow members of this user group to view and change the system options - e.g. Forum on/offline.]]></item>
 		<item name="wcf.acp.group.option.admin.system.canViewLog"><![CDATA[Can view logs]]></item>
 		<item name="wcf.acp.group.option.admin.system.canViewLog.description"><![CDATA[Members of this user group can view the system logs.]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canAddCronjob"><![CDATA[Can add new cronjobs]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canAddCronjob.description"><![CDATA[Members of this user group can add new cronjobs.]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canDeleteCronjob"><![CDATA[Can delete existing cronjobs]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canDeleteCronjob.description"><![CDATA[Members of this user group can delete existing cronjobs.]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canDeleteCronjobsLog"><![CDATA[Can delete log files of running cronjobs]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canDeleteCronjobsLog.description"><![CDATA[Members of this user group can delete log files of running cronjobs. The log files are also checked by the associated cronjob if the log file was successfully written.]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canEditCronjob"><![CDATA[Can edit existing cronjobs]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canEditCronjob.description"><![CDATA[Members of this user group can edit existing cronjobs.]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canEnableDisableCronjob"><![CDATA[Can disable existing cronjobs]]></item>
-		<item name="wcf.acp.group.option.admin.system.cronjobs.canEnableDisableCronjob.description"><![CDATA[Members of this user group can disable existing cronjobs. Disabling a cronjob only stops the actual cronjob from running, but does not remove it.]]></item>
+		<item name="wcf.acp.group.option.admin.system.cronjob.canAddCronjob"><![CDATA[Can add new cronjobs]]></item>
+		<item name="wcf.acp.group.option.admin.system.cronjob.canAddCronjob.description"><![CDATA[Members of this user group can add new cronjobs.]]></item>
+		<item name="wcf.acp.group.option.admin.system.cronjob.canDeleteCronjob"><![CDATA[Can delete existing cronjobs]]></item>
+		<item name="wcf.acp.group.option.admin.system.cronjob.canDeleteCronjob.description"><![CDATA[Members of this user group can delete existing cronjobs.]]></item>
+		<item name="wcf.acp.group.option.admin.system.cronjob.canDeleteCronjobsLog"><![CDATA[Can delete log files of running cronjobs]]></item>
+		<item name="wcf.acp.group.option.admin.system.cronjob.canDeleteCronjobsLog.description"><![CDATA[Members of this user group can delete log files of running cronjobs. The log files are also checked by the associated cronjob if the log file was successfully written.]]></item>
+		<item name="wcf.acp.group.option.admin.system.cronjob.canEditCronjob"><![CDATA[Can edit existing cronjobs]]></item>
+		<item name="wcf.acp.group.option.admin.system.cronjob.canEditCronjob.description"><![CDATA[Members of this user group can edit existing cronjobs.]]></item>
+		<item name="wcf.acp.group.option.admin.system.cronjob.canEnableDisableCronjob"><![CDATA[Can disable existing cronjobs]]></item>
+		<item name="wcf.acp.group.option.admin.system.cronjob.canEnableDisableCronjob.description"><![CDATA[Members of this user group can disable existing cronjobs. Disabling a cronjob only stops the actual cronjob from running, but does not remove it.]]></item>
 		<item name="wcf.acp.group.option.admin.system.package.canEditServer"><![CDATA[Can edit existing update servers]]></item>
 		<item name="wcf.acp.group.option.admin.system.package.canEditServer.description"><![CDATA[Members of this user group can edit existing update servers and add new update servers.]]></item>
 		<item name="wcf.acp.group.option.admin.system.package.canInstallPackage"><![CDATA[Can install new packages]]></item>
@@ -174,8 +176,8 @@
 		<item name="wcf.acp.group.option.category.admin.maintenance"><![CDATA[Maintenance]]></item>
 		<item name="wcf.acp.group.option.category.admin.maintenance.description"><![CDATA[]]></item>
 		<item name="wcf.acp.group.option.category.admin.system"><![CDATA[System functions]]></item>
-		<item name="wcf.acp.group.option.category.admin.system.cronjobs"><![CDATA[Cronjobs]]></item>
-		<item name="wcf.acp.group.option.category.admin.system.cronjobs.description"><![CDATA[]]></item>
+		<item name="wcf.acp.group.option.category.admin.system.cronjob"><![CDATA[Cronjobs]]></item>
+		<item name="wcf.acp.group.option.category.admin.system.cronjob.description"><![CDATA[]]></item>
 		<item name="wcf.acp.group.option.category.admin.system.description"><![CDATA[]]></item>
 		<item name="wcf.acp.group.option.category.admin.system.package"><![CDATA[Package management]]></item>
 		<item name="wcf.acp.group.option.category.admin.system.package.description"><![CDATA[]]></item>
@@ -218,9 +220,9 @@
 	<category name="wcf.acp.menu">
 		<item name="wcf.acp.menu.link.autoupdate"><![CDATA[Automatic update]]></item>
 		<item name="wcf.acp.menu.link.content"><![CDATA[Content]]></item>
-		<item name="wcf.acp.menu.link.cronjobs.add"><![CDATA[Add new cronjob]]></item>
-		<item name="wcf.acp.menu.link.cronjobs.showLog"><![CDATA[View cronjob logs]]></item>
-		<item name="wcf.acp.menu.link.cronjobs.list"><![CDATA[List cronjobs]]></item>
+		<item name="wcf.acp.menu.link.cronjob.add"><![CDATA[Add new cronjob]]></item>
+		<item name="wcf.acp.menu.link.cronjob.showLog"><![CDATA[View cronjob logs]]></item>
+		<item name="wcf.acp.menu.link.cronjob.list"><![CDATA[List cronjobs]]></item>
 		<item name="wcf.acp.menu.link.display"><![CDATA[Design]]></item>
 		<item name="wcf.acp.menu.link.group"><![CDATA[User groups]]></item>
 		<item name="wcf.acp.menu.link.group.add"><![CDATA[Add new group]]></item>
-- 
2.20.1