Moved some strings!

diff --git a/blog/edit.html b/blog/edit.html
index 09f2c347903879cd322154a599dce66ea960fbc0..900a9a5f99c9fe7ad12b7f27133c7f78cc036855 100755 (executable)
--- a/blog/edit.html
+++ b/blog/edit.html
@@ -96,7 +96,7 @@
 <tr>
     <td>
     <?php
-    link_to_popup_window($CFG->wwwroot."//blog/tags.php",'popup',get_string('tagmanagement','blog'));
+    link_to_popup_window($CFG->wwwroot."/blog/tags.php",'popup',get_string('tagmanagement'));
     ?>
     </td>
 </tr>

diff --git a/blog/header.php b/blog/header.php
index 6afb2492d40f0ece92897166c1f6b859eb65b51b..72b4d655fe6893d1ef530497280e50e1b3c8ef50 100755 (executable)
--- a/blog/header.php
+++ b/blog/header.php
@@ -80,7 +80,7 @@ if (!isset($filtertype)) {
 /// group blogs - sitefullname -> course fullname ->group ->(?tag)
 /// user blogs - sitefullname -> (?coursefullname) -> participants -> blogs -> (?tag)
 $blogstring = get_string('blogs','blog');
-$tagstring = get_string('tag','blog');
+$tagstring = get_string('tag');
 
 switch ($filtertype) {
     case 'site':

diff --git a/blog/preferences.php b/blog/preferences.php
index 72012a6305c9215f35dc5a48c31adbf15ef62127..e7613137b7a4c0a0ace85df2080a20027eb81383 100755 (executable)
--- a/blog/preferences.php
+++ b/blog/preferences.php
@@ -39,7 +39,7 @@
     $site = get_site();
     $pageMeta = '<script language="javascript" type="text/javascript" src="'. $CFG->wwwroot .'/blog/blog.js"></script>' . "\n";
 
-    $strpreferences = get_string('preferences','blog');
+    $strpreferences = get_string('preferences');
 
     $navigation = '<a href="'. $bloginfo->get_blog_url() .'">'. $bloginfo->get_blog_title() . '</a> -> '. $strpreferences;
 

diff --git a/blog/tags.html b/blog/tags.html
index 78ae29c8f9c7ea47d151bf2df43e4e456ad7de29..611758c11541a3cb540e9479a6189400bc8f58fe 100755 (executable)
--- a/blog/tags.html
+++ b/blog/tags.html
@@ -1,5 +1,5 @@
 <?php
-print_heading(get_string('tagmanagement','blog'));
+print_heading(get_string('tagmanagement'));
 ?>
 
 <table>

diff --git a/lang/en_utf8/blog.php b/lang/en_utf8/blog.php
index dc1e0ce0a85f37c8512b2096329bb0b34a2732cb..cc9e686e562808ec6ae2cb8b948d42634c52b0e9 100755 (executable)
--- a/lang/en_utf8/blog.php
+++ b/lang/en_utf8/blog.php
@@ -1,33 +1,29 @@
-<?PHP 
+<?php  // $Id$
 
-$string['addnewentry'] = 'Add a New Entry';
-$string['addotags'] = 'Add Official Tags';
-$string['addptags'] = 'Add User Defined Tags';
-$string['blockmenutitle'] = 'Blog Menu';
+$string['addnewentry'] = 'Add a new entry';
+$string['addotags'] = 'Add official tags';
+$string['addptags'] = 'Add user-defined tags';
+$string['blockmenutitle'] = 'Blog menu';
 $string['blogs'] = 'Blogs';
-$string['blogpreferences'] = 'Blog Preferences';
-$string['entrybody'] = 'Blog Entry Body';
-$string['entrybodyonlydesc'] = 'Entry Description';
+$string['blogpreferences'] = 'Blog preferences';
+$string['entrybody'] = 'Blog entry body';
+$string['entrybodyonlydesc'] = 'Entry description';
 $string['entryerrornotyours'] = 'This entry is not yours';
-$string['entrytitle'] = 'Entry Title';
-$string['entryupdated'] = 'Blog Entry Updated';
+$string['entrytitle'] = 'Entry title';
+$string['entryupdated'] = 'Blog entry updated';
 $string['noguestpost'] = 'Guest can not post blogs!';
 $string['notallowedtoedit'] = 'You are not allowed to edit this entry';
-$string['otags'] = 'Official Tags';
-$string['pagesize'] = 'Number of Blog Entries per Page';
-$string['preferences'] = 'Preferences';
-$string['ptags'] = 'User Defined Tags';
-$string['publishto'] = 'Publish To';
-$string['publishtonoone'] = 'Draft';
-$string['publishtosite'] = 'Publish To Site';
-$string['publishtoworld'] = 'Publish To World';
-$string['settingsupdatederror'] = 'An error has occured, blog preference setting could not be updated';
-$string['tag'] = 'Tag';
-$string['tagmanagement'] = 'Tags Management';
-$string['tags'] = 'Tags: ';
-$string['updateentrywithid'] = 'Updating Entry';
-$string['viewcourseentries'] = 'View My Entries';
-$string['viewmyentries'] = 'View My Entries';
-$string['viewsiteentries'] = 'View Site Entries';
+$string['otags'] = 'Official tags';
+$string['pagesize'] = 'Number of blog entries per Page';
+$string['ptags'] = 'User defined tags';
+$string['publishto'] = 'Publish to';
+$string['publishtonoone'] = 'Yourself (draft)';
+$string['publishtosite'] = 'Anyone on this site';
+$string['publishtoworld'] = 'Anyone in the world';
+$string['settingsupdatederror'] = 'An error has occurred, blog preference setting could not be updated';
+$string['updateentrywithid'] = 'Updating entry';
+$string['viewcourseentries'] = 'View my entries';
+$string['viewmyentries'] = 'View my entries';
+$string['viewsiteentries'] = 'View site entries';
 
 ?>

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index ca675385262b192da5cf04253ae2626e06e4e0b7..e4f61e9cc8e80ed3ace57b73f94af93d8ed8f4c9 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -998,6 +998,7 @@ $string['potentialadmins'] = 'Potential admins';
 $string['potentialcreators'] = 'Potential course creators';
 $string['potentialstudents'] = 'Potential students';
 $string['potentialteachers'] = 'Potential teachers';
+$string['preferences'] = 'Preferences';
 $string['preferredlanguage'] = 'Preferred language';
 $string['preferredtheme'] = 'Preferred theme';
 $string['preview'] = 'Preview';
@@ -1222,6 +1223,9 @@ $string['success'] = 'Success';
 $string['summary'] = 'Summary';
 $string['summaryof'] = 'Summary of $a';
 $string['supplyinfo'] = 'Please supply some information about yourself';
+$string['tag'] = 'Tag';
+$string['tagmanagement'] = 'Tags management';
+$string['tags'] = 'Tags';
 $string['teacheronly'] = 'for the $a only';
 $string['teacherroles'] = '$a roles';
 $string['teachers'] = 'Teachers';