From 9664a2b801ce91ae3707306f01fb4cad528b1258 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 14 Jul 2012 09:54:42 +0200 Subject: changed the link in the installer to point to wiki:welcome --- inc/lang/en/lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc/lang/en/lang.php') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 3c51ba224..73c3522fd 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -302,9 +302,9 @@ $lang['i_writeerr'] = 'Unable to create %s. You will nee $lang['i_badhash'] = 'unrecognised or modified dokuwiki.php (hash=%s)'; $lang['i_badval'] = '%s - illegal or empty value'; $lang['i_success'] = 'The configuration was finished successfully. You may delete the install.php file now. Continue to - your new DokuWiki.'; + your new DokuWiki.'; $lang['i_failure'] = 'Some errors occurred while writing the configuration files. You may need to fix them manually before - you can use your new DokuWiki.'; + you can use your new DokuWiki.'; $lang['i_policy'] = 'Initial ACL policy'; $lang['i_pol0'] = 'Open Wiki (read, write, upload for everyone)'; $lang['i_pol1'] = 'Public Wiki (read for everyone, write and upload for registered users)'; -- cgit v1.2.3 From b1730bd21bd9ce8807b80c4cfb044858c7af60d8 Mon Sep 17 00:00:00 2001 From: Tom N Harris Date: Tue, 17 Jul 2012 19:45:48 -0400 Subject: Translatable string for "None" license selection The position of the option was moved to the end of the list so the English label "None of the above" will make sense. --- inc/lang/en/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc/lang/en/lang.php') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 3c51ba224..2592b9a5c 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -311,6 +311,7 @@ $lang['i_pol1'] = 'Public Wiki (read for everyone, write and uplo $lang['i_pol2'] = 'Closed Wiki (read, write, upload for registered users only)'; $lang['i_retry'] = 'Retry'; $lang['i_license'] = 'Please choose the license you want to put your content under:'; +$lang['i_license_none'] = 'None of the above'; $lang['recent_global'] = 'You\'re currently watching the changes inside the %s namespace. You can also view the recent changes of the whole wiki.'; $lang['years'] = '%d years ago'; -- cgit v1.2.3 From 2c2ee174e46096ce890518061ca8e2e0866cf67c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 18 Nov 2012 18:52:13 +0000 Subject: changed semicolon to colon in link to welcome page to make it less confusing --- inc/lang/en/lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc/lang/en/lang.php') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 73c3522fd..99877320f 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -302,9 +302,9 @@ $lang['i_writeerr'] = 'Unable to create %s. You will nee $lang['i_badhash'] = 'unrecognised or modified dokuwiki.php (hash=%s)'; $lang['i_badval'] = '%s - illegal or empty value'; $lang['i_success'] = 'The configuration was finished successfully. You may delete the install.php file now. Continue to - your new DokuWiki.'; + your new DokuWiki.'; $lang['i_failure'] = 'Some errors occurred while writing the configuration files. You may need to fix them manually before - you can use your new DokuWiki.'; + you can use your new DokuWiki.'; $lang['i_policy'] = 'Initial ACL policy'; $lang['i_pol0'] = 'Open Wiki (read, write, upload for everyone)'; $lang['i_pol1'] = 'Public Wiki (read for everyone, write and upload for registered users)'; -- cgit v1.2.3 From 2e41a0255616465dae4c1883ce295ed4a9cd9a33 Mon Sep 17 00:00:00 2001 From: Hakan Sandell Date: Sun, 2 Dec 2012 20:32:38 +0100 Subject: Re-phrased "no license" installer text --- inc/lang/en/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/lang/en/lang.php') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index a21db0564..6ea5acec0 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -311,7 +311,7 @@ $lang['i_pol1'] = 'Public Wiki (read for everyone, write and uplo $lang['i_pol2'] = 'Closed Wiki (read, write, upload for registered users only)'; $lang['i_retry'] = 'Retry'; $lang['i_license'] = 'Please choose the license you want to put your content under:'; -$lang['i_license_none'] = 'None of the above'; +$lang['i_license_none'] = 'Do not show any license information'; $lang['recent_global'] = 'You\'re currently watching the changes inside the %s namespace. You can also view the recent changes of the whole wiki.'; $lang['years'] = '%d years ago'; -- cgit v1.2.3 From 3a0852d932a09ba01dcbcf2d371febf451f9f00c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 7 Dec 2012 17:46:16 +0100 Subject: added option to enable automatic popularity data in installer --- inc/lang/en/lang.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'inc/lang/en/lang.php') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 6ea5acec0..144faf4e1 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -312,6 +312,8 @@ $lang['i_pol2'] = 'Closed Wiki (read, write, upload for registere $lang['i_retry'] = 'Retry'; $lang['i_license'] = 'Please choose the license you want to put your content under:'; $lang['i_license_none'] = 'Do not show any license information'; +$lang['i_pop_field'] = 'Please, help us to improve the DokuWiki experience:'; +$lang['i_pop_label'] = 'Once a month, send anonymous usage data to the DokuWiki developers'; $lang['recent_global'] = 'You\'re currently watching the changes inside the %s namespace. You can also view the recent changes of the whole wiki.'; $lang['years'] = '%d years ago'; -- cgit v1.2.3