[LON-CAPA-cvs] cvs: loncom /interface lonsearchcat.pm portfolio.pm /localize/localize ar.pm de.pm es.pm fa.pm fr.pm pt.pm tr.pm zh.pm

Tue Jan 14 13:55:01 EST 2014

bisitz		Tue Jan 14 18:55:01 2014 EDT

  Modified files:              
    /loncom/interface	lonsearchcat.pm portfolio.pm 
    /loncom/localize/localize	ar.pm de.pm es.pm fa.pm fr.pm pt.pm tr.pm 
                             	zh.pm 
  Log:
  Consistent wording / re-use existing phrases
  
  
-------------- next part --------------
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.340 loncom/interface/lonsearchcat.pm:1.341

--- loncom/interface/lonsearchcat.pm:1.340	Tue Dec 31 01:07:28 2013
+++ loncom/interface/lonsearchcat.pm	Tue Jan 14 18:54:56 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.340 2013/12/31 01:07:28 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.341 2014/01/14 18:54:56 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -194,11 +194,14 @@
                                          'Unable to recover data from '.
                                          $persistent_db_file);
 		my $msg =
-		    'We were unable to retrieve data describing your search. '.
-		    'This is a serious error and has been logged. '.
-		    'Please alert your LON-CAPA administrator.';
-		&Apache::loncommon::simple_error_page($r,'Search Error',
-						      $msg);
+                    &mt('We were unable to retrieve data describing your search.').
+                    ' '.&mt('This is a serious error and has been logged.').
+                    '<br />'.
+                    &mt('Please alert your LON-CAPA administrator.');
+                &Apache::loncommon::simple_error_page(
+                    $r,'Search Error',
+                    $msg,
+                    {'no_auto_mt_msg' => 1});
 		return OK;
             }
         }
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.251 loncom/interface/portfolio.pm:1.252
--- loncom/interface/portfolio.pm:1.251	Wed Dec 18 01:29:20 2013
+++ loncom/interface/portfolio.pm	Tue Jan 14 18:54:56 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.251 2013/12/18 01:29:20 raeburn Exp $
+# $Id: portfolio.pm,v 1.252 2014/01/14 18:54:56 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2711,7 +2711,7 @@
     }
     if ($env{'form.meta'}) {
         &open_form($r,$url);
-        $r->print(&mt('Edit the meta data').'<br />');
+        $r->print(&mt('Edit Metadata').'<br />');
         &close_form($r,$url);
     }
     if ($env{'form.uploaddoc.filename'}) {
Index: loncom/localize/localize/ar.pm
diff -u loncom/localize/localize/ar.pm:1.25 loncom/localize/localize/ar.pm:1.26
--- loncom/localize/localize/ar.pm:1.25	Wed Jan  8 19:23:12 2014
+++ loncom/localize/localize/ar.pm	Tue Jan 14 18:54:59 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Arabic Localization Lexicon
 #
-# $Id: ar.pm,v 1.25 2014/01/08 19:23:12 bisitz Exp $
+# $Id: ar.pm,v 1.26 2014/01/14 18:54:59 bisitz Exp $
 #
 # Copyright i-Learning Limited Partnership Company
 #
@@ -2319,8 +2319,14 @@
    'Problems Not Contained In A Folder'
 => 'Ù„Ù… ØªØ¯Ø±Ø¬ Ø§Ù„Ù…Ø³Ø§Ø¦Ù„ ÙÙŠ Ù…Ø¬Ù„Ø¯ ÙˆØ§ØØ¯',
 
-   'Problems creating new Excel file.  This error has been logged.  Please alert your LON-CAPA administrator.'
-=> 'Ø§Ù„Ù…Ø³Ø§Ø¦Ù„ Ø§Ù„Ù…ÙˆØ¬ÙØ¯Ø© Ù„Ù…Ù„Ù Ø§Ú©Ø³Ù„ Ø§Ù„Ø¬Ø¯ÙŠØ¯. ØªÙ… Ø¶Ø¨Ø· Ù‡Ø°Ø§ Ø§Ù„Ø®Ø·Ø£. ÙŠØ±Ø¬Ù‰ Ø¥Ø®Ø¨Ø§Ø± Ù…Ø¯ÙŠØ± Ù„ÙˆÙ† Ú©Ø§Ø¨Ø§',
+   'Problems occurred in creating the new Excel file.'
+=> 'Ø§Ù„Ù…Ø³Ø§Ø¦Ù„ Ø§Ù„Ù…ÙˆØ¬ÙØ¯Ø© Ù„Ù…Ù„Ù Ø§Ú©Ø³Ù„ Ø§Ù„Ø¬Ø¯ÙŠØ¯.',
+
+   'This error has been logged.'
+=> 'ïº–ï»£ ïº¾ïº’ï»ƒ ï»©ïº«ïº ïºŽï» ïº¨ï»ƒïºƒ.',
+
+   'Please alert your LON-CAPA administrator.'
+=> 'ï»±ïº®ïºŸï»¯ ïºˆïº¨ïº‘ïºïº ï»¡ïºªï»³ïº ï»ï»®ï»§ Ú©ïºŽïº‘ïº', 
 
    'Processed [_1] student(s).'
 => 'Ù…Ø¹Ø§Ù„ÙŽØ¬ l [_1] Ø§Ù„Ø·Ù„Ø§Ø¨',
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.576 loncom/localize/localize/de.pm:1.577
--- loncom/localize/localize/de.pm:1.576	Tue Jan 14 17:49:32 2014
+++ loncom/localize/localize/de.pm	Tue Jan 14 18:54:59 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.576 2014/01/14 17:49:32 bisitz Exp $
+# $Id: de.pm,v 1.577 2014/01/14 18:54:59 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -14836,9 +14836,6 @@
    'To upload a file, click [_1]Browse...[_2] and select a file, then click [_1]Upload[_2].'
 => 'Um eine Datei hochzuladen, klicken Sie auf [_1]Durchsuchen...[_2] und wÃ¤hlen Sie eine Datei, dann klicken Sie auf [_1]Hochladen[_2].',
 
-   'Edit the meta data'
-=> 'Metadaten Ã¤ndern',
-
    'Pick functionality'
 => 'Funktion auswÃ¤hlen',
 
@@ -14962,6 +14959,9 @@
    'This error has been logged.'
 => 'Dieser Fehler wurde protokolliert.',
 
+   'This is a serious error and has been logged.'
+=> 'Es handelt sich um einen schwerwiegenden Fehler, der protokolliert wurde.',
+
    'Please alert your LON-CAPA administrator.'
 => 'Bitte benachrichtigen Sie Ihren LON-CAPA-Administrator.',
 
@@ -24527,12 +24527,6 @@
    'Please try again in a few minutes.'
 => 'Bitte versuchen Sie es in ein paar Minuten noch einmal.',
 
-   'This is a serious error and has been logged.  You should contact your system administrator to resolve this issue.'
-=> 'Es handelt sich um einen schwerwiegenden Fehler, der protokolliert wurde. Bitte kontaktieren Sie Ihren Systemadministrator, um das Problem beheben zu lassen.',
-
-   'This is a serious error and has been logged. You should contact your system administrator to resolve this issue.'
-=> 'Es handelt sich um einen schwerwiegenden Fehler, der protokolliert wurde. Bitte kontaktieren Sie Ihren Systemadministrator, um das Problem beheben zu lassen.',
-
    'Unable to process for [_1]:[_2]'
 => 'Verarbeitung fÃ¼r [_1]:[_2] nicht mÃ¶glich',
 
@@ -27611,8 +27605,8 @@
    'Send message to specific user'
 => 'Nachricht an bestimmten Benutzer senden',
 
-   'We were unable to retrieve data describing your search. This is a serious error and has been logged. Please alert your LON-CAPA administrator.'
-=> 'Wir konnten die Daten Ihrer Suche nicht abrufen. Es handelt sich um einen ernsten Fehler. Bitte kontaktieren Sie Ihren LON-CAPA-Administrator.',
+   'We were unable to retrieve data describing your search.'
+=> 'Wir konnten die Daten Ihrer Suche nicht abrufen.',
 
    'Unable to tie hash to db file.'
 => 'Der Hash konnte nicht an die DB-Datei gebunden werden.',
Index: loncom/localize/localize/es.pm
diff -u loncom/localize/localize/es.pm:1.81 loncom/localize/localize/es.pm:1.82
--- loncom/localize/localize/es.pm:1.81	Tue Jan 14 17:49:33 2014
+++ loncom/localize/localize/es.pm	Tue Jan 14 18:55:00 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Spanish Localization Lexicon
 #
-# $Id: es.pm,v 1.81 2014/01/14 17:49:33 bisitz Exp $
+# $Id: es.pm,v 1.82 2014/01/14 18:55:00 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -13136,9 +13136,6 @@
    'To upload a file, click <strong>Browse...</strong> and select a file, then click <strong>Upload</strong>.'
 => 'Para cargar un archivo, pulse <strong>Navegar...</strong> y seleccione un archivo,entonces pulse <strong>Cargar</strong>.',
 
-   'Edit the meta data'
-=> 'Editar el meta dato',
-
    'Pick functionality'
 => 'Elija funcionalidad',
 
Index: loncom/localize/localize/fa.pm
diff -u loncom/localize/localize/fa.pm:1.23 loncom/localize/localize/fa.pm:1.24
--- loncom/localize/localize/fa.pm:1.23	Wed Jan  8 19:23:12 2014
+++ loncom/localize/localize/fa.pm	Tue Jan 14 18:55:00 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Farsi Localization Lexicon
 #
-# $Id: fa.pm,v 1.23 2014/01/08 19:23:12 bisitz Exp $
+# $Id: fa.pm,v 1.24 2014/01/14 18:55:00 bisitz Exp $
 #
 # Copyright i-Learning Limited Partnership Company
 #
@@ -2283,8 +2283,14 @@
    'Problems Not Contained In A Folder'
 => 'Ù…Ø³Ø§Ø¦Ù„ Ø¯Ø± ÙŠÙƒ Ù¾ÙˆØ´Ù‡ Ø¬Ø§ Ø¯Ø§Ø¯Ù‡ Ù†Ø´Ø¯Ù‡ Ø§Ù†Ø¯',
 
-   'Problems creating new Excel file.  This error has been logged.  Please alert your LON-CAPA administrator.'
-=> 'Ù…Ø³Ø§Ø¦Ù„ Ø§ÙŠØ¬Ø§Ø¯ ÙƒÙ†Ù†Ø¯Ù‡ ÙØ§ÙŠÙ„ Ø§ÙƒØ³Ù„ Ø¬Ø¯ÙŠØ¯. Ø§ÙŠÙ† Ø®Ø·Ø§ Ø«Ø¨Øª Ø´Ø¯Ù‡ Ø§Ø³Øª. Ù„Ø·ÙØ§Ù‹ Ø¨Ù‡ Ù…Ø¯ÙŠØ± Ù„ÙˆÙ† ÙƒØ§Ù¾Ø§ Ù‡Ø´Ø¯Ø§Ø± Ø¯Ù‡ÙŠØ¯',
+   'Problems occurred in creating the new Excel file.'
+=> 'Ù…Ø³Ø§Ø¦Ù„ Ø§ÙŠØ¬Ø§Ø¯ ÙƒÙ†Ù†Ø¯Ù‡ ÙØ§ÙŠÙ„ Ø§ÙƒØ³Ù„ Ø¬Ø¯ÙŠØ¯.',
+
+   'This error has been logged.'
+=> 'ïºŽï»´ï»§ ïº¦ï»ƒïº ïºšïº’ïº— ïºµïºªï»« ïºŽïº´ïº—.',
+
+   'Please alert your LON-CAPA administrator.'
+=> 'ï»žï»„ï»“ïºÙ‹ ïºï»« ï»¡ïºªï»³ïº ï»ï»®ï»§ ï»™ïºÙ¾ïº ï»ªïº·ïº©ïºïº ïºªï»¬ï»³ïº©.',
 
    'Processed [_1] student(s).'
 => 'Ù¾Ø±Ø¯Ø§Ø²Ø´ Ø´Ø¯Ù‡ [1_] Ø¯Ø§Ù†Ø´Ø¬ÙˆÙŠØ§Ù†',
Index: loncom/localize/localize/fr.pm
diff -u loncom/localize/localize/fr.pm:1.28 loncom/localize/localize/fr.pm:1.29
--- loncom/localize/localize/fr.pm:1.28	Tue Jan 14 17:49:33 2014
+++ loncom/localize/localize/fr.pm	Tue Jan 14 18:55:00 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # French Localization Lexicon
 #
-# $Id: fr.pm,v 1.28 2014/01/14 17:49:33 bisitz Exp $
+# $Id: fr.pm,v 1.29 2014/01/14 18:55:00 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1649,8 +1649,14 @@
    'Problems Not Contained In A Folder'
 => 'ProblÃ¨mes non contenus dans un dossier',
 
-   'Problems creating new Excel file.  This error has been logged.  Please alert your LON-CAPA administrator.'
-=> "ProblÃ¨mes pour crÃ©er une feuille de calcul Excel.  Cette erreur a Ã©tÃ© journalisÃ©e. Veuillez SVP informer l'administrateur du systÃ¨me LON-CAPA.",
+   'Problems occurred in creating the new Excel file.'
+=> "ProblÃ¨mes pour crÃ©er une feuille de calcul Excel.",
+
+   'This error has been logged.'
+=> "Cette erreur a Ã©tÃ© journalisÃ©e.", 
+
+   'Please alert your LON-CAPA administrator.'
+=> "Veuillez SVP informer l'administrateur du systÃ¨me LON-CAPA.",
 
    'Processing course structure'
 => 'Traitement de la struture du cours',
Index: loncom/localize/localize/pt.pm
diff -u loncom/localize/localize/pt.pm:1.73 loncom/localize/localize/pt.pm:1.74
--- loncom/localize/localize/pt.pm:1.73	Tue Jan 14 17:49:33 2014
+++ loncom/localize/localize/pt.pm	Tue Jan 14 18:55:00 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Portuguese Localization Lexicon
 #
-# $Id: pt.pm,v 1.73 2014/01/14 17:49:33 bisitz Exp $
+# $Id: pt.pm,v 1.74 2014/01/14 18:55:00 bisitz Exp $
 #
 # Copyright UNICAMP, Sao Paulo
 # Supported in part by Partnership in Global Learning
@@ -1725,8 +1725,8 @@
    'Problems Not Contained In A Folder'
 => 'Problemas nÃ£o estÃ£o contidos em uma pasta',
 
-   'Problems creating new Excel file.  This error has been logged.  Please alert your LON-CAPA administrator.'
-=> 'Problemas criando novo arquivo do Excel.  Este erro foi armazenado em log. Por favor, alerte o administrador do LON-CAPA.',
+   'Problems occurred in creating the new Excel file.'
+=> 'Problemas criando novo arquivo do Excel.',
 
    'Processing course structure'
 => 'Processando estrutura do curso',
@@ -10617,9 +10617,6 @@
    'Edit the Personal Information Page'
 => 'Edit the Personal Information Page',
 
-   'Edit the meta data'
-=> 'Edit the meta data',
-
    'EditXML [_1]'
 => 'EditXML [_1]',
 
@@ -14647,7 +14644,7 @@
 => 'Please alert a domain coordinator of this situation',
 
    'Please alert your LON-CAPA administrator.'
-=> 'Please alert your LON-CAPA administrator.',
+=> 'Por favor, alerte o administrador do LON-CAPA.',
 
    'Please attempt to login to one of the following servers:'
 => 'Please attempt to login to one of the following servers:',
@@ -18533,7 +18530,7 @@
 => 'This directory is empty.',
 
    'This error has been logged.'
-=> 'This error has been logged.',
+=> 'Este erro foi armazenado em log.',
 
    'This error occurred on machine [_1]'
 => 'This error occurred on machine [_1]',
Index: loncom/localize/localize/tr.pm
diff -u loncom/localize/localize/tr.pm:1.24 loncom/localize/localize/tr.pm:1.25
--- loncom/localize/localize/tr.pm:1.24	Tue Jan 14 17:49:33 2014
+++ loncom/localize/localize/tr.pm	Tue Jan 14 18:55:00 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Turkish Localization Lexicon
 #
-# $Id: tr.pm,v 1.24 2014/01/14 17:49:33 bisitz Exp $
+# $Id: tr.pm,v 1.25 2014/01/14 18:55:00 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1783,8 +1783,14 @@
    'Problem Status Chart'
 => 'Problem durum grafiÃ°i',
 
-   'Problems creating new Excel file.  This error has been logged.  Please alert your LON-CAPA administrator.'
-=> 'Problemler yeni Excel dosyasÃ½ yaratÃ½yor. Bu hata kaydedildi. LÃ¼tfen LON-CAPA yÃ¶neticini uyar.',
+   'Problems occurred in creating the new Excel file.'
+=> 'Problemler yeni Excel dosyasÃ½ yaratÃ½yor.',
+
+   'This error has been logged.'
+=> 'Bu hata kaydedildi.',
+
+   'Please alert your LON-CAPA administrator.'
+=> 'LÃ¼tfen LON-CAPA yÃ¶neticini uyar.',
 
    'S.D. tries'
 => 'S.D. denemeler',
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.119 loncom/localize/localize/zh.pm:1.120
--- loncom/localize/localize/zh.pm:1.119	Tue Jan 14 17:49:33 2014
+++ loncom/localize/localize/zh.pm	Tue Jan 14 18:55:00 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Chinese Simplified Localization Lexicon
 #
-# $Id: zh.pm,v 1.119 2014/01/14 17:49:33 bisitz Exp $
+# $Id: zh.pm,v 1.120 2014/01/14 18:55:00 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8224,7 +8224,7 @@
 => 'Currently published version',
 
    'Edit Metadata'
-=> 'Edit Metadata',
+=> 'ç¼–è¾‘å…ƒæ•°æ®',
 
    'Cleanup XML Document'
 => 'Cleanup XML Document',
@@ -13001,9 +13001,6 @@
    'To upload a file, click <strong>Browse...</strong> and select a file, then click <strong>Upload</strong>.'
 => 'è¦ä¸Šä¼ æ–‡ä»¶ï¼Œè¯·ç‚¹å‡»<strong>æµè§ˆ... </strong>ï¼Œå¹¶é€‰æ‹©ä¸€ä¸ªæ–‡ä»¶ï¼Œç„¶åŽç‚¹å‡»<strong>ä¸Šä¼ </strong> ã€‚',
 
-   'Edit the meta data'
-=> 'ç¼–è¾‘å…ƒæ•°æ®',
-
    'Pick functionality'
 => 'é€‰æ‹©åŠŸèƒ½',
 
