Experimental page navigation, some text corrections, some new and improved SVG images

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index d522390c11c6187fb221e066636dfd23ff4e8375..665cef403c5743e499b1c5307225410218ec37c2 100644 (file)
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -1361,36 +1361,108 @@ tbody tr .columnIcon img {
 
 /* -- -- -- -- -- ToDo: Page Navigation -- -- -- -- -- */
 
-.pageNavigation ul li {
-       display: inline-block;
+/* This is only experimental for the moment */
+
+.pageNavigation ul li:not(.children) {
+       background-image: -webkit-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .1));
+       background-image: -moz-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .1));
+       background-image: -o-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .1));
+       background-image: -ms-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .1));
+       background-image: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .1));
+       
+       border: 1px solid rgba(0, 0, 0, .2);
        border-radius: 3px;
+       display: inline-block;
+       position: relative;
 }
 
-.pageNavigation ul li:not(.skip) {
-       background-color: #eee;
-       border: 1px solid #ccc;
-       padding: 3px;
+.pageNavigation ul li.disabled {
+       background-image: none;
+       border: 1px solid rgba(0, 0, 0, .1);
 }
 
-.pageNavigation ul li.active,
-.pageNavigation ul li:not(.skip):hover {
-       background-color: #faebd7;
-       border-color: #f80;
-       color: #f80;
+.pageNavigation ul li:after {
+       content: "";
+       display: block;
+       clear: both;
+}
+
+.pageNavigation ul li img {
+       width: 16px;
+       height: 16px;
+}
+
+.pageNavigation ul li:not(.disabled):hover {
+       color: #333;
+       border: 1px solid rgba(0, 0, 0, .3);
+       background-color: rgba(255, 255, 255, 1);
+       background-image: none;
+}
+
+.pageNavigation ul li.skip {   
+       top: -1px;
+       padding: 2px 2px 1px 3px;
 }
 
 .pageNavigation ul li a {
+       color: #999;
+       text-shadow: 0 1px 0 #fff;
        text-decoration: none;
+       display: inline-block;
 }
 
-.pageNavigation ul li:not(.skip):hover a {
-       color: #f80;
+.pageNavigation ul li:not(.skip) a {
+       padding: 3px 5px;
 }
 
-.pageNavigation ul li.skip {
-       vertical-align: middle;
+.pageNavigation ul li:active,
+.pageNavigation ul li:focus {
+       border: 1px solid rgba(0, 0, 0, .3);
+       background-color: rgba(0, 0, 0, .5) !important;
+}
+
+.pageNavigation ul li.active,
+.pageNavigation ul li.active:hover {
+       color: #fff;
+       text-shadow: 0 1px 0 #000;
+       border: 1px solid rgba(0, 0, 0, .3);
+       background-color: rgba(0, 0, 0, .5);
+       
+       background-image: -webkit-linear-gradient(rgba(0, 0, 0, .3), rgba(0, 0, 0, 0) 3px);
+       background-image: -moz-linear-gradient(rgba(0, 0, 0, .3), rgba(0, 0, 0, 0) 3px);
+       background-image: -o-linear-gradient(rgba(0, 0, 0, .3), rgba(0, 0, 0, 0) 3px);
+       background-image: -ms-linear-gradient(rgba(0, 0, 0, .3), rgba(0, 0, 0, 0) 3px);
+       background-image: linear-gradient(rgba(0, 0, 0, .3), rgba(0, 0, 0, 0) 3px);
+       
+       padding: 3px 5px;
 }
 
+.pageNavigation ul li:active a,
+.pageNavigation ul li:focus a {
+       color: #fff;
+       text-shadow: 0 1px 0 #000;
+}
+
+.pageNavigation ul li.children,
+.pageNavigation ul li.children:hover,
+.pageNavigation ul li.children:active,
+.pageNavigation ul li.children:focus {
+       display: inline-block;
+}
+
+.pageNavigation ul li.children img {
+       width: 7px;
+       height: 9px;
+}
+
+
+
+
+
+
+
+
+
 
 
 /* -- -- -- -- -- System Notifications -- -- -- -- -- */

diff --git a/wcfsetup/install/files/icon/cache1.svg b/wcfsetup/install/files/icon/cache1.svg
index 367c6d4da15571696a321d7b219edf0402abfcab..4cacf2deb1520931abe29d2b2e11416ab87a4227 100644 (file)
--- a/wcfsetup/install/files/icon/cache1.svg
+++ b/wcfsetup/install/files/icon/cache1.svg
@@ -18,7 +18,7 @@
        \r
        <g id="IconCache">\r
                <g class="Lower">\r
-                       <path id="FrontsideArrows1" style="fill: #fff;" d="M14.5527344,5.9995117H1.4477539\r
+                       <path id="Arrows1" style="fill: #fff;" d="M14.5527344,5.9995117H1.4477539\r
                                c-0.2749023,0-0.4750977,0.2236328-0.4448242,0.4970703l0.9418945,8.0063477C1.9750977,14.7763672,2.2250977,15,2.5,15h11\r
                                c0.2753906,0,0.5244141-0.2236328,0.5556641-0.4970703l0.9414062-8.0063477\r
                                C15.0283203,6.2231445,14.828125,5.9995117,14.5527344,5.9995117z M9.3457031,14H7.1953125l-1.0742188-1.0771484h1.3818359\r
@@ -30,7 +30,7 @@
                                C13.7753906,5,14,5.2250977,14,5.5v0.2294922H2z"/>\r
                </g>\r
                <g class="Upper">\r
-                       <path id="FrontsideArrows2" style="fill: #666;" d="M14.5527344,4.9995117H1.4477539\r
+                       <path id="Arrows2" style="fill: #666;" d="M14.5527344,4.9995117H1.4477539\r
                                c-0.2749023,0-0.4750977,0.2236328-0.4448242,0.4970703l0.9418945,8.0063477C1.9750977,13.7763672,2.2250977,14,2.5,14h11\r
                                c0.2753906,0,0.5244141-0.2236328,0.5556641-0.4970703l0.9414062-8.0063477\r
                                C15.0283203,5.2231445,14.828125,4.9995117,14.5527344,4.9995117z M9.3457031,13H7.1953125l-1.0742188-1.0771484h1.3818359\r

diff --git a/wcfsetup/install/files/icon/dropDown1.svg b/wcfsetup/install/files/icon/dropDown1.svg
new file mode 100644 (file)
index 0000000..188847c
--- /dev/null
+++ b/wcfsetup/install/files/icon/dropDown1.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="7px" height="9px" viewBox="0 0 7 9" xml:space="preserve">\r
+       \r
+       <title>Dropdown</title> \r
+       <desc>Dropdown Icon</desc> \r
+       \r
+       <!--\r
+               @author         Harald Szekely \r
+               @copyright      2011 WoltLab GmbH \r
+               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
+       --> \r
+       \r
+       <g id="IconDropdown">\r
+               <path class="Lower" style="fill-rule: evenodd; clip-rule: evenodd; fill: #fff;" d="M7,4.9980469V6L3.5,8.9980469l-3.4995117-3v-1H7z M7,4V2.9980469L3.5,1L0.0004883,2.9980469V4H7z"/>\r
+               <path class="Upper" style="fill-rule: evenodd; clip-rule: evenodd; fill: #666;" d="M7,4.9980469l-3.5,3l-3.4995117-3H7z M7,2.9980469L3.5,0L0.0004883,2.9980469H7z"/>\r
+       </g>\r
+</svg>\r

diff --git a/wcfsetup/install/files/icon/next1.svg b/wcfsetup/install/files/icon/next1.svg
new file mode 100644 (file)
index 0000000..0e2261b
--- /dev/null
+++ b/wcfsetup/install/files/icon/next1.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">\r
+       \r
+       <title>To Right</title> \r
+       <desc>To The Right Icon</desc> \r
+       \r
+       <!--\r
+               @author         Harald Szekely \r
+               @copyright      2011 WoltLab GmbH \r
+               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
+       --> \r
+       \r
+       <defs>\r
+               \r
+       </defs>\r
+       \r
+       <g id="IconToRight">\r
+               <path id="Lower" class="Lower" style="fill-rule: evenodd; clip-rule: evenodd; fill: #fff;" d="M14,8.5C14,4.909668,11.0898438,2,7.4995117,2\r
+                       C4.4321289,2,1.862793,4.1411133,1.1801758,7h6.8203125L7.9995117,4.5L13,8.5l-5.0014648,4L7.9995117,10H1.1801758\r
+                       c0.6787109,2.8652344,3.2470703,5,6.3193359,5C11.0898438,15,14,12.0898438,14,8.5z"/>\r
+               <path id="Upper" class="Upper" style="fill-rule: evenodd; clip-rule: evenodd; fill: #666;" d="M14,7.5C14,3.909668,11.0898438,1,7.4995117,1\r
+                       C4.4321289,1,1.862793,3.1411133,1.1801758,6h6.8203125L7.9995117,3.5L13,7.5l-5.0014648,4L7.9995117,9H1.1801758\r
+                       c0.6787109,2.8652344,3.2470703,5,6.3193359,5C11.0898438,14,14,11.0898438,14,7.5z"/>\r
+       </g>\r
+</svg>\r

diff --git a/wcfsetup/install/files/icon/next1D.svg b/wcfsetup/install/files/icon/next1D.svg
new file mode 100644 (file)
index 0000000..62717d1
--- /dev/null
+++ b/wcfsetup/install/files/icon/next1D.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">\r
+       \r
+       <title>To Right</title> \r
+       <desc>To The Right Icon</desc> \r
+       \r
+       <!--\r
+               @author         Harald Szekely \r
+               @copyright      2011 WoltLab GmbH \r
+               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
+       --> \r
+       \r
+       <defs>\r
+               \r
+       </defs>\r
+       \r
+       <g id="IconToRight" style="opacity: .3;">\r
+               <path id="Lower" class="Lower" style="fill-rule: evenodd; clip-rule: evenodd; fill: #fff;" d="M14,8.5C14,4.909668,11.0898438,2,7.4995117,2\r
+                       C4.4321289,2,1.862793,4.1411133,1.1801758,7h6.8203125L7.9995117,4.5L13,8.5l-5.0014648,4L7.9995117,10H1.1801758\r
+                       c0.6787109,2.8652344,3.2470703,5,6.3193359,5C11.0898438,15,14,12.0898438,14,8.5z"/>\r
+               <path id="Upper" class="Upper" style="fill-rule: evenodd; clip-rule: evenodd; fill: #666;" d="M14,7.5C14,3.909668,11.0898438,1,7.4995117,1\r
+                       C4.4321289,1,1.862793,3.1411133,1.1801758,6h6.8203125L7.9995117,3.5L13,7.5l-5.0014648,4L7.9995117,9H1.1801758\r
+                       c0.6787109,2.8652344,3.2470703,5,6.3193359,5C11.0898438,14,14,11.0898438,14,7.5z"/>\r
+       </g>\r
+</svg>\r

diff --git a/wcfsetup/install/files/icon/previous1.svg b/wcfsetup/install/files/icon/previous1.svg
new file mode 100644 (file)
index 0000000..4c1cf63
--- /dev/null
+++ b/wcfsetup/install/files/icon/previous1.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">\r
+       \r
+       <title>To Left</title> \r
+       <desc>To The Left Icon</desc> \r
+       \r
+       <!--\r
+               @author         Harald Szekely \r
+               @copyright      2011 WoltLab GmbH \r
+               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
+       --> \r
+       \r
+       <defs>\r
+               \r
+       </defs>\r
+       \r
+       <g id="IconToLeft">\r
+               <path id="Lower" class="Lower" style="fill-rule: evenodd; clip-rule: evenodd; fill: #fff;" d="M1,8.5C1,4.909668,3.9101562,2,7.5,2\r
+                       c3.0683594,0,5.6367188,2.1411133,6.3203125,5H7V4.5l-5,4l5.0019531,4L7,10h6.8203125C13.140625,12.8652344,10.5722656,15,7.5,15\r
+                       C3.9101562,15,1,12.0898438,1,8.5z"/>\r
+               <path id="Upper" class="Upper" style="fill-rule: evenodd; clip-rule: evenodd; fill: #666;" d="M1,7.5C1,3.909668,3.9101562,1,7.5,1\r
+                       c3.0683594,0,5.6367188,2.1411133,6.3203125,5H7V3.5l-5,4l5.0019531,4L7,9h6.8203125C13.140625,11.8652344,10.5722656,14,7.5,14\r
+                       C3.9101562,14,1,11.0898438,1,7.5z"/>\r
+       </g>\r
+</svg>\r

diff --git a/wcfsetup/install/files/icon/previous1D.svg b/wcfsetup/install/files/icon/previous1D.svg
new file mode 100644 (file)
index 0000000..45261ed
--- /dev/null
+++ b/wcfsetup/install/files/icon/previous1D.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">\r
+       \r
+       <title>To Left</title> \r
+       <desc>To The Left Icon</desc> \r
+       \r
+       <!--\r
+               @author         Harald Szekely \r
+               @copyright      2011 WoltLab GmbH \r
+               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
+       --> \r
+       \r
+       <defs>\r
+               \r
+       </defs>\r
+       \r
+       <g id="IconToLeft" style="opacity: .3;">\r
+               <path id="Lower" class="Lower" style="fill-rule: evenodd; clip-rule: evenodd; fill: #fff;" d="M1,8.5C1,4.909668,3.9101562,2,7.5,2\r
+                       c3.0683594,0,5.6367188,2.1411133,6.3203125,5H7V4.5l-5,4l5.0019531,4L7,10h6.8203125C13.140625,12.8652344,10.5722656,15,7.5,15\r
+                       C3.9101562,15,1,12.0898438,1,8.5z"/>\r
+               <path id="Upper" class="Upper" style="fill-rule: evenodd; clip-rule: evenodd; fill: #666;" d="M1,7.5C1,3.909668,3.9101562,1,7.5,1\r
+                       c3.0683594,0,5.6367188,2.1411133,6.3203125,5H7V3.5l-5,4l5.0019531,4L7,9h6.8203125C13.140625,11.8652344,10.5722656,14,7.5,14\r
+                       C3.9101562,14,1,11.0898438,1,7.5z"/>\r
+       </g>\r
+</svg>\r

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 53af932bd13c9d406cb0009eb32bbb1d47c34f37..05b196fd9e8cf9fefef1f2ded470c3c342a3b76e 100644 (file)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -1949,11 +1949,11 @@ $.widget('ui.wcfPages', {
                maxPage: 1,
                
                // icons
-               previousIcon: RELATIVE_WCF_DIR + 'icon/previousS.png',
-               previousDisabledIcon: RELATIVE_WCF_DIR + 'icon/previousDisabledS.png',
-               arrowDownIcon: RELATIVE_WCF_DIR + 'icon/arrowDown.png',
-               nextIcon: RELATIVE_WCF_DIR + 'icon/nextS.png',
-               nextDisabledIcon: RELATIVE_WCF_DIR + 'icon/nextDisabledS.png',
+               previousIcon: RELATIVE_WCF_DIR + 'icon/previous1.svg',
+               previousDisabledIcon: RELATIVE_WCF_DIR + 'icon/previous1D.svg',
+               arrowDownIcon: RELATIVE_WCF_DIR + 'icon/dropDown1.svg',
+               nextIcon: RELATIVE_WCF_DIR + 'icon/next1.svg',
+               nextDisabledIcon: RELATIVE_WCF_DIR + 'icon/next1D.svg',
                
                // language
                // we use options here instead of language variables, because the paginator is not only usable with pages

diff --git a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
index 4963bc16d901d53ca8909005f1594fd104470198..e7d35f8182f7876732333e10d21259bd257c8a13 100644 (file)
--- a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
@@ -94,10 +94,10 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin {
                        // previous page
                        $previousTitle = WCF::getLanguage()->getDynamicVariable('wcf.global.page.previous');
                        if ($tagArgs['page'] > 1) {
-                               $html .= '<li class="skip"><a href="'.$this->insertPageNumber($tagArgs['link'], $tagArgs['page'] - 1).'" title="'.$previousTitle.'"><img src="'.self::getIconPath('previousS.png').'" alt="" /></a></li>'."\n";
+                               $html .= '<li class="skip"><a href="'.$this->insertPageNumber($tagArgs['link'], $tagArgs['page'] - 1).'" title="'.$previousTitle.'" class="balloonTooltip"><img src="'.self::getIconPath('previous1.svg').'" alt="" /></a></li>'."\n";
                        }
                        else {
-                               $html .= '<li class="skip"><img src="'.self::getIconPath('previousDisabledS.png').'" alt="" /></li>'."\n";
+                               $html .= '<li class="skip disabled"><img src="'.self::getIconPath('previous1D.svg').'" alt="" /></li>'."\n";
                        }
                        
                        // first page
@@ -146,7 +146,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin {
                                        $html .= $this->makeLink($tagArgs['link'], 2, $tagArgs['page']);
                                }
                                else {
-                                       $html .= '<li class="children"><a onclick="multiPagesLinks.startPageNumberInput(this)">&hellip;<img src="'.self::getIconPath('arrowDown.png').'" alt="" /></a><input type="text" class="inputText" name="pageNo" /><div><ul>'."\n";
+                                       $html .= '<li class="children"><a onclick="multiPagesLinks.startPageNumberInput(this)">&hellip;<img src="'.self::getIconPath('arrowDown.png').'" alt="" /></a><input type="text" name="pageNo" class="short" /><div><ul>'."\n";
                                        
                                        $k = 0;
                                        $step = intval(ceil(($left - 2) / self::SHOW_SUB_LINKS));
@@ -170,7 +170,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin {
                                        $html .= $this->makeLink($tagArgs['link'], $tagArgs['pages'] - 1, $tagArgs['page']);
                                }
                                else {
-                                       $html .= '<li class="children"><a onclick="multiPagesLinks.startPageNumberInput(this)">&hellip;<img src="'.self::getIconPath('arrowDown.png').'" alt="" /></a><input type="text" class="inputText" name="page" /><div><ul>'."\n";
+                                       $html .= '<li class="children"><a onclick="multiPagesLinks.startPageNumberInput(this)">&hellip;<img src="'.self::getIconPath('arrowDown.png').'" alt="" /></a><input type="text" name="page" class="short" /><div><ul>'."\n";
                                        
                                        $k = 0;
                                        $step = intval(ceil(($tagArgs['pages'] - $right) / self::SHOW_SUB_LINKS));
@@ -189,10 +189,10 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin {
                        // next page
                        $nextTitle = WCF::getLanguage()->getDynamicVariable('wcf.global.page.next');
                        if ($tagArgs['page'] && $tagArgs['page'] < $tagArgs['pages']) {
-                               $html .= '<li class="skip"><a href="'.$this->insertPageNumber($tagArgs['link'], $tagArgs['page'] + 1).'" title="'.$nextTitle.'"><img src="'.self::getIconPath('nextS.png').'" alt="" /></a></li>'."\n";
+                               $html .= '<li class="skip"><a href="'.$this->insertPageNumber($tagArgs['link'], $tagArgs['page'] + 1).'" title="'.$nextTitle.'" class="balloonTooltip"><img src="'.self::getIconPath('next1.svg').'" alt="" /></a></li>'."\n";
                        }
                        else {
-                               $html .= '<li class="skip"><img src="'.self::getIconPath('nextDisabledS.png').'" alt="" /></li>'."\n";
+                               $html .= '<li class="skip disabled"><img src="'.self::getIconPath('next1D.svg').'" alt="" /></li>'."\n";
                        }
                        
                        // close div and ul

diff --git a/wcfsetup/install/lang/de-informal.xml b/wcfsetup/install/lang/de-informal.xml
index 4cdccd7b7b1d7797be069e18afa2af8127f382e6..98aa71b51b0f4488486d0b74d856682f0443da5d 100644 (file)
--- a/wcfsetup/install/lang/de-informal.xml
+++ b/wcfsetup/install/lang/de-informal.xml
@@ -214,12 +214,12 @@
                <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><!-- ToDo: change action name from "view" to "list" -->
+               <item name="wcf.acp.menu.link.cronjobs.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>
                <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><!-- ToDo: change action name from "view" to "list" -->
+               <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>
@@ -230,8 +230,8 @@
                <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><!-- ToDo: change action name from "view" to "list" -->
-               <item name="wcf.acp.menu.link.package.list"><![CDATA[Pakete auflisten]]></item><!-- ToDo: change action name from "view" to "list" -->
+               <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.user"><![CDATA[Benutzer]]></item>
                <item name="wcf.acp.menu.link.user.add"><![CDATA[Benutzer hinzufügen]]></item>
@@ -254,7 +254,7 @@
                <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ähle die gewünschte Cache-Methode aus. Beachte, 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.description"><![CDATA[Bitte wähle die gewünschte Cache-Methode aus! Beachte, 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.general"><![CDATA[Allgemein]]></item>
@@ -433,7 +433,7 @@
                <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ähle aus, welche Zusatzpakete du installieren möchtest.]]></item>
+               <item name="wcf.acp.package.optionals.description"><![CDATA[Das aktuelle Paket bringt folgende optionale Zusatzpakete mit. Wähle aus, welche Zusatzpakete du installieren möchtest.]]></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>
@@ -441,8 +441,8 @@
                <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ähle ein anderes Verzeichnis.]]></item>
-               <item name="wcf.acp.package.packageDir.input"><![CDATA[Bitte gib hier das Installationsverzeichnis an.]]></item>
+               <item name="wcf.acp.package.packageDir.error.wcfDirLocked"><![CDATA[Das angegebene Verzeichnis wird bereits von WoltLab Community Framework beansprucht. Wähle ein anderes Verzeichnis.]]></item>
+               <item name="wcf.acp.package.packageDir.input"><![CDATA[Gib hier das Installationsverzeichnis an.]]></item>
                <item name="wcf.acp.package.packageDir.url"><![CDATA[Nach der Installation in das angegebene Installationsverzeichnis ist die Anwendung über folgende 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ähle aus, zu welcher Instanz jeweils eine Abhängigkeit hergestellt werden soll.]]></item>
@@ -481,7 +481,7 @@
                <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 <b>{$packageName|encodeJS}</b>: ]]></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>
@@ -524,24 +524,24 @@
                <item name="wcf.acp.package.uninstall.dependentPackages.warning"><![CDATA[Diese{if $dependentPackages|count == 1}s Paket wird{else} Pakete werden{/if}, nach deiner 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.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[Willst du 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.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.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[Homepage:]]></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">

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index b99cf976830bd618ca7a40ed866025531c281d9c..2bef952e788598df36d4fdc9c26ac485e083e8ac 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -219,7 +219,7 @@
                <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><!-- ToDo: change action name from "view" to "list" -->
+               <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>
@@ -230,8 +230,8 @@
                <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><!-- ToDo: change action name from "view" to "list" -->
-               <item name="wcf.acp.menu.link.package.list"><![CDATA[Pakete auflisten]]></item><!-- ToDo: change action name from "view" to "list" -->
+               <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.user"><![CDATA[Benutzer]]></item>
                <item name="wcf.acp.menu.link.user.add"><![CDATA[Benutzer hinzufügen]]></item>
@@ -254,7 +254,7 @@
                <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.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.general"><![CDATA[Allgemein]]></item>
@@ -481,7 +481,7 @@
                <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 <b>{$packageName|encodeJS}</b>: ]]></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>
@@ -524,25 +524,25 @@
                <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.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.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.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[Homepage:]]></item>
-               <item name="wcf.acp.package.view.version"><![CDATA[Installierte Version:]]></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>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 5736bf154b67dedb7cb5e4c844a229762ea6509e..0ea30bbd214863f1fa1d84a2a07ee5620e3ec1cb 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -10,7 +10,7 @@
        <category name="wcf.acp.cache">
                <item name="wcf.acp.cache.button.clear"><![CDATA[Empty cache]]></item>
                <item name="wcf.acp.cache.clear.success"><![CDATA[The cache has been successfully emptied.]]></item>
-               <item name="wcf.acp.cache.clear.sure"><![CDATA[Are you sure that you want to completely empty the cache?]]></item>
+               <item name="wcf.acp.cache.clear.sure"><![CDATA[Are you sure that you want to empty the cache completely?]]></item>
                <item name="wcf.acp.cache.data"><![CDATA[Settings]]></item>
                <item name="wcf.acp.cache.data.files"><![CDATA[Files]]></item>
                <item name="wcf.acp.cache.data.files.count"><![CDATA[{#$files|count} files]]></item>
@@ -214,12 +214,12 @@
                <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><!-- ToDo: change action name from "view" to "list" -->
+               <item name="wcf.acp.menu.link.cronjobs.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>
                <item name="wcf.acp.menu.link.group.mail"><![CDATA[E-mail all group members]]></item>
-               <item name="wcf.acp.menu.link.group.list"><![CDATA[Group overview]]></item><!-- ToDo: change action name from "view" to "list" -->
+               <item name="wcf.acp.menu.link.group.list"><![CDATA[Group overview]]></item>
                <item name="wcf.acp.menu.link.log"><![CDATA[Log]]></item>
                <item name="wcf.acp.menu.link.log.cache"><![CDATA[Cache]]></item>
                <item name="wcf.acp.menu.link.log.session"><![CDATA[Session]]></item>
@@ -230,8 +230,8 @@
                <item name="wcf.acp.menu.link.package.database"><![CDATA[Search packages]]></item>
                <item name="wcf.acp.menu.link.package.install"><![CDATA[Install new package]]></item>
                <item name="wcf.acp.menu.link.package.server.add"><![CDATA[Add new server]]></item>
-               <item name="wcf.acp.menu.link.package.server.list"><![CDATA[Server overview]]></item><!-- ToDo: change action name from "view" to "list" -->
-               <item name="wcf.acp.menu.link.package.list"><![CDATA[List installed packages]]></item><!-- ToDo: change action name from "view" to "list" -->
+               <item name="wcf.acp.menu.link.package.server.list"><![CDATA[Server overview]]></item>
+               <item name="wcf.acp.menu.link.package.list"><![CDATA[List installed packages]]></item>
                <item name="wcf.acp.menu.link.system"><![CDATA[System]]></item>
                <item name="wcf.acp.menu.link.user"><![CDATA[User]]></item>
                <item name="wcf.acp.menu.link.user.add"><![CDATA[Add user]]></item>
@@ -484,7 +484,7 @@
                <item name="wcf.acp.package.step.install.packageInstallationPlugins"><![CDATA[Installing package plugins ...]]></item>
                <item name="wcf.acp.package.step.install.parent"><![CDATA[Parent package allocation is being done ...]]></item>
                <item name="wcf.acp.package.step.install.requirements"><![CDATA[Checking dependencies ...]]></item>
-               <item name="wcf.acp.package.step.title"><![CDATA[Package <b>{$packageName|encodeJS}</b>: ]]></item>
+               <item name="wcf.acp.package.step.title"><![CDATA[Package <strong>{$packageName|encodeJS}</strong>: ]]></item>
                <item name="wcf.acp.package.step.uninstall.ACPMenuPackageInstallationPlugin"><![CDATA[Removing menu items from the Administration Control Panel ...]]></item>
                <item name="wcf.acp.package.step.uninstall.ACPTemplatePatchPackageInstallationPlugin"><![CDATA[Removing template patches of the Administration Control Panel ...]]></item>
                <item name="wcf.acp.package.step.uninstall.ACPTemplatePackageInstallationPlugin"><![CDATA[Removing templates from the Administration Control Panel ...]]></item>
@@ -534,25 +534,25 @@
                <item name="wcf.acp.package.uninstall.dependentPackages.warning"><![CDATA[Upon final confirmation {if $dependentPackages|count == 1}this package{else}these packages{/if} will be removed without any further promting.]]></item>
                <item name="wcf.acp.package.update"><![CDATA[Package update]]></item>
                <item name="wcf.acp.package.updateDate"><![CDATA[Date of update]]></item>
-               <item name="wcf.acp.package.view.author"><![CDATA[Author:]]></item>
+               <item name="wcf.acp.package.view.author"><![CDATA[Author]]></item>
                <item name="wcf.acp.package.view.button.makeActive"><![CDATA[Go to the Administration Control Panel]]></item>
                <item name="wcf.acp.package.view.button.uninstall"><![CDATA[Remove package]]></item>
                <item name="wcf.acp.package.view.button.uninstall.all"><![CDATA[Remove all packages]]></item>
                <item name="wcf.acp.package.view.button.uninstall.sure"><![CDATA[Are you sure that you would like to remove this package?]]></item>
                <item name="wcf.acp.package.view.button.update"><![CDATA[Update package]]></item>
-               <item name="wcf.acp.package.view.date"><![CDATA[Date:]]></item>
+               <item name="wcf.acp.package.view.date"><![CDATA[Date]]></item>
                <item name="wcf.acp.package.view.dependentPackages"><![CDATA[Dependent packages]]></item>
                <item name="wcf.acp.package.view.dependentPackages.description"><![CDATA[This package has a requirement from {if $dependentPackages|count == 1}one other package.{else}{#$dependentPackages|count} other packages.{/if}]]></item>
                <item name="wcf.acp.package.view.dependentPackages.uninstall.description"><![CDATA[{if $dependentPackages|count == 1}This package is required by one other Package{else}{#$dependentPackages|count} Packages are directly or indirectly dependent upon this package{/if}.]]></item>
-               <item name="wcf.acp.package.view.dir"><![CDATA[Installation folder:]]></item>
-               <item name="wcf.acp.package.view.identifier"><![CDATA[Identifier:]]></item>
-               <item name="wcf.acp.package.view.instanceNo"><![CDATA[Installed instance:]]></item>
-               <item name="wcf.acp.package.view.parent"><![CDATA[Parent package:]]></item>
+               <item name="wcf.acp.package.view.dir"><![CDATA[Installation folder]]></item>
+               <item name="wcf.acp.package.view.identifier"><![CDATA[Identifier]]></item>
+               <item name="wcf.acp.package.view.instanceNo"><![CDATA[Installed instance]]></item>
+               <item name="wcf.acp.package.view.parent"><![CDATA[Parent package]]></item>
                <item name="wcf.acp.package.view.properties"><![CDATA[Properties]]></item>
                <item name="wcf.acp.package.view.requiredPackages"><![CDATA[Required packages]]></item>
                <item name="wcf.acp.package.view.requiredPackages.description"><![CDATA[This package has a requirement of {if $requiredPackages|count == 1}one other package.{else}{#$requiredPackages|count} other packages.{/if}]]></item>
-               <item name="wcf.acp.package.view.url"><![CDATA[Homepage:]]></item>
-               <item name="wcf.acp.package.view.version"><![CDATA[Installed version:]]></item>
+               <item name="wcf.acp.package.view.url"><![CDATA[Website (URL):]]></item>
+               <item name="wcf.acp.package.view.version"><![CDATA[Installed version]]></item>
        </category>
        <category name="wcf.acp.packageUpdate">
                <item name="wcf.acp.packageUpdate"><![CDATA[Update packages]]></item>