[LON-CAPA-cvs] cvs: loncom /homework structuretags.pm /interface loncommon.pm lonprintout.pm /localize/localize de.pm zh.pm
bisitz
bisitz@source.lon-capa.org
Wed, 17 Jun 2009 15:27:27 -0000
This is a MIME encoded message
--bisitz1245252447
Content-Type: text/plain
bisitz Wed Jun 17 15:27:27 2009 EDT
Modified files:
/loncom/interface loncommon.pm lonprintout.pm
/loncom/homework structuretags.pm
/loncom/localize/localize de.pm zh.pm
Log:
- Removed from translation phrases
- Consistent Wording
--bisitz1245252447
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20090617152727.txt"
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.844 loncom/interface/loncommon.pm:1.845
--- loncom/interface/loncommon.pm:1.844 Tue Jun 16 15:17:12 2009
+++ loncom/interface/loncommon.pm Wed Jun 17 15:27:14 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.844 2009/06/16 15:17:12 bisitz Exp $
+# $Id: loncommon.pm,v 1.845 2009/06/17 15:27:14 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -8523,7 +8523,7 @@
$r->print(&mt('Samples').'<br />'.&start_data_table().
&start_data_table_header_row());
foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
- $r->print('<th>'.&mt('Column [_1]',($sample+1)).'</th>'); }
+ $r->print('<th>'.&mt('Column [_1]',($sample+1)).'</th>'); }
$r->print(&end_data_table_header_row());
foreach my $hash (@$samples) {
$r->print(&start_data_table_row());
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.554 loncom/interface/lonprintout.pm:1.555
--- loncom/interface/lonprintout.pm:1.554 Tue Jun 2 12:20:14 2009
+++ loncom/interface/lonprintout.pm Wed Jun 17 15:27:14 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.554 2009/06/02 12:20:14 bisitz Exp $
+# $Id: lonprintout.pm,v 1.555 2009/06/17 15:27:14 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3352,7 +3352,7 @@
$paramHash->{'multichoice'} = "true";
$paramHash->{'allowempty'} = "true";
$paramHash->{'variable'} = "showallfoils";
- $paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];
+ $paramHash->{'CHOICES'} = [ [&mt('Show All Foils'), "1"] ];
Apache::lonhelper::choices->new();
&addMessage(&Apache::lonhtmlcommon::row_closure(1));
}
@@ -3389,7 +3389,7 @@
.qq|<a href="javascript:openbrowser('helpform','style_file_forminput','sty')">|
.$selectfiletext.'</a>'
.&Apache::lonhtmlcommon::row_closure()
- .&Apache::lonhtmlcommon::row_title(&mt('Show all foils'))
+ .&Apache::lonhtmlcommon::row_title(&mt('Show All Foils'))
.'</message>
<choices allowempty="1" multichoice="true" variable="showallfoils">
<choice computer="1"> </choice>
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.451 loncom/homework/structuretags.pm:1.452
--- loncom/homework/structuretags.pm:1.451 Thu Jun 11 16:48:28 2009
+++ loncom/homework/structuretags.pm Wed Jun 17 15:27:20 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.451 2009/06/11 16:48:28 bisitz Exp $
+# $Id: structuretags.pm,v 1.452 2009/06/17 15:27:20 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -435,12 +435,14 @@
my $show_all_foils_text =
($Apache::lonhomework::parsing_a_task) ?
- &mt(' Show All Instances')
- : &mt(' Show All Foils');
+ &mt('Show All Instances')
+ : &mt('Show All Foils');
- my $show_all= '<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils"';
+ my $show_all= '<span class="LC_nobreak"><label for="showallfoils">'
+ .'<input type="checkbox" name="showallfoils"';
if (defined($env{'form.showallfoils'})) { $show_all.=' checked="checked"'; }
- $show_all.= ' />'.$show_all_foils_text.'</label></span>';
+ $show_all.= ' /> '.$show_all_foils_text
+ .'</label></span>';
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.310 loncom/localize/localize/de.pm:1.311
--- loncom/localize/localize/de.pm:1.310 Mon Jun 15 11:18:17 2009
+++ loncom/localize/localize/de.pm Wed Jun 17 15:27:26 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.310 2009/06/15 11:18:17 bisitz Exp $
+# $Id: de.pm,v 1.311 2009/06/17 15:27:26 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2673,9 +2673,6 @@
'Column'
=> 'Spalte',
- 'Column [_1]'
-=> 'Spalte [_1]',
-
'Column [_1]'
=> 'Spalte [_1]',
@@ -2961,8 +2958,11 @@
'Calculate answers'
=> 'Berechne Antworten',
- ' Show All Foils'
-=> ' Zeige alle Auswahlmöglichkeiten',
+ 'Show All Foils'
+=> 'Alle Auswahlmöglichkeiten anzeigen',
+
+ 'Show All Instances'
+=> 'Alle Instanzen anzeigen',
'1 out of N multiple choice (radio button)'
=> '1-aus-N-Auswahl (radio button)',
@@ -5150,12 +5150,6 @@
'[_1] with value [_2]'
=> '[_1] mit dem Wert [_2]',
- '[_1]prev[_2] [_3]reload[_4] [_5]next[_6]'
-=> '[_1]zurück[_2] [_3]neu laden[_4] [_5]weiter[_6]',
-
- '[_1]prev[_2] [_3]reload[_4] next'
-=> '[_1]zurück[_2] [_3]neu laden[_4] weiter',
-
'[_2] seconds'
=> '[_2] seconds',
@@ -5222,9 +5216,6 @@
'opening date'
=> 'Startdatum',
- 'prev [_3]reload[_4] [_5]next[_6]'
-=> 'zurück [_3]neu laden[_4] [_5]weiter[_6]',
-
'problem weight'
=> 'Gewichtung der Aufgabe',
@@ -5840,9 +5831,6 @@
'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
=> 'Hier können Sie festlegen, wie Diskussionsbeiträge, Nachrichten in Diskussionsforen und einzelne Ressourcen in allen Ihren Kursen angezeigt werden sollen.',
- 'Show all foils'
-=> 'Alle Auswahlmöglichkeiten anzeigen',
-
'Source Distribution'
=> 'Zugriffsrechte auf Quellcode',
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.61 loncom/localize/localize/zh.pm:1.62
--- loncom/localize/localize/zh.pm:1.61 Wed Jun 17 10:41:41 2009
+++ loncom/localize/localize/zh.pm Wed Jun 17 15:27:26 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Chinese Simplified Localization Lexicon
#
-# $Id: zh.pm,v 1.61 2009/06/17 10:41:41 bisitz Exp $
+# $Id: zh.pm,v 1.62 2009/06/17 15:27:26 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2691,9 +2691,6 @@
'Column'
=> 'Spalte',
- 'Column [_1]'
-=> 'Spalte [_1]',
-
'Column [_1]'
=> 'Spalte [_1]',
@@ -2986,8 +2983,11 @@
'Calculate answers'
=> 'Berechne Antworten',
- ' Show All Foils'
-=> ' 显示 全部 选项',
+ 'Show All Foils'
+=> '显示全部选项', # ?: '显示全部选项',
+
+ 'Show All Instances'
+=> 'Alle Instanzen anzeigen',
'1 out of N multiple choice (radio button)'
=> '单选',
@@ -5191,12 +5191,6 @@
'[_1] with value [_2]'
=> '[_1] mit dem Wert [_2]',
- '[_1]prev[_2] [_3]reload[_4] [_5]next[_6]'
-=> '[_1]zurück[_2] [_3]neu laden[_4] [_5]weiter[_6]',
-
- '[_1]prev[_2] [_3]reload[_4] next'
-=> '[_1]zurück[_2] [_3]neu laden[_4] weiter',
-
'[_2] seconds'
=> '[_2] seconds',
@@ -5263,9 +5257,6 @@
'opening date'
=> '开始日期',
- 'prev [_3]reload[_4] [_5]next[_6]'
-=> '返回 [_3]刷新[_4] [_5]下一步[_6]',
-
'problem weight'
=> '问题难度',
@@ -5881,9 +5872,6 @@
# 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.'
#=> '在这里，您可以设置您的讨论是否显示在所有的课程的布告栏和个人资源里。',
- 'Show all foils'
-=> '显示所有的选择',
-
'Source Distribution'
=> '源代码的访问权限',
@@ -13660,32 +13648,9 @@
'You likely need to explicitly allow access to all possible dependencies using the [_1]-tag.'
=> 'Sie müssen explizit Zugriff auf alle möglichen Abhängigkeiten erlauben, indem Sie das [_1]-Tag verwenden.',
-
- 'Select All'
-=> 'Alle auswählen',
-
- 'Select Common Only'
-=> 'Nur Gebräuchliche auswählen',
-
'Add Selection for:'
=> 'Auswahl hinzufügen für:',
- 'Problem Dates'
-=> 'Aufgaben-Zeitfenster',
-
- 'Content Dates'
-=> 'Inhalts-Zeitfenster',
-
- 'Discussion Settings'
-=> 'Diskussionen',
-
- 'Part Parameters'
-=> '部分；参数',
-
- 'Unselect All'
-=> 'Auswahl komplett aufheben',
-
-
# Resource Parameters - Start
'Problem Opening Date (opendate)'
--bisitz1245252447--