[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm /homework grades.pm lonhomework.pm /localize/localize ar.pm de.pm es.pm fa.pm fr.pm ja.pm pt.pm ru.pm tr.pm zh.pm

Wed Jan 15 09:46:32 EST 2014

bisitz		Wed Jan 15 14:46:32 2014 EDT

  Modified files:              
    /loncom/auth	lonroles.pm 
    /loncom/homework	grades.pm lonhomework.pm 
    /loncom/localize/localize	ar.pm de.pm es.pm fa.pm fr.pm ja.pm pt.pm 
                             	ru.pm tr.pm zh.pm 
  Log:
  Improve internationalization:
  - Proper compilation of output string, then pass to translation
  - Re-use existing phrases
  
  
  
-------------- next part --------------
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.294 loncom/auth/lonroles.pm:1.295

--- loncom/auth/lonroles.pm:1.294	Wed Jan  8 17:18:15 2014
+++ loncom/auth/lonroles.pm	Wed Jan 15 14:46:21 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.294 2014/01/08 17:18:15 bisitz Exp $
+# $Id: lonroles.pm,v 1.295 2014/01/15 14:46:21 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -889,11 +889,13 @@
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
             $r->print(
                 '<p>'
-               .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
-                   .' to view all [_4] LON-CAPA courses and communities.'
+               .&mt('[_1]Visit the [_2]Course/Community Catalog[_3][_4]'
+                   .' to view all [_5] LON-CAPA courses and communities.'
                    ,'<b>'
                    ,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
-                   ,'</a></b>',$domdesc)
+                   ,'</a>'
+                   ,'</b>'
+                   ,'"'.$domdesc.'"')
                .'<br />'
                .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'
                    .' you may be able to enroll if self-enrollment is permitted.'
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.711 loncom/homework/grades.pm:1.712
--- loncom/homework/grades.pm:1.711	Tue Jan 14 17:49:30 2014
+++ loncom/homework/grades.pm	Wed Jan 15 14:46:26 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.711 2014/01/14 17:49:30 bisitz Exp $
+# $Id: grades.pm,v 1.712 2014/01/15 14:46:26 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1942,9 +1942,12 @@
     if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }
 
     if (!&canview($usec)) {
-	$request->print('<span class="LC_warning">Unable to view requested student.('.
-			$uname.':'.$udom.' in section '.$usec.' in course id '.
-			$env{'request.course.id'}.')</span>');
+        $request->print(
+            '<span class="LC_warning">'.
+            &mt('Unable to view requested student.'.
+            ' '.&mt('([_1] in section [_2] in course id [_3])',
+                        $uname.':'.$udom,$usec,$env{'request.course.id'}).
+            '</span>');
 	return;
     }
 
@@ -2546,9 +2549,12 @@
     my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});
     my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
     if (!&canview($usec)) {
-        $request->print('<span class="LC_warning">Unable to view previous version for requested student.('.
-                        $uname.':'.$udom.' in section '.$usec.' in course id '.
-                        $env{'request.course.id'}.')</span>');
+        $request->print(
+            '<span class="LC_warning">'.
+            &mt('Unable to view previous version for requested student.'.
+            ' '.&mt('([_1] in section [_2] in course id [_3])',
+                    $uname.':'.$udom,$usec,$env{'request.course.id'}).
+            '</span>');
         return;
     }
     my $mode = 'both';
@@ -4613,8 +4619,12 @@
     &Apache::lonnet::clear_EXT_cache_status();
 
     if (!&canview($usec)) {
-	$request->print('<span class="LC_warning">'.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'</span>');
-	return;
+        $request->print(
+            '<span class="LC_warning">'.
+            &mt('Unable to view requested student. ([_1])',
+                    $env{'form.student'}).
+            '</span>');
+        return;
     }
     my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>';
     $result.='<h3> '.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)).
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.342 loncom/homework/lonhomework.pm:1.343
--- loncom/homework/lonhomework.pm:1.342	Fri Jan 10 17:51:10 2014
+++ loncom/homework/lonhomework.pm	Wed Jan 15 14:46:27 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.342 2014/01/10 17:51:10 bisitz Exp $
+# $Id: lonhomework.pm,v 1.343 2014/01/15 14:46:27 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -451,13 +451,14 @@
 	    $datemsg=$date;
 	} elsif ($type eq 'opendate') {
 	    $status='CLOSED';
-	    $datemsg = &mt("will open on")." $date";
+	    $datemsg = &mt('will open on [_1]',$date);
 	} elsif ($type eq 'duedate') {
 	    $status='CAN_ANSWER';
-	    $datemsg = &mt("is due at")." $date";
+	    $datemsg = &mt('is due at [_1]',$date);
 	} elsif ($type eq 'answerdate') {
 	    $status='CLOSED';
-	    $datemsg = &mt("was due on")." $lastdate".&mt(", and answers will be available on")." $date";
+	    $datemsg = &mt('was due on [_1], and answers will be available on [_2]',
+                               $lastdate,$date);
 	}
     }
     if ($status eq 'CAN_ANSWER' ||
Index: loncom/localize/localize/ar.pm
diff -u loncom/localize/localize/ar.pm:1.26 loncom/localize/localize/ar.pm:1.27
--- loncom/localize/localize/ar.pm:1.26	Tue Jan 14 18:54:59 2014
+++ loncom/localize/localize/ar.pm	Wed Jan 15 14:46:30 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Arabic Localization Lexicon
 #
-# $Id: ar.pm,v 1.26 2014/01/14 18:54:59 bisitz Exp $
+# $Id: ar.pm,v 1.27 2014/01/15 14:46:30 bisitz Exp $
 #
 # Copyright i-Learning Limited Partnership Company
 #
@@ -440,9 +440,6 @@
    'Goodbye'
 => 'ÙÙŠ Ø£Ù…Ø§Ù† Ø§Ù„Ù„Ù‡',
 
-   ', and answers will be available on'
-=> 'Ùˆ Ø§Ù„Ø£Ø¬ÙˆØ¨Ø© Ø³ØªÙƒÙˆÙ† Ù…ØªØ§ØØ© ÙÙŠ',
-
    ', or the next time you log in.'
 => ' Ø£Ùˆ ØÙŠÙ†Ù…Ø§ ØªØªØµÙ„ ÙÙŠ Ø§Ù„Ù…Ø±Ø© Ø§Ù„ØªØ§Ù„ÙŠØ©',
 
@@ -812,8 +809,8 @@
    'is closed but you are allowed to view it'
 => 'ÙŠÙØºÙ„Ù‚ Ùˆ Ù„ÙƒÙ† ØªØ³ØªØ·ÙŠØ¹ Ø£Ù† ØªØ´Ø§Ù‡Ø¯Ù‡',
 
-   'is due at'
-=> 'Ø§Ù„Ù…Ù‚Ø±Ø± ÙÙŠ',
+   'is due at [_1]'
+=> 'Ø§Ù„Ù…Ù‚Ø±Ø± ÙÙŠ [_1]',
 
    'is in under construction'
 => 'ÙÙŠ Ø·ÙˆØ± Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯',
@@ -860,11 +857,11 @@
    'undo'
 => 'Ø¥Ù„ØºØ§Ø¡',
 
-   'was due on'
-=> 'ÙƒØ§Ù† Ù…Ù† Ø§Ù„Ù…Ù‚Ø±Ø± ÙÙŠ',
+   'was due on [_1], and answers will be available on [_2]'
+=> 'ÙƒØ§Ù† Ù…Ù† Ø§Ù„Ù…Ù‚Ø±Ø± ÙÙŠi [_1] ï» ïºï»¸ïºŸï»®ïº‘ïº“ ïº²ïº˜ï»›ï»®ï»§ ï»¢ïº—ïºŽïº£ïº“ ï»’ï»³ [_2]',
 
-   'will open on'
-=> 'Ø³ÙŠÙÙØªØ ÙÙŠ',
+   'will open on [_1]'
+=> 'Ø³ÙŠÙÙØªØ ÙÙŠ [_1]',
 
    ', is reserved internally by LON-CAPA.'
 => ',  LON-CAPA ÙŠØªÙ… Ø®Ø²Ù†Ù‡ Ø¯Ø§Ø®Ù„ÙŠØ§Ù‹ Ø¨ÙˆØ§Ø³Ø·Ø© ',
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.577 loncom/localize/localize/de.pm:1.578
--- loncom/localize/localize/de.pm:1.577	Tue Jan 14 18:54:59 2014
+++ loncom/localize/localize/de.pm	Wed Jan 15 14:46:30 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.577 2014/01/14 18:54:59 bisitz Exp $
+# $Id: de.pm,v 1.578 2014/01/15 14:46:30 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -927,19 +927,19 @@
 => 'Nicht anzeigen',
 
    "an unknown date"
-=> ': unbekannter Zeitpunkt', # !
+=> ': unbekannter Zeitpunkt', # ! -> lonhomework.pm
 
    "an indeterminate date"
-=> 'unbestimmter Zeitpunkt',
+=> ': unbestimmter Zeitpunkt', # ! -> lonhomework.pm
 
-   "will open on"
-=> "wird verfÃ¼gbar sein am",
+   'will open on [_1]'
+=> 'wird am [_1] verfÃ¼gbar sein',
 
-   "is due at"
-=> "ist fÃ¤llig am",
+   'is due at [_1]'
+=> 'ist am [_1] fÃ¤llig',
 
-   "was due on"
-=> "war fÃ¤llig am",
+   'was due on [_1], and answers will be available on [_2]'
+=> 'war am [_1] fÃ¤llig und Antworten werden am [_2] verfÃ¼gbar sein',
 
    'is closed but you are allowed to view it'
 => "ist geschlossen, kann aber von Ihnen betrachtet werden",
@@ -1013,9 +1013,6 @@
    "may open later."
 => 'kÃ¶nnte zu einem spÃ¤teren Zeitpunkt verfÃ¼gbar werden.',
 
-   ', and answers will be available on'
-=> ', Antworten werden verfÃ¼gbar sein am',
-
    "Select a"
 => "WÃ¤hlen Sie",
 
@@ -11069,6 +11066,9 @@
    'Your submission has been recorded.'
 => 'Ihre Antwort wurde gespeichert.',
 
+   'Draft Copy'
+=> 'Entwurf',
+
    'A draft copy has been saved.'
 => 'Ihr Entwurf wurde gespeichert.',
 
@@ -13030,9 +13030,6 @@
    'Resource space'
 => 'Ressourcenbereich',
 
-   'Authoring Space'
-=> 'Autorenbereich',
-
    'No such directory: [_1]'
 => 'Verzeichnis existiert nicht: [_1]',
 
@@ -17574,8 +17571,8 @@
    'The scores were changed for [quant,_1,problem].'
 => 'FÃ¼r [quant,_1,Aufgabe,Aufgaben] wurden die Punkte geÃ¤ndert.',
 
-   '[_1]Visit the [_2]Course/Community Catalog[_3] to view all [_4] LON-CAPA courses and communities.' # _1: <b>, _2: <a>, _3: </a> </b>, _4: domain
-=> '[_1]Besuchen Sie die [_2]Kurs-/Community-Ãœbersicht[_3], um alle LON-CAPA-Kurse und -Communitys der DomÃ¤ne [_4] zu betrachten.',
+   '[_1]Visit the [_2]Course/Community Catalog[_3][_4] to view all [_5] LON-CAPA courses and communities.' # _1: <b>, _2: <a>, _3: </a>, _4: </b>, _5: domain desc.
+=> '[_1]Besuchen Sie die [_2]Kurs-/Community-Ãœbersicht[_3][_4], um alle LON-CAPA-Kurse und -Communitys der Institution [_5] zu betrachten.',
 
    'If a course or community is [_1]not[_2] in your list of current courses and communities below, you may be able to enroll if self-enrollment is permitted.'
 => 'Falls ein Kurs in der folgenden Liste Ihrer derzeitigen Kurse [_1]nicht[_2] angezeigt wird, kÃ¶nnen Sie sich in der KursÃ¼bersicht in diesen Kurs selbst eintragen, sofern die Selbsteintragung fÃ¼r diesen Kurs aktiviert ist.',
@@ -22989,10 +22986,10 @@
 => 'Zeitpunkt, ab dem Studierende anfangen kÃ¶nnen zu reservieren:   ',
 
    'Were open'
-=> 'waren verfÃ¼gbar',
+=> 'Waren verfÃ¼gbar',
 
    'Were open last week'
-=> 'waren letzte Woche verfÃ¼gbar',
+=> 'Waren letzte Woche verfÃ¼gbar',
 
    'Will be next available:'
 => 'NÃ¤chste VerfÃ¼gbarkeit:',
@@ -24029,6 +24026,15 @@
    'Unable to view requested student. ([_1])'
 => 'Der/die angeforderte Student/in kann nicht betrachtet werden. ([_1])',
 
+   'Unable to view requested student.'
+=> 'Der/die angeforderte Student/in kann nicht betrachtet werden.',
+
+   'Unable to view previous version for requested student.'
+=> 'Die vorherige Version fÃ¼r den/die angeforderte/n Student/in kann nicht betrachtet werden.',
+
+   '([_1] in section [_2] in course id [_3])'
+=> '([_1] in der Sektion [_2] im Kurs mit der ID [_3])',
+
    'Validation process complete.'
 => 'Validierungsvorgang abgeschlossen',
 
Index: loncom/localize/localize/es.pm
diff -u loncom/localize/localize/es.pm:1.82 loncom/localize/localize/es.pm:1.83
--- loncom/localize/localize/es.pm:1.82	Tue Jan 14 18:55:00 2014
+++ loncom/localize/localize/es.pm	Wed Jan 15 14:46:30 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Spanish Localization Lexicon
 #
-# $Id: es.pm,v 1.82 2014/01/14 18:55:00 bisitz Exp $
+# $Id: es.pm,v 1.83 2014/01/15 14:46:30 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -622,14 +622,14 @@
    "an indeterminate date"
 => 'fecha no determinada',
 
-   "will open on"
-=> "se abrirÃ¡ en",
+   'will open on [_1]'
+=> 'se abrirÃ¡ en [_1]',
 
-   "is due at"
-=> "se harÃ¡ el",
+   'is due at [_1]'
+=> 'se harÃ¡ el [_1]',
 
-   "was due on"
-=> "fue cerrado el",
+   'was due on [_1], and answers will be available on [_2]'
+=> 'fue cerrado el [_1], y las respuestas estarÃ¡n disponibles en [_2]',
 
    'is closed but you are allowed to view it'
 => "estÃ¡ cerrado, pero tiene permisos para verlo",
@@ -694,9 +694,6 @@
    "may open later."
 => 'puede abrir mÃ¡s tarde.',
 
-   ', and answers will be available on'
-=> ', y las respuestas estarÃ¡n disponibles en',
-
    "Select a"
 => "Seleccione un",
 
@@ -15572,8 +15569,8 @@
    'The scores were changed for [quant,_1,problem].'
 => 'La puntuaciÃ³n a cambiado para [quant,_1,problema,problemas].',
 
-   '[_1]Visit the [_2]Course/Community Catalog[_3] to view all [_4] LON-CAPA courses and communities.' # _1: <b>, _2: <a>, _3: </a> </b>, _4: domain
-=> '[_1]Visite el [_2]CatÃ¡logo de Cursos/Comunidades[_3], para ver todos los cursos y comunidades LON-CAPA del dominio [_4].', # '[_1]Visite el [_2]CatÃ¡logo de Cursos[_3], para ver todos los cursos LON-CAPA del dominio [_4].',
+  '[_1]Visit the [_2]Course/Community Catalog[_3][_4] to view all [_5] LON-CAPA courses and communities.' # _1: <b>, _2: <a>, _3: </a>, _4: </b>, _5: domain desc.
+=> '[_1]Visite el [_2]CatÃ¡logo de Cursos/Comunidades[_3][_4], para ver todos los cursos y comunidades LON-CAPA del dominio [_5].',
 
    'If a course or community is [_1]not[_2] in your list of current courses and communities below, you may be able to enroll if self-enrollment is permitted.'
 => 'Si un curso o comunidad [_1]no[_2] estÃ¡ en su lista actual de cursos y comunidades, usted podrÃa registrarse si la auto-inscripciÃ³n es permitida.', # 'Si un curso [_1]no[_2] estÃ¡ en su lista actual de cursos, usted podrÃa registrarse si la auto-inscripciÃ³n es permitida.',
Index: loncom/localize/localize/fa.pm
diff -u loncom/localize/localize/fa.pm:1.24 loncom/localize/localize/fa.pm:1.25
--- loncom/localize/localize/fa.pm:1.24	Tue Jan 14 18:55:00 2014
+++ loncom/localize/localize/fa.pm	Wed Jan 15 14:46:30 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Farsi Localization Lexicon
 #
-# $Id: fa.pm,v 1.24 2014/01/14 18:55:00 bisitz Exp $
+# $Id: fa.pm,v 1.25 2014/01/15 14:46:30 bisitz Exp $
 #
 # Copyright i-Learning Limited Partnership Company
 #
@@ -399,9 +399,6 @@
    'Goodbye'
 => 'Ø®Ø¯Ø§ØØ§ÙØ¸',
 
-   ', and answers will be available on'
-=> ', Ùˆ Ù¾Ø§Ø³Ø®Ù‡Ø§  Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ø®ÙˆØ§Ù‡Ø¯ Ø¨ÙˆØ¯',
-
    ', or the next time you log in.'
 => ', ÙŠØ§ Ø¯ÙØ¹Ù‡ Ø¨Ø¹Ø¯Ù‰ ÙƒÙ‡ Ù…ØªØµÙ„ Ø´ÙˆÙŠØ¯',
 
@@ -771,8 +768,8 @@
    'is closed but you are allowed to view it'
 => 'Ø¨Ø³ØªÙ‡ Ù…Ù‰â€Ø´ÙˆØ¯ ÙˆÙ„Ù‰ Ù…Ø¬Ø§Ø² Ù‡Ø³ØªÙŠØ¯ Ø¢Ù† Ø±Ø§ Ø¨Ø¨ÙŠÙ†ÙŠØ¯',
 
-   'is due at'
-=> 'Ù…Ù‚Ø±Ø± Ø§Ø³Øª Ø¯Ø±',
+   'is due at [_1]'
+=> 'Ù…Ù‚Ø±Ø± Ø§Ø³Øª Ø¯Ø± [_1]',
 
    'is in under construction'
 => 'Ø¯Ø± ØØ§Ù„ Ø¢Ù…Ø§Ø¯Ù‡ Ø³Ø§Ø²Ù‰ Ø§Ø³Øª',
@@ -819,11 +816,11 @@
    'undo'
 => 'Ø¨Ù‰ Ø§Ø«Ø± ÙƒØ±Ø¯Ù†',
 
-   'was due on'
-=> 'Ù…Ù‚Ø±Ø± Ø¨ÙˆØ¯ Ø¯Ø±',
+   'was due on [_1], and answers will be available on [_2]'
+=> 'Ù…Ù‚Ø±Ø± Ø¨ÙˆØ¯ Ø¯Ø± [_1], ï» Ù¾ïºŽïº´ïº¨ï»«ïº  ïº©ïº ïºªïº´ïº—ïº®ïº³ ïº¥ï»ïºŽï»«ïº© ïºï»ïº© [_2]',
 
-   'will open on'
-=> 'Ø¯Ø± Ø§ÛŒÙ† ØªØ§Ø±ÙŠØ® Ø¨Ø§Ø² Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯',
+   'will open on [_1]'
+=> 'Ø¯Ø± Ø§ÛŒÙ† ØªØ§Ø±ÙŠØ® Ø¨Ø§Ø² Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯ [_1]',
 
    ', is reserved internally by LON-CAPA.'
 => ', Ø¯Ø± Ø¯Ø±ÙˆÙ† ØªÙˆØ³Ø· Ù„ÙˆÙ† ÙƒØ§Ù¾Ø§ Ø°Ø®ÙŠØ±Ù‡ Ù…Ù‰â€Ø´ÙˆØ¯',
Index: loncom/localize/localize/fr.pm
diff -u loncom/localize/localize/fr.pm:1.29 loncom/localize/localize/fr.pm:1.30
--- loncom/localize/localize/fr.pm:1.29	Tue Jan 14 18:55:00 2014
+++ loncom/localize/localize/fr.pm	Wed Jan 15 14:46:30 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # French Localization Lexicon
 #
-# $Id: fr.pm,v 1.29 2014/01/14 18:55:00 bisitz Exp $
+# $Id: fr.pm,v 1.30 2014/01/15 14:46:30 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -569,14 +569,14 @@
    'an indeterminate date'
 => 'une date indÃ©terminÃ©e',
 
-   'will open on'
-=> 'sera disponible le',
+   'will open on [_1]'
+=> 'sera disponible le [_1]',
 
-   'is due at'
-=> 'est dÃ» Ã ',
+   'is due at [_1]'
+=> 'est dÃ» Ã  [_1]',
 
-   'was due on'
-=> 'etait dÃ» le',
+   'was due on [_1], and answers will be available on [_2]'
+=> 'etait dÃ» le [_1], et les rÃ©ponses seront disponibles le [_2]',
 
    'is closed but you are allowed to view it'
 => 'est fermÃ© mais vous avez la permission de le visualiser',
@@ -641,9 +641,6 @@
    'may open later.'
 => 'pourra Ãªtre disponible plus tard.',
 
-   ', and answers will be available on'
-=> ', et les rÃ©ponses seront disponibles le',
-
    'Select a'
 => 'SÃ©lectionner un',
 
Index: loncom/localize/localize/ja.pm
diff -u loncom/localize/localize/ja.pm:1.30 loncom/localize/localize/ja.pm:1.31
--- loncom/localize/localize/ja.pm:1.30	Tue Jan 14 17:49:33 2014
+++ loncom/localize/localize/ja.pm	Wed Jan 15 14:46:30 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Japanese Localization Lexicon
 #
-# $Id: ja.pm,v 1.30 2014/01/14 17:49:33 bisitz Exp $
+# $Id: ja.pm,v 1.31 2014/01/15 14:46:30 bisitz Exp $
 #
 # Copyright i-Learning Limited Partnership Company
 #
@@ -401,9 +401,6 @@
 
 
 #SYNC Fri Sep 26 14:41:18 2003
-   ', and answers will be available on'
-=> ', æ£è§£ã¯æ¬¡ã®ãƒªãƒ³ã‚¯ã«ã‚ã‚Šã¾ã™',
-
    ', or the next time you log in.'
 => 'ã€ã¾ãŸã¯æ¬¡å›žã®ãƒã‚°ã‚¤ãƒ³ã€‚',
 
@@ -773,8 +770,8 @@
    'is closed but you are allowed to view it'
 => 'ç· ã‚åˆ‡ã‚‰ã‚Œã¾ã—ãŸãŒè¦‹ã‚‹ã“ã¨ã¯å‡ºæ¥ã¾ã™',
 
-   'is due at'
-=> 'ã®ç· åˆ‡ã‚Šã¯',
+   'is due at [_1]'
+=> 'ã®ç· åˆ‡ã‚Šã¯ [_1]',
 
    'is in under construction'
 => 'ã¯ä½œæˆä¸ã§ã™',
@@ -821,11 +818,11 @@
    'undo'
 => 'ã‚„ã‚Šç›´ã—',
 
-   'was due on'
-=> 'ã¯ç· ã‚åˆ‡ã‚‰ã‚Œã¾ã—ãŸï¼š',
+   'was due on [_1], and answers will be available on [_2]'
+=> 'ã¯ç· ã‚åˆ‡ã‚‰ã‚Œã¾ã—ãŸï¼š[_1], æ£è§£ã¯æ¬¡ã®ãƒªãƒ³ã‚¯ã«ã‚ã‚Šã¾ã™ [_2]',
 
-   'will open on'
-=> 'ã¯å…¬é–‹ã•ã‚Œã¾ã™ï¼š',
+   'will open on [_1]'
+=> 'ã¯å…¬é–‹ã•ã‚Œã¾ã™ï¼š[_1]',
 
 #SYNC Fri Sep 26 16:57:10 2003
    ', is reserved internally by LON-CAPA.'
Index: loncom/localize/localize/pt.pm
diff -u loncom/localize/localize/pt.pm:1.74 loncom/localize/localize/pt.pm:1.75
--- loncom/localize/localize/pt.pm:1.74	Tue Jan 14 18:55:00 2014
+++ loncom/localize/localize/pt.pm	Wed Jan 15 14:46:30 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Portuguese Localization Lexicon
 #
-# $Id: pt.pm,v 1.74 2014/01/14 18:55:00 bisitz Exp $
+# $Id: pt.pm,v 1.75 2014/01/15 14:46:30 bisitz Exp $
 #
 # Copyright UNICAMP, Sao Paulo
 # Supported in part by Partnership in Global Learning
@@ -639,14 +639,14 @@
    "an indeterminate date"
 => 'data indeterminada',
 
-   "will open on"
-=> "irÃ¡ abrir em",
+   'will open on [_1]'
+=> 'irÃ¡ abrir em [_1]',
 
-   "is due at"
-=> "Ã© devido a;",
+   'is due at [_1]'
+=> 'Ã© devido a; [_1]',
 
-   "was due on"
-=> "foi devido a;",
+   'was due on [_1], and answers will be available on [_1]'
+=> 'foi devido a; [_1], e respostas estarÃ£o disponÃveis em [_2]',
 
    'is closed but you are allowed to view it'
 => "estÃ¡ fechado mas vocÃª tem permissÃ£o para visualizÃ¡-lo",
@@ -711,9 +711,6 @@
    "may open later."
 => 'pode abrir mais tarde.',
 
-   ', and answers will be available on'
-=> ', e respostas estarÃ£o disponÃveis em',
-
    "Select a"
 => "Selecione um",
 
@@ -15138,9 +15135,6 @@
    'Problems graded correct by the computer are marked with a [_1] symbol.'
 => 'Problems graded correct by the computer are marked with a [_1] symbol.',
 
-   'Problems occurred in creating the new Excel file.'
-=> 'Problems occurred in creating the new Excel file.',
-
    'Problems occurred in creating the output file.'
 => 'Problems occurred in creating the output file.',
 
@@ -20712,8 +20706,8 @@
    '[_1]Unofficial course[_2] in domain: [_3]'
 => '[_1]Unofficial course[_2] in domain: [_3]',
 
-   '[_1]Visit the [_2]Course/Community Catalog[_3] to view all [_4] LON-CAPA courses and communities.'
-=> '[_1]Visit the [_2]Course/Community Catalog[_3] to view all [_4] LON-CAPA courses and communities.',
+   '[_1]Visit the [_2]Course/Community Catalog[_3][_4] to view all [_5] LON-CAPA courses and communities.' # _1: <b>, _2: <a>, _3: </a>, _4: </b>, _5: domain desc.
+=> '[_1]Visit the [_2]Course/Community Catalog[_3][_4] to view all [_5] LON-CAPA courses and communities.',
 
    '[_1]W[_2]ARNING'
 => '[_1]W[_2]ARNING',
Index: loncom/localize/localize/ru.pm
diff -u loncom/localize/localize/ru.pm:1.72 loncom/localize/localize/ru.pm:1.73
--- loncom/localize/localize/ru.pm:1.72	Tue Jan 14 17:49:33 2014
+++ loncom/localize/localize/ru.pm	Wed Jan 15 14:46:30 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Russian Localization Lexicon
 #
-# $Id: ru.pm,v 1.72 2014/01/14 17:49:33 bisitz Exp $
+# $Id: ru.pm,v 1.73 2014/01/15 14:46:30 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,9 +78,6 @@
    '"[_1]" to disable, anything else if not'
 => 'ÐµÑÐ»Ð¸ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ, Ð»ÑŽÐ±Ð¾Ðµ Ð´Ñ€ÑƒÐ³Ð¾Ðµ - Ð½ÐµÑ‚',
 
-   ', and answers will be available on'
-=> ', Ð¸ Ð¾Ñ‚Ð²ÐµÑ‚Ñ‹ Ð±ÑƒÐ´ÑƒÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹',
-
    ', select a template from the pull-down menu below'
 => ', Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÑˆÐ°Ð±Ð»Ð¾Ð½ Ð¸Ð· Ð¼ÐµÐ½ÑŽ Ð½Ð¸Ð¶Ðµ',
 
@@ -3772,8 +3769,8 @@
    'is closed but you are allowed to view it'
 => 'is closed but you are allowed to view it',
 
-   'is due at'
-=> 'is due at',
+   'is due at [_1]'
+=> 'is due at [_1]',
 
    'is in under construction'
 => 'is in under construction',
@@ -4048,11 +4045,11 @@
    'warning(s)'
 => 'warning(s)',
 
-   'was due on'
-=> 'was due on',
+   'was due on [_1], and answers will be available on [_2]'
+=> 'was due on [_1], and answers will be available on [_2]', # 'was due on [_1], Ð¸ Ð¾Ñ‚Ð²ÐµÑ‚Ñ‹ Ð±ÑƒÐ´ÑƒÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹ [_2]'
 
-   'will open on'
-=> 'will open on',
+   'will open on [_1]'
+=> 'will open on [_1]',
 
    'with server'
 => 'Ñ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼',
Index: loncom/localize/localize/tr.pm
diff -u loncom/localize/localize/tr.pm:1.25 loncom/localize/localize/tr.pm:1.26
--- loncom/localize/localize/tr.pm:1.25	Tue Jan 14 18:55:00 2014
+++ loncom/localize/localize/tr.pm	Wed Jan 15 14:46:30 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Turkish Localization Lexicon
 #
-# $Id: tr.pm,v 1.25 2014/01/14 18:55:00 bisitz Exp $
+# $Id: tr.pm,v 1.26 2014/01/15 14:46:30 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -578,15 +578,15 @@
    "an indeterminate date"
 => 'Belirsiz Tarih',
 
-   "will open on"
-=> "aÃ§Ã½lacak",
+   'will open on [_1]'
+=> 'aÃ§Ã½lacak [_1]',
 
 
-   "is due at"
-=> "uygun",
+   'is due at [_1]'
+=> 'uygun [_1]', # ?
 
-   "was due on"
-=> "uygundu",
+   'was due on [_1], and answers will be available on [_2]'
+=> 'uygundu [_1] ve cevaplara ulaÃ¾Ã½labilir [_2]',
 
    'is closed but you are allowed to view it'
 => "kapatÃ½ldÃ½ fakat incelemeye izin verildi",
@@ -651,9 +651,6 @@
    "may open later."
 => 'Sonra AÃ§Ã½labilir',
 
-   ', and answers will be available on'
-=> 'Ve cevaplara ulaÃ¾Ã½labilir',
-
    "Select a"
 => "SeÃ§",
 
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.120 loncom/localize/localize/zh.pm:1.121
--- loncom/localize/localize/zh.pm:1.120	Tue Jan 14 18:55:00 2014
+++ loncom/localize/localize/zh.pm	Wed Jan 15 14:46:30 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Chinese Simplified Localization Lexicon
 #
-# $Id: zh.pm,v 1.120 2014/01/14 18:55:00 bisitz Exp $
+# $Id: zh.pm,v 1.121 2014/01/15 14:46:30 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -584,14 +584,14 @@
    "an indeterminate date"
 => 'æ— é™æœŸ',
 
-   "will open on"
-=> "å¼€æ”¾äºŽ",
+   'will open on [_1]'
+=> 'å¼€æ”¾äºŽ [_1]',
 
-   "is due at"
-=> "is due at",
+   'is due at [_1]'
+=> 'is due at [_1]',
 
-   "was due on"
-=> "was due on",
+   'was due on [_1], and answers will be available on [_2]'
+=> 'was due on [_1], and answers will be available on [_2]',
 
    'is closed but you are allowed to view it'
 => "is closed but you are allowed to view it",
@@ -656,9 +656,6 @@
    "may open later."
 => 'may open later.',
 
-   ', and answers will be available on'
-=> ', and answers will be available on',
-
    "Select a"
 => "Select a",
 
@@ -15436,8 +15433,8 @@
    'The scores were changed for [quant,_1,problem].'
 => 'The scores were changed for [quant,_1,problem].',
 
-   '[_1]Visit the [_2]Course/Community Catalog[_3] to view all [_4] LON-CAPA courses and communities.' # _1: <b>, _2: <a>, _3: </a> </b>, _4: domain
-=> '[_1]Visit the [_2]Course/Community Catalog[_3] to view all [_4] LON-CAPA courses and communities.',
+   '[_1]Visit the [_2]Course/Community Catalog[_3][_4] to view all [_5] LON-CAPA courses and communities.' # _1: <b>, _2: <a>, _3: </a>, _4: </b>, _5: domain desc.
+=> '[_1]Visit the [_2]Course/Community Catalog[_3][_4] to view all [_5] LON-CAPA courses and communities.',
 
    'If a course or community is [_1]not[_2] in your list of current courses and communities below, you may be able to enroll if self-enrollment is permitted.'
 => 'If a course or community is [_1]not[_2] in your list of current courses and communities below, you may be able to enroll if self-enrollment is permitted.', # 'å¦‚æžœä¸€ä¸ªè¯¾ç¨‹åœ¨ä¸‹é¢åˆ—å‡ºæ‚¨ç›®å‰çš„è¯¾ç¨‹ä¸[_1]æ²¡æœ‰[_2]æ˜¾ç¤ºï¼Œä½ å¯ä»¥æ³¨å†Œï¼Œå¦‚æžœè‡ªæˆ‘æ³¨å†Œæ˜¯å…è®¸çš„ã€‚',
