Correct new lang strings (Bug 1304053 and Bug 892959)

Correct new group lang strings as well as others
that needed to be changed.

Change-Id: If652adcef6a2d9668dd008d4ea250ea19b1c75e8
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>

htdocs/blocktype/mygroups/lang/en.utf8/blocktype.mygroups.php

@@ -15,13 +15,13 @@ $string['title'] = 'My groups';
 $string['otherusertitle'] = "%s's groups";
 $string['description'] = 'Display a list of the groups you belong to';
 
-$string['sortby'] = 'Sort groups by';
+$string['sortgroups'] = 'Sort groups';
 $string['earliest'] = 'Earliest joined';
 $string['latest'] = 'Most recently joined';
 $string['alphabetical'] = 'A to Z';
 $string['limitto1'] = 'Maximum number of groups to display';
 $string['limittodesc'] = 'Maximum number of groups to display in the block. Leave empty to show all your groups.';
-$string['limittodescsideblock'] = 'Maximum number of groups to display in the your "My groups" list. Leave blank to show all your groups.';
+$string['limittodescsideblock1'] = 'Maximum number of groups to display in your "My groups" list in the sidebar. Leave blank to show all your groups.';
 $string['numberofmygroupsshowing'] = 'Showing %s of %s groups';
 $string['numberofmygroupsshowingearliest'] = 'Showing oldest %s of %s groups';
 $string['numberofmygroupsshowinglatest'] = 'Showing newest %s of %s groups';

htdocs/blocktype/mygroups/lib.php

@@ -119,7 +119,7 @@ class PluginBlocktypeMyGroups extends SystemBlocktype {
         return array(
             'sort' => array(
                 'type'  => 'select',
-                'title' => get_string('sortby', 'blocktype.mygroups'),
+                'title' => get_string('sortgroups', 'blocktype.mygroups'),
                 'options' => array(
                     'latest' => get_string('latest', 'blocktype.mygroups'),
                     'earliest' => get_string('earliest', 'blocktype.mygroups'),

htdocs/group/edit.php

@@ -392,7 +392,7 @@ $elements['feedbacknotify'] = array(
     'type' => 'select',
     'title' => get_string('feedbacknotify', 'group'),
     'options' => $notifyroles,
-    'description' => get_string('feedbacknotifydescription', 'group'),
+    'description' => get_string('feedbacknotifydescription1', 'group'),
     'defaultvalue' => $group_data->feedbacknotify
 );
 if ($cancreatecontrolled) {

htdocs/lang/en.utf8/group.php

@@ -93,7 +93,7 @@ $string['requestedmembershipin'] = 'Requested membership in:';
 $string['viewnotify'] = 'Shared page notifications';
 $string['viewnotifydescription2'] = 'Select which group members should receive a notification when a new group page is created and when a group member shares one of their pages with the group. The group member sharing the page will not receive this notification. For very large groups it would be best to limit this to non ordinary members as it can produce a lot of notifications.';
 $string['feedbacknotify'] = 'Feedback notifications';
-$string['feedbacknotifydescription'] = 'Select which group members should receive a notification when feedback is submitted to a group page.';
+$string['feedbacknotifydescription1'] = 'Select which group members should receive a notification when feedback is placed on a group page and artefacts.';
 $string['allowsendnow'] = 'Send forum posts immediately';
 $string['allowsendnowdescription'] = 'If checked, any group member will be able to choose to send forum posts immediately. If unchecked, only group administrators, tutors and moderators can do so.';
 $string['hiddengroup'] = 'Hide group';

htdocs/lang/en.utf8/view.php

@@ -108,7 +108,7 @@ $string['newsecreturl'] = 'New secret URL';
 $string['reallydeletesecreturl'] = 'Are you sure you want to delete this URL?';
 $string['secreturldeleted'] = 'Your secret URL was deleted.';
 $string['secreturlupdated'] = 'Secret URL updated';
-$string['generatesecreturl'] = 'Generate a new secret URL for %s';
+$string['generatesecreturl'] = 'Generate a new secret URL for "%s".';
 $string['secreturls'] = 'Secret URLs';
 
 $string['publicaccessnotallowed'] = "Your institution or site administrator has disabled public pages and secret URLs. Any secret URLs you see listed here are currently inactive.";
@@ -408,7 +408,7 @@ $string['grouphomepagedescription'] = 'The group homepage contains the content t
 // Shared views
 $string['sharedwithme'] = 'Shared with me';
 $string['titleanddescription'] = 'Title, description, tags';
-$string['titleanddescriptionanduser'] = 'Title, description, tags, user';
+$string['titleanddescriptionandtagsandowner'] = 'Title, description, tags, owner';
 $string['tagsonly'] = 'Tags only';
 $string['sharedviewsdescription'] = 'This page lists the most recently modified or commented on pages that have been shared with you. They may have been shared with you directly, shared with friends of the owner, or shared with one of your groups.';
 $string['sharedwith'] = 'Shared with';

htdocs/lib/user.php

@@ -361,15 +361,15 @@ function general_account_prefs_form_elements($prefs) {
     $elements['groupsideblockmaxgroups'] = array(
         'type'         => 'text',
         'size'         => 4,
-        'title'        => get_string('limitto', 'blocktype.mygroups'),
-        'description'  => get_string('limittodescsideblock', 'blocktype.mygroups'),
+        'title'        => get_string('limitto1', 'blocktype.mygroups'),
+        'description'  => get_string('limittodescsideblock1', 'blocktype.mygroups'),
         'defaultvalue' => isset($prefs->groupsideblockmaxgroups) ? $prefs->groupsideblockmaxgroups : 0,
         'rules'        => array('regex' => '/^[0-9]*$/', 'minvalue' => 0, 'maxvalue' => 1000),
     );
     $elements['groupsideblocksortby'] = array(
         'type'         => 'select',
         'defaultvalue' => isset($prefs->groupsideblocksortby) ? $prefs->groupsideblocksortby : 'alphabetical',
-        'title' => get_string('sortby', 'blocktype.mygroups'),
+        'title' => get_string('sortgroups', 'blocktype.mygroups'),
         'options' =>  array(
             'latest' => get_string('latest', 'blocktype.mygroups'),
             'earliest' => get_string('earliest', 'blocktype.mygroups'),

htdocs/view/sharedviews.php

@@ -25,7 +25,7 @@ $offset = param_integer('offset', 0);
 $queryparams = array();
 
 $searchoptions = array(
-    'titleanddescriptionanduser' => get_string('titleanddescriptionanduser', 'view'),
+    'titleanddescriptionanduser' => get_string('titleanddescriptionandtagsandowner', 'view'),
     'tagsonly' => get_string('tagsonly', 'view'),
 );
 if (!empty($tag)) {