From 0320882f767e5685df9d7ac4bec5a3e3f1b1f216 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Wed, 31 Jul 2013 17:57:58 +0200 Subject: Remove search_references() and the refshow configuration option The refshow configuration option wasn't used as described anymore already in the latest release and after the introduction of the media usage index the parameter is also no longer relevant for internal optimization. The only place where it was still used is the no longer used search_references()-function which is removed here, too. --- lib/plugins/config/lang/en/lang.php | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/plugins/config/lang/en') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 83c843b3a..2d012701b 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -134,7 +134,6 @@ $lang['target____windows'] = 'Target window for windows links'; /* Media Settings */ $lang['mediarevisions'] = 'Enable Mediarevisions?'; $lang['refcheck'] = 'Check if a media file is still in use before deleting it'; -$lang['refshow'] = 'Number of media references to show when the above setting is enabled'; $lang['gdlib'] = 'GD Lib version'; $lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; $lang['jpg_quality'] = 'JPG compression quality (0-100)'; -- cgit v1.2.3 From 2a7abf2d7fee6a2d6418e5ad4b79e37e6049bd92 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 31 Jul 2013 18:14:26 +0200 Subject: FS#2751 - self deletion of user account --- lib/plugins/config/lang/en/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/config/lang/en') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 83c843b3a..9558e53dc 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -104,6 +104,7 @@ $lang['disableactions'] = 'Disable DokuWiki actions'; $lang['disableactions_check'] = 'Check'; $lang['disableactions_subscription'] = 'Subscribe/Unsubscribe'; $lang['disableactions_wikicode'] = 'View source/Export Raw'; +$lang['disableactions_profile_delete'] = 'Delete Own Account'; $lang['disableactions_other'] = 'Other actions (comma separated)'; $lang['auth_security_timeout'] = 'Authentication Security Timeout (seconds)'; $lang['securecookie'] = 'Should cookies set via HTTPS only be sent via HTTPS by the browser? Disable this option when only the login of your wiki is secured with SSL but browsing the wiki is done unsecured.'; -- cgit v1.2.3 From cd3ed83c4f89831e192b021c8d660574a95eb168 Mon Sep 17 00:00:00 2001 From: Matthias Schulte Date: Fri, 2 Aug 2013 18:44:12 +0200 Subject: de/de-informal/en: Removed redundant suffixes in TOC of configuration manager / Synchronize terms in de and de-informal --- lib/plugins/config/lang/en/lang.php | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) (limited to 'lib/plugins/config/lang/en') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 2d012701b..8d0e7b047 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -4,6 +4,7 @@ * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Christopher Smith + * @author Matthias Schulte */ // for admin plugins, the menu prompt to be displayed in the admin menu @@ -23,29 +24,23 @@ $lang['security'] = 'Security Warning: Changing this option could present a se /* --- Config Setting Headers --- */ $lang['_configuration_manager'] = 'Configuration Manager'; //same as heading in intro.txt -$lang['_header_dokuwiki'] = 'DokuWiki Settings'; -$lang['_header_plugin'] = 'Plugin Settings'; -$lang['_header_template'] = 'Template Settings'; +$lang['_header_dokuwiki'] = 'DokuWiki'; +$lang['_header_plugin'] = 'Plugin'; +$lang['_header_template'] = 'Template'; $lang['_header_undefined'] = 'Undefined Settings'; /* --- Config Setting Groups --- */ -$lang['_basic'] = 'Basic Settings'; -$lang['_display'] = 'Display Settings'; -$lang['_authentication'] = 'Authentication Settings'; -$lang['_anti_spam'] = 'Anti-Spam Settings'; -$lang['_editing'] = 'Editing Settings'; -$lang['_links'] = 'Link Settings'; -$lang['_media'] = 'Media Settings'; -$lang['_notifications'] = 'Notification Settings'; -$lang['_syndication'] = 'Syndication Settings'; -$lang['_advanced'] = 'Advanced Settings'; -$lang['_network'] = 'Network Settings'; -// The settings group name for plugins and templates can be set with -// plugin_settings_name and template_settings_name respectively. If one -// of these lang properties is not set, the group name will be generated -// from the plugin or template name and the localized suffix. -$lang['_plugin_sufix'] = 'Plugin Settings'; -$lang['_template_sufix'] = 'Template Settings'; +$lang['_basic'] = 'Basic'; +$lang['_display'] = 'Display'; +$lang['_authentication'] = 'Authentication'; +$lang['_anti_spam'] = 'Anti-Spam'; +$lang['_editing'] = 'Editing'; +$lang['_links'] = 'Links'; +$lang['_media'] = 'Media'; +$lang['_notifications'] = 'Notification'; +$lang['_syndication'] = 'Syndication (RSS)'; +$lang['_advanced'] = 'Advanced'; +$lang['_network'] = 'Network'; /* --- Undefined Setting Messages --- */ $lang['_msg_setting_undefined'] = 'No setting metadata.'; -- cgit v1.2.3 From 7a61cb659a1fbceafeef058ac903f54f2e51dcf6 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Fri, 23 Aug 2013 04:33:28 -0700 Subject: Fix grammar for the hidepages description --- lib/plugins/config/lang/en/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/config/lang/en') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 67d3ce51f..5031e84ca 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -83,7 +83,7 @@ $lang['camelcase'] = 'Use CamelCase for links'; $lang['deaccent'] = 'How to clean pagenames'; $lang['useheading'] = 'Use first heading for pagenames'; $lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the sitemap. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces which may make the index unusable with certain ACL setups.'; -$lang['hidepages'] = 'Hide pages matching this regular expressions from search, the sitemap and other automatic indexes'; +$lang['hidepages'] = 'Hide pages matching this regular expression from search, the sitemap and other automatic indexes'; /* Authentication Settings */ $lang['useacl'] = 'Use access control lists'; -- cgit v1.2.3 From 919c95be775e8c990f35db235aa8323021548b5a Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Fri, 23 Aug 2013 04:34:49 -0700 Subject: Fix grammar for allowdebug description Add a full stop between sentences for the allowdebug description. --- lib/plugins/config/lang/en/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/config/lang/en') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 5031e84ca..3302b5bd1 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -63,7 +63,7 @@ $lang['baseurl'] = 'Server URL (eg. http://www.yourserver.com). $lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.'; $lang['dmode'] = 'Directory creation mode'; $lang['fmode'] = 'File creation mode'; -$lang['allowdebug'] = 'Allow debug disable if not needed!'; +$lang['allowdebug'] = 'Allow debug. Disable if not needed!'; /* Display Settings */ $lang['recent'] = 'Number of entries per page in the recent changes'; -- cgit v1.2.3 From a44e6f809d50d76fb4bb76b483d3022d2481eee6 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Fri, 23 Aug 2013 04:37:02 -0700 Subject: Fix grammar in proxy_except description Remove trailing preposition. --- lib/plugins/config/lang/en/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/config/lang/en') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 3302b5bd1..cdef85a85 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -181,7 +181,7 @@ $lang['proxy____port'] = 'Proxy port'; $lang['proxy____user'] = 'Proxy user name'; $lang['proxy____pass'] = 'Proxy password'; $lang['proxy____ssl'] = 'Use SSL to connect to proxy'; -$lang['proxy____except'] = 'Regular expression to match URLs for which the proxy should be skipped for.'; +$lang['proxy____except'] = 'Regular expression to match URLs for which the proxy should be skipped.'; /* Safemode Hack */ $lang['safemodehack'] = 'Enable safemode hack'; -- cgit v1.2.3