diff --git a/lang/en_utf8/repository.php b/lang/en_utf8/repository.php
index 75ea29585fe..afb002fc40f 100644
--- a/lang/en_utf8/repository.php
+++ b/lang/en_utf8/repository.php
@@ -85,7 +85,7 @@ $string['siteinstances'] = 'Repositories instances of the site';
 $string['size'] = 'Size';
 $string['submit'] = 'Submit';
 $string['sync'] = 'Sync';
-$string['title'] = 'Repository file picker';
+$string['title'] = 'Choose a file...';
 $string['thumbview'] = 'View as icons';
 $string['typenotvisible'] = 'Type not visible';
 $string['updown'] = 'Display order';
diff --git a/lang/en_utf8/repository_alfresco.php b/lang/en_utf8/repository_alfresco.php
index 787d4f25273..80e5a7fa118 100644
--- a/lang/en_utf8/repository_alfresco.php
+++ b/lang/en_utf8/repository_alfresco.php
@@ -2,7 +2,7 @@
 $string['alfresco_url'] = 'Alfresco URL';
 $string['configplugin'] = 'Alfresco configuration';
 $string['notitle'] = 'notitle';
-$string['repositoryname'] = 'Alfresco Repository';
+$string['repositoryname'] = 'Alfresco repository';
 $string['repositorydesc'] = 'A plug-in for Alfresco CMS';
 $string['username'] = 'User name';
 $string['password'] = 'Password';
diff --git a/lang/en_utf8/repository_flickr.php b/lang/en_utf8/repository_flickr.php
index 81146264c2d..cf90a51ca6f 100644
--- a/lang/en_utf8/repository_flickr.php
+++ b/lang/en_utf8/repository_flickr.php
@@ -1,8 +1,13 @@
 <?php
-$string['apikey'] = 'API Key';
+$string['apikey'] = 'API key';
 $string['callbackurl'] = 'Callback URL';
-$string['callbackurltext'] = '<div>1. Get <a href=\"http://www.flickr.com/services/api/keys/\">Flickr API Key and Secret</a> for your Moodle site.<br/>2. Your callback URL is <strong>$a</strong><br/>3. Edit your <a href=\"http://www.flickr.com/services/api/keys/\">Flickr</a> key details and set the callback URL. </div>';
-$string['callbackwarning'] = '<div>1. Get <a href=\"http://www.flickr.com/services/api/keys/\">Flickr API Key and Secret</a> for your Moodle site.<br/>2. Your callback URL <strong>will be</strong> generated <strong>once</strong> you save these above information. Please click on Save button, then on <strong>Settings</strong> in order to check the generated callback URL.<br/>3. Edit your <a href=\"http://www.flickr.com/services/api/keys/\">Flickr</a> key details and set the callback URL.</div> ';
+$string['callbackurltext'] = '<ol>
+<li>Visit <a href=\"http://www.flickr.com/services/api/keys/\">Flickr API Keys</a> again.</li>
+<li>Make sure you set the callback URL for this Flickr key as <strong>$a</strong></li></ol>';
+$string['callbackwarning'] = '<ol>
+<li>Get a <a href=\"http://www.flickr.com/services/api/keys/\">Flickr API Key and Secret</a> from Flickr for this Moodle site.</li>
+<li>Enter those details here, then click Save and then Settings to come back to this page.  You will see that Moodle has generated a callback URL for you.</li>
+<li>Edit your <a href=\"http://www.flickr.com/services/api/keys/\">Flickr</a> key details again and set the callback URL.</li></ol>';
 $string['configplugin'] = 'Flickr configuration';
 $string['emailaddress'] = 'Email address';
 $string['invalidemail'] = 'Invalid email address for flickr';
diff --git a/lang/en_utf8/repository_flickr_public.php b/lang/en_utf8/repository_flickr_public.php
index ebeac50e554..3930f738604 100644
--- a/lang/en_utf8/repository_flickr_public.php
+++ b/lang/en_utf8/repository_flickr_public.php
@@ -1,7 +1,7 @@
 <?php // $Id$
-$string['apikey'] = 'API Key';
+$string['apikey'] = 'API key';
 $string['callbackurl'] = 'Callback URL';
-$string['configplugin'] = 'Flickr Public configuration';
+$string['configplugin'] = 'Flickr public configuration';
 $string['emailaddress'] = 'Email address';
 $string['fulltext'] = 'Full text';
 $string['information'] = '<div>Get <a href=\"http://www.flickr.com/services/api/keys/\">Flickr API Key</a> for your Moodle site. </div>';
