Merge changes I5f88660e,Idff8e9b7

* changes:
  User options: Lang string change (Bug #1432523)
  Plans: Fix punctuation (Bug #1432523)

htdocs/admin/site/options.php

@@ -163,7 +163,7 @@ $siteoptionform = array(
                 ),
                 'loggedinprofileviewaccess' => array(
                     'type'         => 'switchbox',
-                    'title'        => get_string('loggedinprofileviewaccess', 'admin'),
+                    'title'        => get_string('loggedinprofileviewaccess1', 'admin'),
                     'description'  => get_string('loggedinprofileviewaccessdescription1', 'admin'),
                     'defaultvalue' => get_config('loggedinprofileviewaccess'),
                     'disabled'     => in_array('loggedinprofileviewaccess', $OVERRIDDEN),

htdocs/artefact/plans/lang/en.utf8/artefact.plans.php

@@ -33,7 +33,7 @@ $string['plandeletedsuccessfully'] = 'Plan deleted successfully.';
 $string['plannotdeletedsuccessfully'] = 'There was an error deleting this plan.';
 $string['plannotsavedsuccessfully'] = 'There was an error submitting this form. Please check the marked fields and try again.';
 $string['plansavedsuccessfully'] = 'Plan saved successfully.';
-$string['planstasks'] = 'Plan \'%s\' tasks.';
+$string['planstasks'] = 'Plan \'%s\' tasks';
 $string['planstasksdescription'] = 'Add tasks below or use the "%s" button to begin building your plan.';
 $string['saveplan'] = 'Save plan';
 $string['title'] = 'Title';

htdocs/lang/en.utf8/admin.php

@@ -325,7 +325,7 @@ $string['allowanonymouspages'] = 'Allow anonymous pages';
 $string['allowanonymouspagesdescription1'] = 'Users can choose to hide their name as the author of a page from other users. Administrators will still be able to see the author\'s name if they so desire.';
 $string['anonymouscomments'] = 'Anonymous comments';
 $string['anonymouscommentsdescription1'] = 'Anyone can leave comments on public pages or pages they can access by secret URL.';
-$string['loggedinprofileviewaccess'] = 'Logged-in profile access';
+$string['loggedinprofileviewaccess1'] = 'Profile access for all registered users';
 $string['loggedinprofileviewaccessdescription1'] = 'A user\'s profile page will be viewable by all registered users.';
 $string['antispam'] = 'Anti-spam';
 $string['antispamdescription'] = 'The type of anti-spam measures used on publicly visible forms';