Index: temp_moodle_dev/build.xml
===================================================================
RCS file: /usr/local/cvsroot/temp_moodle_dev/build.xml,v
diff -u -r1.3 -r1.4
--- temp_moodle_dev/build.xml	20 Jul 2009 06:43:13 -0000	1.3
+++ temp_moodle_dev/build.xml	24 Nov 2009 00:43:18 -0000	1.4
@@ -61,11 +61,6 @@
 				<include name="lamstwo/**" />
 			</fileset>
 		</copy>
-		<copy verbose="true" preservelastmodified="true" todir="${moodle_dir}/lang/en_utf8/">
-			<fileset dir="moodle/lang/en_utf8">
-				<include name="lamstwo.php" />
-			</fileset>
-		</copy>
 	</target>
 	
 	<target name="undeploy-lamstwo">
@@ -102,7 +97,6 @@
 			<fileset dir="moodle/blocks">
 				<include name="lamstwo_status/**" />
 			</fileset>
-			<fileset dir="moodle/lang/en_utf8" includes="lamstwo.php" />
 		</zip>
 	</target>
 	
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `temp_moodle_dev/moodle/lang/en_utf8/lamstwo.php'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: temp_moodle_dev/moodle/mod/lamstwo/version.php
===================================================================
RCS file: /usr/local/cvsroot/temp_moodle_dev/moodle/mod/lamstwo/version.php,v
diff -u -r1.5 -r1.6
--- temp_moodle_dev/moodle/mod/lamstwo/version.php	31 Aug 2009 08:19:40 -0000	1.5
+++ temp_moodle_dev/moodle/mod/lamstwo/version.php	24 Nov 2009 00:43:18 -0000	1.6
@@ -5,7 +5,7 @@
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2009083100;  // The current module version (Date: YYYYMMDDXX)
+$module->version  = 2009112400;  // The current module version (Date: YYYYMMDDXX)
 $module->requires = 2007021400;  // Requires this Moodle version (1.8)
 $module->cron     = 0;           // Period for cron to check this module (secs)
 
Index: temp_moodle_dev/moodle/mod/lamstwo/db/upgrade.php
===================================================================
RCS file: /usr/local/cvsroot/temp_moodle_dev/moodle/mod/lamstwo/db/upgrade.php,v
diff -u -r1.4 -r1.5
--- temp_moodle_dev/moodle/mod/lamstwo/db/upgrade.php	8 Jul 2009 07:37:39 -0000	1.4
+++ temp_moodle_dev/moodle/mod/lamstwo/db/upgrade.php	24 Nov 2009 00:43:18 -0000	1.5
@@ -1,5 +1,7 @@
 <?php
 
+require_once($CFG->libdir.'/filelib.php');
+
 // This file keeps track of upgrades to 
 // the forum module
 //
@@ -19,6 +21,7 @@
 
 function xmldb_lamstwo_upgrade($oldversion=0) {
 
+    global $CFG;
     $result = true;
 
     if ($result && $oldversion < 2008052100) {
@@ -143,6 +146,12 @@
       $log_display->action = 'view lamstwo';
       insert_record('log_display', $log_display);
     }
+    
+    if ($result && $oldversion < 2009112400) {
+        // language file moved to mod/lamstwo/lang/en_utf8 in this version;
+        // remove old one.
+        fulldelete($CFG->dirroot.'/lang/en_utf8/lamstwo.php');
+    }
 
     return $result;
 }
Index: temp_moodle_dev/moodle/mod/lamstwo/lang/en_utf8/lamstwo.php
===================================================================
RCS file: /usr/local/cvsroot/temp_moodle_dev/moodle/mod/lamstwo/lang/en_utf8/lamstwo.php,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ temp_moodle_dev/moodle/mod/lamstwo/lang/en_utf8/lamstwo.php	24 Nov 2009 00:43:18 -0000	1.1
@@ -0,0 +1,92 @@
+<?php 
+
+$string['lamstwoname'] = 'LAMS Name';
+$string['addlesson'] = 'Add a new lesson';
+$string['lessonname'] = 'Lesson name';
+$string['links'] = 'Links';
+$string['nolessons'] = 'There are no LAMS lessons yet in this instance.';
+$string['schedulestart'] = 'Schedule start?';
+$string['dateandtime'] = 'Date and time';
+$string['selectsequence'] = 'Select sequence';
+$string['nolamsv2'] = 'There are no LAMS v2.';
+$string['generallamsv2'] = 'General LAMS v2';
+$string['learninglamsv2'] = 'Learning LAMS v2';
+$string['addedlesson'] = 'Added LAMS lesson!';
+$string['failedaddlesson'] = 'Failed to add LAMS lesson.';
+$string['lessons'] = 'Lessons';
+
+$string['createSequence'] = 'Create sequence';
+$string['error'] = 'Sorry, an error has occured.';
+$string['introduction']  = 'Introduction';
+$string['lamstwo'] = '-- LAMS - Learning Activity Management System --';
+$string['lamstwooutline'] = 'LAMS Outline';
+$string['lesson'] = 'lesson';
+$string['modulename'] = 'LAMS v2';
+$string['modulenameplural'] = 'LAMS v2';
+$string['notsetup'] = 'Configuration is not complete';
+$string['openauthor'] = 'Open authoring';
+$string['openlearner'] = 'Open this lesson';
+$string['openmonitor'] = 'Monitor this lesson';
+$string['refreshSequenceList']  = 'Refresh workspace';
+$string['sequence'] = 'Sequence';
+$string['serverid'] = 'Enter the server ID';
+$string['serverkey'] = 'Enter the server key';
+$string['serverurl'] = 'Enter the basic URL used to access the LAMS server. For example http://localhost:8080/lams';
+$string['requestsource'] = 'This will be used in the message \"Close and return to {request_source}\" in the authoring module in LAMS.';
+$string['visibletostudents'] = 'Show activity to students';
+$string['wikistartederror'] = 'Wiki already has entries - can\'t change.';
+$string['wrongversionrange'] = '$a is not a correct range!';
+$string['sequenceExplanation'] = 'The directory structure below contains the sequences you can create a lesson for.<br />Select one and click on the next button to continue.';
+$string['confirm'] = 'Confirm the lesson details.';
+$string['confirmExplanation'] = 'By pressing on the Start button you can begin the lesson straight away. <br />You can also schedule the lesson to start at a particular date and time.';
+$string['next'] = 'Next';
+$string['prev'] = 'Prev'; 
+$string['schedule'] = 'Schedule';
+$string['date'] = 'Date';
+$string['time'] = 'Time(Hours:Minutes)';
+$string['startnow'] = 'Start Now';
+$string['startlater'] = 'Start Later';
+$string['am'] = 'AM';
+$string['pm'] = 'PM';
+$string['sequencenotselected'] = 'You must select a sequence to proceed.';
+$string['nameNotSpecified'] = 'You have to specify the activity name to proceed.'; 
+$string['Jan'] = 'Jan';
+$string['Feb'] = 'Feb';
+$string['Mar'] = 'Mar';
+$string['Apr'] = 'Apr';
+$string['May'] = 'May';
+$string['Jun'] = 'Jun';
+$string['Jul'] = 'Jul';
+$string['Aug'] = 'Aug';
+$string['Sep'] = 'Sep';
+$string['Oct'] = 'Oct';
+$string['Nov'] = 'Nov';
+$string['Dec'] = 'Dec';
+$string['scheduleSequence'] = 'Select your desired date:';
+$string['nopast'] = 'You have to schedule the lesson at some time point in the future!';
+$string['validate'] = 'Validate';
+$string['validating'] = 'Validating';
+$string['notempty'] = 'should not be empty!';
+$string['notvalid'] = 'is not valid. It should start with http:// at least.';
+$string['notvalidatedconfirm'] = 'It seems you have not validated the setting. Are you sure to save them directly?';
+$string['notvalidconfirm'] = 'It seems the setting is not valid. Are you sure to save them?';
+$string['update'] = 'Update the lesson details';
+$string['updateExplanation'] = 'Please change name and description';
+$string['settingsValid'] = 'These settings are valid';
+$string['restcall503'] = 'Call to LAMS failed: received an HTTP status of 503. This might mean that LAMS is unavailable. Please wait a minute and try again, or contact your system administrator.';
+$string['restcall403'] = 'Call to LAMS failed: received an HTTP status of 403 Forbidden. Please check the configurations settings and/or contact your system administrator.';
+$string['restcall400'] = 'Call to LAMS failed: received an HTTP status of 400 Bad Request. Please check the configurations settings and/or contact your system administrator.';
+$string['restcall500'] = 'Call to LAMS failed: received an HTTP status of 500 Internal Error. Please check the configurations settings and/or contact your system administrator.';
+$string['restcalldefault'] = 'Call to LAMS failed: received an HTTP status of: $a';
+$string['restcallfail'] = 'Call to LAMS failed: received no response or connection was refused. Please check that you have the correct LAMS server URL and that it is online.';
+$string['parsingerror'] = 'There has been an error parsing the rest response. Please contact your system administrator.';
+$string['deletelesson'] = 'Delete this lesson';
+$string['deletelessonconfirm'] = 'Are you sure you want to delete this lesson?';
+$string['deletesuccess'] = 'Lesson successfully deleted.';
+$string['block_title'] = 'Lesson Status (LAMS)';
+$string['status_started'] = 'Started';
+$string['status_not_started'] = 'Not started';
+$string['status_completed'] = 'Completed';
+$string['status_unknown'] = 'Unknown';
+
+?>
Index: temp_moodle_dev/moodle/mod/lamstwo/lang/fr_utf8/lamstwo.php
===================================================================
RCS file: /usr/local/cvsroot/temp_moodle_dev/moodle/mod/lamstwo/lang/fr_utf8/lamstwo.php,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ temp_moodle_dev/moodle/mod/lamstwo/lang/fr_utf8/lamstwo.php	24 Nov 2009 00:43:18 -0000	1.1
@@ -0,0 +1,93 @@
+<?php 
+
+$string['LAMS2_french_translation_readme'] = 'this is a quick and dirty translation made by daniel.schneider@unige.ch - Nov 2009. Tested with Moodle 1.9.6+';
+$string['lamstwoname'] = 'Nom du module LAMS';
+$string['addlesson'] = 'Ajouter une leçon LAMS à Moodle';
+$string['lessonname'] = 'Nom de la leçon';
+$string['links'] = 'Liens';
+$string['nolessons'] = "Il n'y a pas encore de leçons LAMS dans cette instance.";
+$string['schedulestart'] = 'Définir une date de début pour la leçon?';
+$string['dateandtime'] = 'Date et horaire';
+$string['selectsequence'] = 'Sélectionner séquence';
+$string['nolamsv2'] = "Il n'y a pas de LAMS v2.";
+$string['generallamsv2'] = 'Général LAMS v2';
+$string['learninglamsv2'] = 'Apprendre LAMS v2';
+$string['addedlesson'] = 'Ajouté une leçon LAMS!';
+$string['failedaddlesson'] = 'Ajouter une leçon LAMS a échoué.';
+$string['lessons'] = 'Leçons';
+
+$string['createSequence'] = 'Créer une séquence';
+$string['error'] = "Désolé, une error s'est produite.";
+$string['introduction']  = 'Introduction';
+$string['lamstwo'] = '-- LAMS - Learning Activity Management System --';
+$string['lamstwooutline'] = 'LAMS Outline';
+$string['lesson'] = 'leçon';
+$string['modulename'] = 'LAMS v2';
+$string['modulenameplural'] = 'LAMS v2';
+$string['notsetup'] = "La configuration n'est pas complète. Veuillez contacter votre administrateur système";
+$string['openauthor'] = 'Créer/modifier une leçon LAMS';
+$string['openlearner'] = 'Ouvir cette leçon';
+$string['openmonitor'] = 'Suivre cette leçon';
+$string['refreshSequenceList']  = 'Refresh workspace';
+$string['sequence'] = 'Séquence';
+$string['serverid'] = "Entrez l'ID du serveur";
+$string['serverkey'] = 'Entrez la clef du serveur (server key)';
+$string['serverurl'] = "Entrez l'URL de base pour accéder au serveur LAMS. Par exemple: http://localhost:8080/lams";
+$string['requestsource'] = 'Va être utilisé dans le message \"Fermer et revenir à {request_source}\" dans le module auteur de LAMS.';
+$string['visibletostudents'] = "Rendre visible l'activité aux étudiants";
+$string['wikistartederror'] = 'Le wiki a déjà des entrées - pas de modifications...';
+$string['wrongversionrange'] = "$a n'est pas la bonne étendue!";
+$string['sequenceExplanation'] = 'La structure suivante de répertoires contient les séquences que vous pouvez utiliser comme leçon.<br />. Sélectionnez une et cliquez sur le bouton suivant pour continuer.';
+$string['confirm'] = 'Confirmer les détails pour la leçon.';
+$string['confirmExplanation'] = 'En appuyant sur le bouton Start vous pouvez commencer la leçon tout de suite. <br />Vous pouvez également planifier le début de leçon pour une date ou horaire différents.';
+$string['next'] = 'Suivant';
+$string['prev'] = 'Précédant'; 
+$string['schedule'] = 'Horaire';
+$string['date'] = 'Date';
+$string['time'] = 'Horaire(heures:minutes)';
+$string['startnow'] = 'Commencer maintenant';
+$string['startlater'] = 'Commencer plus tard';
+$string['am'] = 'AM';
+$string['pm'] = 'PM';
+$string['sequencenotselected'] = 'Vous devez sélectionner une séquence pour continuer.';
+$string['nameNotSpecified'] = "Vous devez donner un nom à l'activité avant de continuer."; 
+$string['Jan'] = 'Jan';
+$string['Feb'] = 'Fev';
+$string['Mar'] = 'Mar';
+$string['Apr'] = 'Avr';
+$string['May'] = 'Mai';
+$string['Jun'] = 'Jui';
+$string['Jul'] = 'Jul';
+$string['Aug'] = 'Aou';
+$string['Sep'] = 'Sep';
+$string['Oct'] = 'Oct';
+$string['Nov'] = 'Nov';
+$string['Dec'] = 'Dec';
+$string['scheduleSequence'] = 'Sélectionnez la date:';
+$string['nopast'] = "Vouz devez agencer la leçon à un moment donné dans l'avenir!";
+$string['validate'] = 'Valider';
+$string['validating'] = 'Validation';
+$string['notempty'] = 'ne doit pas être vide!';
+$string['notvalid'] = "n'est pas valide. Devrait commencer au moins par http:// .";
+$string['notvalidatedconfirm'] = "Il semble que n'ayez pas validé les paramètres. Etes-vous sûr(es) de vouloir sauver directement ?";
+$string['notvalidconfirm'] = 'Il semble que les paramètres ne soient pas valides. Etes-vous sûr(es) de vouloir les sauver?';
+$string['update'] = 'Mettre à jouer les détails pour la leçon';
+$string['updateExplanation'] = 'SVP modifiez le nom et la description';
+$string['settingsValid'] = 'Ces paramètres sont valides';
+$string['restcall503'] = 'Call to LAMS failed: received an HTTP status of 503. This might mean that LAMS is unavailable. Please wait a minute and try again, or contact your system administrator.';
+$string['restcall403'] = 'Call to LAMS failed: received an HTTP status of 403 Forbidden. Please check the configurations settings and/or contact your system administrator.';
+$string['restcall400'] = 'Call to LAMS failed: received an HTTP status of 400 Bad Request. Please check the configurations settings and/or contact your system administrator.';
+$string['restcall500'] = 'Call to LAMS failed: received an HTTP status of 500 Internal Error. Please check the configurations settings and/or contact your system administrator.';
+$string['restcalldefault'] = 'Call to LAMS failed: received an HTTP status of: $a';
+$string['restcallfail'] = 'Call to LAMS failed: received no response or connection was refused. Please check that you have the correct LAMS server URL and that it is online.';
+$string['parsingerror'] = 'Une erreur dans le parsing de la réponse rest est survenue. Veuillez contacter votre administrateur système.';
+$string['deleteleçon'] = 'Supprimer cette leçon';
+$string['deleteleçonconfirm'] = 'Voulez vous vraiment supprimer cette leçon?';
+$string['deletesuccess'] = 'Leçon supprimée avec succès.';
+$string['block_title'] = 'Statut de la leçon (LAMS)';
+$string['status_started'] = 'Commencé';
+$string['status_not_started'] = 'Pas commencé';
+$string['status_completed'] = 'Complété';
+$string['status_unknown'] = 'Inconnu';
+
+?>
\ No newline at end of file