@@ -10,7 +10,7 @@ $string['notitle'] = 'notitle';
 $string['nullphotolist'] = 'There are no photos in this account';
 $string['tag'] = 'Tag';
 $string['remember'] = 'Remember me';
-$string['repositoryname'] = 'Flickr Public';
+$string['repositoryname'] = 'Flickr public';
 $string['repositorydesc'] = 'Repository on flickr.com';
 $string['secret'] = 'Secret';
 $string['username'] = 'Flickr account email';
diff --git a/lang/en_utf8/repository_local.php b/lang/en_utf8/repository_local.php
index b94f06e04c3..00974423b85 100644
--- a/lang/en_utf8/repository_local.php
+++ b/lang/en_utf8/repository_local.php
@@ -1,6 +1,6 @@
 <?php // $Id$
 $string['configplugin'] = 'Configuration for local file repository';
-$string['repositoryname'] = 'Local Files';
+$string['repositoryname'] = 'Local files';
 $string['repositorydesc'] = 'Repository on the local Moodle server';
 $string['notitle'] = 'notitle';
 $string['remember'] = 'Remember me';
diff --git a/lang/en_utf8/repository_picasa.php b/lang/en_utf8/repository_picasa.php
index 57ae63166a8..f69f84481bc 100644
--- a/lang/en_utf8/repository_picasa.php
+++ b/lang/en_utf8/repository_picasa.php
@@ -1,3 +1,3 @@
 <?php
-$string['repositoryname'] = 'Picasa Web Album';
+$string['repositoryname'] = 'Picasa web album';
 ?>
diff --git a/lang/en_utf8/repository_remotemoodle.php b/lang/en_utf8/repository_remotemoodle.php
index eeeb6f6768e..26c937aedd3 100644
--- a/lang/en_utf8/repository_remotemoodle.php
+++ b/lang/en_utf8/repository_remotemoodle.php
@@ -1,16 +1,16 @@
 <?php // $Id$
 $string['configplugin'] = 'Configuration for remote Moodle file repository';
-$string['repositoryname'] = 'Remote Moodle Files';
-$string['repositorydesc'] = 'Repository on the remote Moodle server';
+$string['repositoryname'] = 'Remote Moodle site';
+$string['repositorydesc'] = 'Files on a remote Moodle server';
 $string['notitle'] = 'notitle';
 $string['peer'] = 'Peer';
 $string['remember'] = 'Remember me';
 $string['emptyfilelist'] = 'There are no files to show';
-$string['remoterep_name'] = 'Remote Moodle Repository';
-$string['remoterep_description'] = 'Allow the service to be discovered<br><br>';
+$string['remoterep_name'] = 'Remote Moodle site';
+$string['remoterep_description'] = 'Allow the service to be discovered';
 $string['connectionfailure'] = 'Failed to retrieve file listing - The host moodle has either a version older than 2.0, either its Moodle Remote Repository service hasn\'t been activated';
 $string['failtoretrievelist'] = 'List could not be retrieved or is empty';
 $string['usernotfound'] = 'The user $a is not registered into the remote Moodle';
 $string['usercannotaccess'] = 'You ($a) cannot access to this file';
-$string['nopeer'] = '<div>Please setup some <a href=\"http://docs.moodle.org/en/admin/mnet/peers#Peer_to_Peer_Network\">Moodle peers</a> for your Moodle site. </div>';
+$string['nopeer'] = 'Please setup some <a href=\"http://docs.moodle.org/en/admin/mnet/peers#Peer_to_Peer_Network\">Moodle peers</a> for your Moodle site.';
 $string['hostnotfound'] = 'Cannot find the remote Moodle into the database - contact your system administrator';
diff --git a/lang/en_utf8/repository_smb.php b/lang/en_utf8/repository_smb.php
index a119998d724..f430b309708 100644
--- a/lang/en_utf8/repository_smb.php
+++ b/lang/en_utf8/repository_smb.php
@@ -1,3 +1,3 @@
 <?php
-$string['repositoryname'] = 'SMB Repository';
+$string['repositoryname'] = 'Windows shares (SMB)';
 $string['smb_server'] = 'SMB Server';
diff --git a/lang/en_utf8/repository_youtube.php b/lang/en_utf8/repository_youtube.php
index 4ea9a98d36b..25ce0ac5ebc 100644
--- a/lang/en_utf8/repository_youtube.php
+++ b/lang/en_utf8/repository_youtube.php
@@ -1,3 +1,3 @@
 <?php
-$string['repositoryname'] = 'Youtube Repository';
-$string['search'] = 'Search';
+$string['repositoryname'] = 'Youtube videos';
+$string['search'] = 'Search videos';