[LON-CAPA-cvs] cvs: loncom /auth rolesplain.tab /interface lonfeedback.pm lonmsgdisplay.pm lonpreferences.pm lonrss.pm lonsearchcat.pm lonwhatsnew.pm
schafran
schafran@source.lon-capa.org
Tue, 10 Feb 2009 09:30:23 -0000
This is a MIME encoded message
--schafran1234258223
Content-Type: text/plain
schafran Tue Feb 10 09:30:23 2009 EDT
Modified files:
/loncom/interface lonmsgdisplay.pm lonpreferences.pm lonrss.pm
lonsearchcat.pm lonwhatsnew.pm lonfeedback.pm
/loncom/auth rolesplain.tab
Log:
consistent wording
--schafran1234258223
Content-Type: text/plain
Content-Disposition: attachment; filename="schafran-20090210093023.txt"
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.112 loncom/interface/lonmsgdisplay.pm:1.113
--- loncom/interface/lonmsgdisplay.pm:1.112 Wed Feb 4 22:52:00 2009
+++ loncom/interface/lonmsgdisplay.pm Tue Feb 10 09:30:16 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.112 2009/02/04 22:52:00 weissno Exp $
+# $Id: lonmsgdisplay.pm,v 1.113 2009/02/10 09:30:16 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3483,7 +3483,7 @@
my $showfolder = $env{'form.newfolder'};
my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
if ($makeresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" created.',$showfolder).'<br />');
+ $r->print(&mt('Folder "[_1]" created.',$showfolder).'<br />');
} else {
$r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
$warning);
@@ -3498,7 +3498,7 @@
my $showfolder = '';
my $delresult = &deletefolder($folder);
if ($delresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');
+ $r->print(&mt('Folder "[_1]" deleted.',$folder).'<br />');
$env{'form.folder'} = '';
} else {
$r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
@@ -3511,7 +3511,7 @@
my $showfolder = $env{'form.renamed'};
my $renresult = &renamefolder($folder);
if ($renresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).'<br />');
+ $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).'<br />');
} else {
$r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
$showfolder = $folder;
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.134 loncom/interface/lonpreferences.pm:1.135
--- loncom/interface/lonpreferences.pm:1.134 Thu Jan 15 18:31:11 2009
+++ loncom/interface/lonpreferences.pm Tue Feb 10 09:30:16 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.134 2009/01/15 18:31:11 bisitz Exp $
+# $Id: lonpreferences.pm,v 1.135 2009/02/10 09:30:16 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1601,9 +1601,9 @@
'pref' => 'Display Preference',
'curr' => 'Current setting ',
'actn' => 'Action',
- 'sdpf' => 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.',
+ 'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.',
'prca' => 'Preferences can be set that determine',
- 'whpo' => 'Which posts are displayed when you display a bulletin board or resource, and',
+ 'whpo' => 'Which posts are displayed when you display a discussion board or resource, and',
'unwh' => 'Under what circumstances posts are identfied as "New"',
'allposts' => 'All posts',
'unread' => 'New posts only',
@@ -1666,7 +1666,7 @@
$r->print(<<"END");
<br />
<br />
-<input type="submit" name="sub" value="Save Changes" />
+<input type="submit" name="sub" value="Save" />
<br />
<br />
Note: $lt{'thde'}
@@ -1898,7 +1898,7 @@
permission => 'F',
#help => 'Change_Discussion_Display',
icon => 'mail-message-new.png',
- linktitle => 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.'
+ linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
},
]
},
Index: loncom/interface/lonrss.pm
diff -u loncom/interface/lonrss.pm:1.44 loncom/interface/lonrss.pm:1.45
--- loncom/interface/lonrss.pm:1.44 Mon Dec 22 14:39:23 2008
+++ loncom/interface/lonrss.pm Tue Feb 10 09:30:16 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# RSS Feeder
#
-# $Id: lonrss.pm,v 1.44 2008/12/22 14:39:23 raeburn Exp $
+# $Id: lonrss.pm,v 1.45 2009/02/10 09:30:16 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -391,8 +391,8 @@
# Add a new feed
if (($html) && ($edit)) {
$r->print('<form method="post" name="makenewfeed">');
- $r->print(&mt('Name for New Feed').": <input type='text' size='40' name='namenewblog' />");
- $r->print('<input type="submit" value="'.&mt('Start a New Feed').'" />');
+ $r->print(&mt('Name').": <input type='text' size='40' name='namenewblog' />");
+ $r->print('<input type="submit" value="'.&mt('New Feed').'" />');
$r->print('</form>');
}
if ($displayfeedname) { # this is an existing feed
@@ -509,7 +509,7 @@
'private' => 'private',
'hidden' => 'hidden',
'delete' => 'delete',
- 'store' => 'Save changes',
+ 'store' => 'Select',
'title' => 'Title',
'link' => 'Link',
'description' => 'Description',
@@ -589,7 +589,7 @@
if ($html) {
$r->print('</ul>');
if ($edit) {
- $r->print('<input type="hidden" name="newid" value="'.$newid.'"/><input type="submit" value="'.&mt('Save Marked Changes').'" />'.
+ $r->print('<input type="hidden" name="newid" value="'.$newid.'"/><input type="submit" value="'.&mt('Save Selected').'" />'.
($displayoption eq 'hidden'?'<input type="submit" name="advertisethisblog" value="'.&mt('Advertise this Feed').'" />':
'<input type="submit" name="hidethisblog" value="'.&mt('Hide this Feed').'" />'));
}
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.303 loncom/interface/lonsearchcat.pm:1.304
--- loncom/interface/lonsearchcat.pm:1.303 Fri Dec 19 23:24:49 2008
+++ loncom/interface/lonsearchcat.pm Tue Feb 10 09:30:16 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.303 2008/12/19 23:24:49 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.304 2009/02/10 09:30:16 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -566,7 +566,7 @@
if ($url =~m#^adm/wrapper/adm/.*/bulletinboard$#) {
$url =~s#^adm/wrapper##;
}
- $disctype = &mt('bulletin board');
+ $disctype = &mt('discussion board');
} else {
$url = '/res/'.$url;
}
@@ -704,7 +704,7 @@
'note' => 'Enter terms or phrases, then press "Search" below',
'use' => 'use related words',
'full' =>'fulltext search (time consuming)',
- 'disc' => 'search discussion postings (resources and bulletin boards)',
+ 'disc' => 'search discussion postings (resources and discussion boards)',
);
$scrout.=(<<ENDCOURSESEARCH);
<form name="loncapa_search" method="post" action="/adm/searchcat">
Index: loncom/interface/lonwhatsnew.pm
diff -u loncom/interface/lonwhatsnew.pm:1.85 loncom/interface/lonwhatsnew.pm:1.86
--- loncom/interface/lonwhatsnew.pm:1.85 Wed Feb 4 13:03:44 2009
+++ loncom/interface/lonwhatsnew.pm Tue Feb 10 09:30:16 2009
@@ -1,5 +1,5 @@
#
-# $Id: lonwhatsnew.pm,v 1.85 2009/02/04 13:03:44 schafran Exp $
+# $Id: lonwhatsnew.pm,v 1.86 2009/02/10 09:30:16 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -681,7 +681,7 @@
}
</script>');
$r->print('<br />'
- .&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.')
+ .&mt('Choose whether or not to display a count of the number of new posts for each resource or discussion board which has unread posts.')
.'<br />'
.&mt("This can increase the time taken to gather data for the '<i>What's New?</i>' page by a few seconds.")
.' '
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.263 loncom/interface/lonfeedback.pm:1.264
--- loncom/interface/lonfeedback.pm:1.263 Fri Jan 23 13:29:15 2009
+++ loncom/interface/lonfeedback.pm Tue Feb 10 09:30:16 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.263 2009/01/23 13:29:15 bisitz Exp $
+# $Id: lonfeedback.pm,v 1.264 2009/02/10 09:30:16 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1795,7 +1795,7 @@
'actn' => 'Action',
'deff' => 'Default for all discussions',
'prca' => 'Preferences can be set for this discussion that determine ....',
- 'whpo' => 'Which posts are displayed when you display this bulletin board or resource, and',
+ 'whpo' => 'Which posts are displayed when you display this discussion board or resource, and',
'unwh' => 'Under what circumstances posts are identified as "NEW", and',
'wipa' => 'Whether individual posts can be marked as read/unread',
'allposts' => 'All posts',
@@ -1960,7 +1960,7 @@
<td>$lt{$disctogg}</td>
<td><label><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
END
- my $save = &mt('Save Changes');
+ my $save = &mt('Save');
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
$r->print(<<END);
@@ -3444,7 +3444,7 @@
my %lt = &Apache::lonlocal::texthash(
'mnpa' => 'Marked "New" posts as read in a total of',
'robb' => 'resources/bulletin boards.',
- 'twnp' => 'There are currently no resources or bulletin boards with unread discussion postings.'
+ 'twnp' => 'There are currently no resources or discussion boards with unread discussion postings.'
);
foreach my $res (@resources) {
my $ressymb=$res;
Index: loncom/auth/rolesplain.tab
diff -u loncom/auth/rolesplain.tab:1.32 loncom/auth/rolesplain.tab:1.33
--- loncom/auth/rolesplain.tab:1.32 Mon Dec 15 00:58:54 2008
+++ loncom/auth/rolesplain.tab Tue Feb 10 09:30:22 2009
@@ -61,13 +61,13 @@
gan:Generate anonymous statistics
dcm:Disable all communication among students
evb:Evade communication blocking
-sma:Send internal email
-srm:Send broadcast and receipt-required email
+sma:Send internal message
+srm:Send broadcast and receipt-required message
dff:Create User Notes, Display all User's Notes, Face-to-Face, Critical Messages, Broadcast Messages
mdc:Edit course contents
pch:Post discussion on course resources
-plc:Post to live chatrooms
-dch:Delete messages from bulletin boards
+plc:Post to chatrooms
+dch:Delete messages from discussion boards
pac:Post anonymously
rin:Get identity behind anonymous postings
mdg:Create, modify and delete course groups
--schafran1234258223--