summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/plugins/styling/lang/en/lang.php6
-rw-r--r--lib/tpl/dokuwiki/lang/en/lang.php4
-rw-r--r--lib/tpl/dokuwiki/lang/en/style.txt8
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/plugins/styling/lang/en/lang.php b/lib/plugins/styling/lang/en/lang.php
index a68464f15..e50c6b912 100644
--- a/lib/plugins/styling/lang/en/lang.php
+++ b/lib/plugins/styling/lang/en/lang.php
@@ -18,11 +18,11 @@ $lang['btn_revert'] = 'Revert all styles back to the template\'s default';
// default guaranteed placeholders
$lang['__text__'] = 'Main text color';
-$lang['__background__'] = 'Main text background color';
+$lang['__background__'] = 'Main background color';
$lang['__text_alt__'] = 'Alternative text color';
-$lang['__background_alt__'] = 'Alternative text background color';
+$lang['__background_alt__'] = 'Alternative background color';
$lang['__text_neu__'] = 'Neutral text color';
-$lang['__background_neu__'] = 'Neutral text background color';
+$lang['__background_neu__'] = 'Neutral background color';
$lang['__border__'] = 'Border color';
$lang['__highlight__'] = 'Highlight color (for search results mainly)';
diff --git a/lib/tpl/dokuwiki/lang/en/lang.php b/lib/tpl/dokuwiki/lang/en/lang.php
index 82a720e21..b7b3e7fa1 100644
--- a/lib/tpl/dokuwiki/lang/en/lang.php
+++ b/lib/tpl/dokuwiki/lang/en/lang.php
@@ -6,7 +6,7 @@ $lang['__background_site__'] = 'Color for the very background (behind the conten
$lang['__link__'] = 'The general link color';
$lang['__existing__'] = 'The color for links to existing pages';
$lang['__missing__'] = 'The color for links to non-existing pages';
-$lang['__site_width__'] = 'The width of the full site (can also be a percentage)';
-$lang['__sidebar_width__'] = 'The width of the sitebar if any (can also be a percentage)';
+$lang['__site_width__'] = 'The width of the full site (can be any length unit: %, px, em, ...)';
+$lang['__sidebar_width__'] = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)';
$lang['__tablet_width__'] = 'Below screensizes of this width, the site switches to tablet mode';
$lang['__phone_width__'] = 'Below screensizes of this width, the site switches to phone mode';
diff --git a/lib/tpl/dokuwiki/lang/en/style.txt b/lib/tpl/dokuwiki/lang/en/style.txt
index f6bb4fc6f..7bf3e1a82 100644
--- a/lib/tpl/dokuwiki/lang/en/style.txt
+++ b/lib/tpl/dokuwiki/lang/en/style.txt
@@ -1,4 +1,4 @@
-If you want to adjust the logo, simply use the Media Manager to upload a ''logo.png'' in the ''wiki'' namespace and it
-will be automaticaly be used. You can also upload a ''favicon.ico'' there. If you use a closed
-wiki it is recommended to make the ''wiki'' namespace world readable in the ACL settings or
-your logo is not shown to not logged in users. \ No newline at end of file
+If you want to adjust the logo, simply use the Media Manager to upload a ''logo.png'' into the ''wiki'' or the root namespace and it
+will be automatically used. You can also upload a ''favicon.ico'' there. If you use a closed
+wiki it is recommended to make the ''wiki'' (or root) namespace world readable in the ACL settings or
+your logo is not shown to not logged in users.